@lambdatest/smartui-cli 4.1.11-beta.0 → 4.1.12

package/dist/index.cjs

@@ -465,6 +465,33 @@ var constants_default = {
         }
       ]
     }
+  },
+  APP_FIGMA_CONFIG: {
+    mobile: [
+      {
+        "name": "Pixel 8",
+        "platform": ["android 14"]
+      },
+      {
+        "name": "iPhone 15",
+        "platform": ["ios 17"]
+      }
+    ],
+    figma: {
+      "depth": 2,
+      "configs": [
+        {
+          "figma_file_token": "<token>",
+          "figma_ids": ["id-1", "id-2"],
+          "screenshot_names": ["homepage", "about"]
+        },
+        {
+          "figma_file_token": "<token>",
+          "figma_ids": ["id-3", "id-4"],
+          "screenshot_names": ["xyz", "abc"]
+        }
+      ]
+    }
   }
 };
 
@@ -1084,11 +1111,126 @@ var FigmaWebConfigSchema = {
   "required": ["web", "figma"],
   additionalProperties: false
 };
+var FigmaAppConfigSchema = {
+  type: "object",
+  "properties": {
+    "web": {
+      "type": "object",
+      "properties": {
+        browsers: {
+          type: "array",
+          items: { type: "string", enum: [constants_default.CHROME, constants_default.FIREFOX, constants_default.SAFARI, constants_default.EDGE] },
+          uniqueItems: true,
+          maxItems: 4,
+          errorMessage: `allowed browsers - ${constants_default.CHROME}, ${constants_default.FIREFOX}, ${constants_default.SAFARI}, ${constants_default.EDGE}`
+        },
+        "viewports": {
+          "type": "array",
+          "items": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "minimum": 1
+            },
+            "minItems": 1
+          }
+        }
+      },
+      "required": ["browsers"]
+    },
+    "mobile": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          name: {
+            type: "string",
+            minLength: 1,
+            enum: Object.keys(constants_default.SUPPORTED_MOBILE_DEVICES),
+            errorMessage: "unsupported mobile device name"
+          },
+          "platform": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            uniqueItems: true
+          },
+          orientation: {
+            type: "string",
+            enum: [constants_default.MOBILE_ORIENTATION_PORTRAIT, constants_default.MOBILE_ORIENTATION_LANDSCAPE],
+            errorMessage: `Invalid config; orientation must be ${constants_default.MOBILE_ORIENTATION_PORTRAIT}/${constants_default.MOBILE_ORIENTATION_LANDSCAPE}`
+          }
+        },
+        "required": ["name"]
+      },
+      uniqueItems: true
+    },
+    "figma": {
+      "type": "object",
+      "properties": {
+        depth: {
+          type: "integer",
+          minimum: 2,
+          errorMessage: "Depth must be an integer and greater than 1"
+        },
+        "configs": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "figma_file_token": {
+                "type": "string",
+                minLength: 1,
+                errorMessage: "figma_file_token is mandatory and cannot be empty"
+              },
+              "figma_ids": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  minLength: 1,
+                  errorMessage: "Each ID in figma_ids must be a non-empty string"
+                },
+                minItems: 1,
+                uniqueItems: true,
+                errorMessage: {
+                  type: "figma_ids must be an array of strings",
+                  minItems: "figma_ids cannot be empty",
+                  uniqueItems: "figma_ids must contain unique values"
+                }
+              },
+              "screenshot_names": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                uniqueItems: false
+              }
+            },
+            "required": ["figma_file_token", "figma_ids"]
+          },
+          uniqueItems: true,
+          errorMessage: {
+            uniqueItems: "Each entry in the figma configs must be unique"
+          }
+        }
+      },
+      "required": ["configs"]
+    },
+    smartIgnore: {
+      type: "boolean",
+      errorMessage: "Invalid config; smartIgnore must be true/false"
+    }
+  },
+  "required": ["mobile", "figma"],
+  additionalProperties: false
+};
 var validateConfig = ajv.compile(ConfigSchema);
 var validateWebStaticConfig = ajv.compile(WebStaticConfigSchema);
 var validateSnapshot = ajv.compile(SnapshotSchema);
 var validateFigmaDesignConfig = ajv.compile(FigmaDesignConfigSchema);
 var validateWebFigmaConfig = ajv.compile(FigmaWebConfigSchema);
+var validateAppFigmaConfig = ajv.compile(FigmaAppConfigSchema);
 var lambdaTunnel = __require("@lambdatest/node-tunnel");
 util.promisify(setTimeout);
 var tunnelInstance;
@@ -1595,7 +1737,9 @@ var env_default = () => {
     CURRENT_BRANCH,
     PROJECT_NAME,
     SMARTUI_API_PROXY,
-    SMARTUI_API_SKIP_CERTIFICATES
+    SMARTUI_API_SKIP_CERTIFICATES,
+    USE_REMOTE_DISCOVERY,
+    SMART_GIT
   } = process.env;
   return {
     PROJECT_TOKEN,
@@ -1615,7 +1759,9 @@ var env_default = () => {
     SMARTUI_DO_NOT_USE_CAPTURED_COOKIES: SMARTUI_DO_NOT_USE_CAPTURED_COOKIES === "true",
     PROJECT_NAME,
     SMARTUI_API_PROXY,
-    SMARTUI_API_SKIP_CERTIFICATES: SMARTUI_API_SKIP_CERTIFICATES === "true"
+    SMARTUI_API_SKIP_CERTIFICATES: SMARTUI_API_SKIP_CERTIFICATES === "true",
+    USE_REMOTE_DISCOVERY: USE_REMOTE_DISCOVERY === "true",
+    SMART_GIT: SMART_GIT === "true"
   };
 };
 var logContext = {};
@@ -1710,7 +1856,7 @@ var authExec_default = (ctx) => {
 };
 
 // package.json
-var version = "4.1.11-beta.0";
+var version = "4.1.12";
 var package_default = {
   name: "@lambdatest/smartui-cli",
   version,
@@ -1940,7 +2086,7 @@ var httpClient = class {
       }
     });
   }
-  createBuild(git, config, log2, buildName, isStartExec) {
+  createBuild(git, config, log2, buildName, isStartExec, smartGit, markBaseline, baselineBuild) {
     return this.request({
       url: "/build",
       method: "POST",
@@ -1949,7 +2095,10 @@ var httpClient = class {
         config,
         buildName,
         isStartExec,
-        packageVersion: package_default.version
+        packageVersion: package_default.version,
+        smartGit,
+        markBaseline,
+        baselineBuild
       }
     }, log2);
   }
@@ -2058,7 +2207,7 @@ var httpClient = class {
           type: ctx.testType,
           source: "cli"
         },
-        async: false,
+        doRemoteDiscovery: snapshot.options.doRemoteDiscovery,
         discoveryErrors
       }
     }, ctx.log);
@@ -2079,7 +2228,7 @@ var httpClient = class {
           type: ctx.testType,
           source: "cli"
         },
-        async: false,
+        doRemoteDiscovery: snapshot.options.doRemoteDiscovery,
         discoveryErrors
       }
     }, ctx.log);
@@ -2267,6 +2416,20 @@ var httpClient = class {
       params: { buildId }
     }, log2);
   }
+  fetchBuildInfo(requestData, ctx) {
+    return this.request({
+      url: `/fetchBuildInfo`,
+      method: "GET",
+      data: requestData
+    }, ctx.log);
+  }
+  mergeBuildsByBuildId(requestData, ctx) {
+    return this.request({
+      url: `/mergeBuilds`,
+      method: "POST",
+      data: requestData
+    }, ctx.log);
+  }
 };
 var ctx_default = (options) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
@@ -2288,6 +2451,7 @@ var ctx_default = (options) => {
   try {
     if (options.config) {
       config = JSON.parse(fs5__default.default.readFileSync(options.config, "utf-8"));
+      logger_default.debug(`Config file ${options.config} loaded: ${JSON.stringify(config, null, 2)}`);
       if ((_a = config.web) == null ? void 0 : _a.resolutions) {
         config.web.viewports = config.web.resolutions;
         delete config.web.resolutions;
@@ -2295,6 +2459,8 @@ var ctx_default = (options) => {
       if (!validateConfig(config)) {
         throw new Error(validateConfig.errors[0].message);
       }
+    } else {
+      logger_default.info("## No config file provided. Using default config.");
     }
     port = parseInt(options.port || "49152", 10);
     if (isNaN(port) || port < 1 || port > 65535) {
@@ -2317,6 +2483,10 @@ var ctx_default = (options) => {
       fetchResultsFileObj = "";
     }
     buildNameObj = options.buildName || "";
+    if (options.userName && options.accessKey) {
+      env.LT_USERNAME = options.userName;
+      env.LT_ACCESS_KEY = options.accessKey;
+    }
   } catch (error) {
     console.log(`[smartui] Error: ${error.message}`);
     process.exit();
@@ -2395,7 +2565,9 @@ var ctx_default = (options) => {
       stripExtension: ignoreStripExtension,
       ignorePattern: ignoreFilePattern,
       fetchResults: fetchResultObj,
-      fetchResultsFileName: fetchResultsFileObj
+      fetchResultsFileName: fetchResultsFileObj,
+      baselineBranch: options.baselineBranch || "",
+      baselineBuild: options.baselineBuild || ""
     },
     cliVersion: version,
     totalSnapshots: -1,
@@ -2405,13 +2577,21 @@ var ctx_default = (options) => {
     buildToSnapshotCountMap: /* @__PURE__ */ new Map(),
     fetchResultsForBuild: new Array(),
     orgId: 0,
-    userId: 0
+    userId: 0,
+    mergeBranchSource: "",
+    mergeBranchTarget: "",
+    mergeBuildSource: "",
+    mergeBuildTarget: "",
+    mergeBuildSourceId: "",
+    mergeBuildTargetId: "",
+    mergeByBranch: false,
+    mergeByBuild: false
   };
 };
-function executeCommand(command7) {
+function executeCommand(command9) {
   let dst = process.cwd();
   try {
-    return child_process.execSync(command7, {
+    return child_process.execSync(command9, {
       cwd: dst,
       stdio: ["ignore"],
       encoding: "utf-8"
@@ -2429,31 +2609,45 @@ function isGitRepo() {
   }
 }
 var git_default = (ctx) => {
+  if (ctx.env.SMART_GIT) {
+    ctx.env.BASELINE_BRANCH = "";
+    if (ctx.options.baselineBranch !== "") {
+      ctx.env.SMART_GIT = false;
+    }
+  }
   if (ctx.env.SMARTUI_GIT_INFO_FILEPATH) {
     let gitInfo = JSON.parse(fs5__default.default.readFileSync(ctx.env.SMARTUI_GIT_INFO_FILEPATH, "utf-8"));
+    if (ctx.options.markBaseline) {
+      ctx.env.BASELINE_BRANCH = ctx.env.CURRENT_BRANCH || gitInfo.branch || "";
+      ctx.env.SMART_GIT = false;
+    }
     return {
       branch: ctx.env.CURRENT_BRANCH || gitInfo.branch || "",
       commitId: gitInfo.commit_id.slice(0, 6) || "",
       commitMessage: gitInfo.commit_body || "",
       commitAuthor: gitInfo.commit_author || "",
       githubURL: ctx.env.GITHUB_ACTIONS ? `${constants_default.GITHUB_API_HOST}/repos/${process.env.GITHUB_REPOSITORY}/statuses/${gitInfo.commit_id}` : "",
-      baselineBranch: ctx.env.BASELINE_BRANCH || ""
+      baselineBranch: ctx.options.baselineBranch || ctx.env.BASELINE_BRANCH || ""
     };
   } else {
     const splitCharacter = "<##>";
     const prettyFormat = ["%h", "%H", "%s", "%f", "%b", "%at", "%ct", "%an", "%ae", "%cn", "%ce", "%N", ""];
-    const command7 = 'git log -1 --pretty=format:"' + prettyFormat.join(splitCharacter) + '" && git rev-parse --abbrev-ref HEAD && git tag --contains HEAD';
-    let res = executeCommand(command7).split(splitCharacter);
+    const command9 = 'git log -1 --pretty=format:"' + prettyFormat.join(splitCharacter) + '" && git rev-parse --abbrev-ref HEAD && git tag --contains HEAD';
+    let res = executeCommand(command9).split(splitCharacter);
     var branchAndTags = res[res.length - 1].split("\n").filter((n) => n);
     var branch = ctx.env.CURRENT_BRANCH || branchAndTags[0];
     branchAndTags.slice(1);
+    if (ctx.options.markBaseline) {
+      ctx.env.BASELINE_BRANCH = branch || "";
+      ctx.env.SMART_GIT = false;
+    }
     return {
       branch: branch || "",
       commitId: res[0] || "",
       commitMessage: res[2] || "",
       commitAuthor: res[7] || "",
       githubURL: ctx.env.GITHUB_ACTIONS ? `${constants_default.GITHUB_API_HOST}/repos/${process.env.GITHUB_REPOSITORY}/statuses/${res[1]}` : "",
-      baselineBranch: ctx.env.BASELINE_BRANCH || ""
+      baselineBranch: ctx.options.baselineBranch || ctx.env.BASELINE_BRANCH || ""
     };
   }
 };
@@ -2488,14 +2682,21 @@ var createBuildExec_default = (ctx) => {
       updateLogContext({ task: "createBuild" });
       try {
         if (ctx2.authenticatedInitially && !ctx2.config.skipBuildCreation) {
-          let resp = yield ctx2.client.createBuild(ctx2.git, ctx2.config, ctx2.log, ctx2.build.name, ctx2.isStartExec);
-          ctx2.build = {
-            id: resp.data.buildId,
-            name: resp.data.buildName,
-            url: resp.data.buildURL,
-            baseline: resp.data.baseline,
-            useKafkaFlow: resp.data.useKafkaFlow || false
-          };
+          let resp = yield ctx2.client.createBuild(ctx2.git, ctx2.config, ctx2.log, ctx2.build.name, ctx2.isStartExec, ctx2.env.SMART_GIT, ctx2.options.markBaseline, ctx2.options.baselineBuild);
+          if (resp && resp.data && resp.data.buildId) {
+            ctx2.build = {
+              id: resp.data.buildId,
+              name: resp.data.buildName,
+              url: resp.data.buildURL,
+              baseline: resp.data.baseline,
+              useKafkaFlow: resp.data.useKafkaFlow || false
+            };
+          } else if (resp && resp.error) {
+            if (resp.error.message) {
+              ctx2.log.error(`Error while creation of build: ${resp.error.message}`);
+              throw new Error(`Error while creation of build: ${resp.error.message}`);
+            }
+          }
           if (ctx2.build.id === "") {
             ctx2.log.debug("Build creation failed: Build ID is empty");
             task.output = chalk__default.default.red("Build creation failed: Build ID is empty");
@@ -2709,6 +2910,145 @@ var ALLOWED_RESOURCES = ["document", "stylesheet", "image", "media", "font", "ot
 var ALLOWED_STATUSES = [200, 201];
 var REQUEST_TIMEOUT = 18e5;
 var MIN_VIEWPORT_HEIGHT = 1080;
+function prepareSnapshot(snapshot, ctx) {
+  return __async(this, null, function* () {
+    let processedOptions = {};
+    processedOptions.cliEnableJavascript = ctx.config.cliEnableJavaScript;
+    processedOptions.ignoreHTTPSErrors = ctx.config.ignoreHTTPSErrors;
+    if (ctx.config.basicAuthorization) {
+      processedOptions.basicAuthorization = ctx.config.basicAuthorization;
+    }
+    ctx.config.allowedHostnames.push(new URL(snapshot.url).hostname);
+    processedOptions.allowedHostnames = ctx.config.allowedHostnames;
+    processedOptions.skipCapturedCookies = ctx.env.SMARTUI_DO_NOT_USE_CAPTURED_COOKIES;
+    if (ctx.env.HTTP_PROXY || ctx.env.HTTPS_PROXY)
+      processedOptions.proxy = { server: ctx.env.HTTP_PROXY || ctx.env.HTTPS_PROXY };
+    if (ctx.env.SMARTUI_HTTP_PROXY || ctx.env.SMARTUI_HTTPS_PROXY)
+      processedOptions.proxy = { server: ctx.env.SMARTUI_HTTP_PROXY || ctx.env.SMARTUI_HTTPS_PROXY };
+    let options = snapshot.options;
+    let optionWarnings = /* @__PURE__ */ new Set();
+    let selectors = [];
+    let ignoreOrSelectDOM;
+    if (options && Object.keys(options).length) {
+      ctx.log.debug(`Snapshot options: ${JSON.stringify(options)}`);
+      const isNotAllEmpty = (obj) => {
+        var _a;
+        for (let key in obj)
+          if ((_a = obj[key]) == null ? void 0 : _a.length)
+            return true;
+        return false;
+      };
+      if (options.loadDomContent) {
+        processedOptions.loadDomContent = true;
+      }
+      if (options.sessionId) {
+        const sessionId = options.sessionId;
+        processedOptions.sessionId = sessionId;
+        if (ctx.sessionCapabilitiesMap && ctx.sessionCapabilitiesMap.has(sessionId)) {
+          const sessionCapabilities = ctx.sessionCapabilitiesMap.get(sessionId);
+          if (sessionCapabilities && sessionCapabilities.id) {
+            processedOptions.testId = sessionCapabilities.id;
+          }
+        }
+      }
+      if (options.web && Object.keys(options.web).length) {
+        processedOptions.web = {};
+        if (options.web.viewports && options.web.viewports.length > 0) {
+          processedOptions.web.viewports = options.web.viewports.filter(
+            (viewport) => Array.isArray(viewport) && viewport.length > 0
+          );
+        }
+        if (options.web.browsers && options.web.browsers.length > 0) {
+          processedOptions.web.browsers = options.web.browsers;
+        }
+      }
+      if (options.mobile && Object.keys(options.mobile).length) {
+        processedOptions.mobile = {};
+        if (options.mobile.devices && options.mobile.devices.length > 0) {
+          processedOptions.mobile.devices = options.mobile.devices;
+        }
+        if (options.mobile.hasOwnProperty("fullPage") && typeof options.mobile.fullPage === "boolean") {
+          processedOptions.mobile.fullPage = options.mobile.fullPage;
+        } else {
+          processedOptions.mobile.fullPage = true;
+        }
+        if (options.mobile.hasOwnProperty("orientation") && (options.mobile.orientation === constants_default.MOBILE_ORIENTATION_PORTRAIT || options.mobile.orientation === constants_default.MOBILE_ORIENTATION_LANDSCAPE)) {
+          processedOptions.mobile.orientation = options.mobile.orientation;
+        } else {
+          processedOptions.mobile.orientation = constants_default.MOBILE_ORIENTATION_PORTRAIT;
+        }
+      }
+      if (options.element && Object.keys(options.element).length) {
+        if (options.element.id)
+          processedOptions.element = "#" + options.element.id;
+        else if (options.element.class)
+          processedOptions.element = "." + options.element.class;
+        else if (options.element.cssSelector)
+          processedOptions.element = options.element.cssSelector;
+        else if (options.element.xpath)
+          processedOptions.element = "xpath=" + options.element.xpath;
+      } else if (options.ignoreDOM && Object.keys(options.ignoreDOM).length && isNotAllEmpty(options.ignoreDOM)) {
+        processedOptions.ignoreBoxes = {};
+        ignoreOrSelectDOM = "ignoreDOM";
+      } else if (options.selectDOM && Object.keys(options.selectDOM).length && isNotAllEmpty(options.selectDOM)) {
+        processedOptions.selectBoxes = {};
+        ignoreOrSelectDOM = "selectDOM";
+      }
+      if (ignoreOrSelectDOM) {
+        for (const [key, value] of Object.entries(options[ignoreOrSelectDOM])) {
+          switch (key) {
+            case "id":
+              selectors.push(...value.map((e) => "#" + e));
+              break;
+            case "class":
+              selectors.push(...value.map((e) => "." + e));
+              break;
+            case "xpath":
+              selectors.push(...value.map((e) => "xpath=" + e));
+              break;
+            case "cssSelector":
+              selectors.push(...value);
+              break;
+          }
+        }
+      }
+      if (options.ignoreType) {
+        processedOptions.ignoreType = options.ignoreType;
+      }
+    }
+    if (ctx.config.tunnel) {
+      if (ctx.tunnelDetails && ctx.tunnelDetails.tunnelPort != -1 && ctx.tunnelDetails.tunnelHost != "") {
+        const tunnelAddress = `http://${ctx.tunnelDetails.tunnelHost}:${ctx.tunnelDetails.tunnelPort}`;
+        processedOptions.tunnelAddress = tunnelAddress;
+        ctx.log.debug(`Tunnel address added to processedOptions: ${tunnelAddress}`);
+      }
+    }
+    processedOptions.allowedAssets = ctx.config.allowedAssets;
+    processedOptions.selectors = selectors;
+    processedOptions.ignoreDOM = options == null ? void 0 : options.ignoreDOM;
+    processedOptions.selectDOM = options == null ? void 0 : options.selectDOM;
+    ctx.log.debug(`Processed options: ${JSON.stringify(processedOptions)}`);
+    let renderViewports;
+    if (snapshot.options && snapshot.options.web || snapshot.options && snapshot.options.mobile) {
+      renderViewports = getRenderViewportsForOptions(snapshot.options);
+    } else {
+      renderViewports = getRenderViewports(ctx);
+    }
+    processedOptions.doRemoteDiscovery = true;
+    return {
+      processedSnapshot: {
+        name: snapshot.name,
+        url: snapshot.url,
+        dom: Buffer.from(snapshot.dom.html).toString("base64"),
+        resources: {},
+        options: processedOptions,
+        cookies: Buffer.from(snapshot.dom.cookies).toString("base64"),
+        renderViewports
+      },
+      warnings: [...optionWarnings, ...snapshot.dom.warnings]
+    };
+  });
+}
 function processSnapshot(snapshot, ctx) {
   return __async(this, null, function* () {
     var _a, _b;
@@ -2722,6 +3062,7 @@ function processSnapshot(snapshot, ctx) {
       snapshotUUID: "",
       browsers: {}
     };
+    let processedOptions = {};
     let globalViewport = "";
     let globalBrowser = constants_default.CHROME;
     let launchOptions = {
@@ -2913,7 +3254,6 @@ function processSnapshot(snapshot, ctx) {
     }));
     let options = snapshot.options;
     let optionWarnings = /* @__PURE__ */ new Set();
-    let processedOptions = {};
     let selectors = [];
     let ignoreOrSelectDOM;
     let ignoreOrSelectBoxes;
@@ -3458,7 +3798,19 @@ var Queue = class {
                 useCapsBuildId = true;
               }
             }
-            let { processedSnapshot, warnings, discoveryErrors } = yield processSnapshot(snapshot, this.ctx);
+            let processedSnapshot, warnings, discoveryErrors;
+            if (this.ctx.env.USE_REMOTE_DISCOVERY) {
+              this.ctx.log.debug(`Using remote discovery`);
+              let result = yield prepareSnapshot(snapshot, this.ctx);
+              processedSnapshot = result.processedSnapshot;
+              warnings = result.warnings;
+            } else {
+              this.ctx.log.debug(`Using local discovery`);
+              let result = yield processSnapshot(snapshot, this.ctx);
+              processedSnapshot = result.processedSnapshot;
+              warnings = result.warnings;
+              discoveryErrors = result.discoveryErrors;
+            }
             if (useCapsBuildId) {
               if (useKafkaFlowCaps) {
                 const snapshotUuid = uuid.v4();
@@ -3476,7 +3828,7 @@ var Queue = class {
             } else {
               if (!((_c = this.ctx.build) == null ? void 0 : _c.id)) {
                 if (this.ctx.authenticatedInitially) {
-                  let resp = yield this.ctx.client.createBuild(this.ctx.git, this.ctx.config, this.ctx.log, this.ctx.build.name);
+                  let resp = yield this.ctx.client.createBuild(this.ctx.git, this.ctx.config, this.ctx.log, this.ctx.build.name, false, false, false, "");
                   this.ctx.build = {
                     id: resp.data.buildId,
                     name: resp.data.buildName,
@@ -3580,15 +3932,15 @@ var startTunnel_default = (ctx) => {
 
 // src/commander/exec.ts
 var command = new commander.Command();
-command.name("exec").description("Run test commands around SmartUI").argument("<command...>", "Command supplied for running tests").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(execCommand, _, command7) {
+command.name("exec").description("Run test commands around SmartUI").argument("<command...>", "Command supplied for running tests").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").option("--userName <string>", "Specify the LT username").option("--accessKey <string>", "Specify the LT accesskey").action(function(execCommand, _, command9) {
   return __async(this, null, function* () {
     var _a;
-    const options = command7.optsWithGlobals();
+    const options = command9.optsWithGlobals();
     if (options.buildName === "") {
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
       process.exit(1);
     }
-    let ctx = ctx_default(command7.optsWithGlobals());
+    let ctx = ctx_default(command9.optsWithGlobals());
     if (!which__default.default.sync(execCommand[0], { nothrow: true })) {
       ctx.log.error(`Error: Command not found "${execCommand[0]}"`);
       return;
@@ -3692,7 +4044,7 @@ function createWebFigmaConfig(filepath) {
   console.log(`Created figma web config: ${filepath}`);
 }
 function verifyFigmaWebConfig(ctx) {
-  var _a;
+  var _a, _b;
   if (ctx.env.FIGMA_TOKEN == "") {
     throw new Error("Missing FIGMA_TOKEN in Environment Variables");
   }
@@ -3717,17 +4069,44 @@ function verifyFigmaWebConfig(ctx) {
   if (new Set(screenshots).size !== screenshots.length) {
     throw new Error("Found duplicate screenshot names in figma config");
   }
-  return true;
+  let mobileConfig = ((_b = ctx.config) == null ? void 0 : _b.mobile) || {};
+  if (Array.isArray(mobileConfig)) {
+    for (const config of mobileConfig) {
+      const deviceName = config.name;
+      if (constants_default.SUPPORTED_MOBILE_DEVICES[deviceName]) {
+        const deviceData = constants_default.SUPPORTED_MOBILE_DEVICES[deviceName];
+        config.width = deviceData.viewport.width;
+        config.height = deviceData.viewport.height;
+      }
+    }
+  }
 }
 function isValidArray(input) {
   return Array.isArray(input) && input.length > 0;
 }
+function createAppFigmaConfig(filepath) {
+  filepath = filepath || ".smartui.json";
+  let filetype = path2__default.default.extname(filepath);
+  if (filetype != ".json") {
+    console.log("Error: figma app config file must have .json extension");
+    return;
+  }
+  if (fs5__default.default.existsSync(filepath)) {
+    console.log(`Error: figma app config already exists: ${filepath}`);
+    console.log(`To create a new figma app config, please specify the file name like: 'smartui config:create-figma-app <fileName>.json'`);
+    return;
+  }
+  fs5__default.default.mkdirSync(path2__default.default.dirname(filepath), { recursive: true });
+  fs5__default.default.writeFileSync(filepath, JSON.stringify(constants_default.APP_FIGMA_CONFIG, null, 2) + "\n");
+  console.log(`Created figma app config: ${filepath}`);
+}
 
 // src/commander/config.ts
 var configWeb = new commander.Command();
 var configStatic = new commander.Command();
 var configFigma = new commander.Command();
 var configWebFigma = new commander.Command();
+var configAppFigma = new commander.Command();
 configWeb.name("config:create").description("Create SmartUI config file").argument("[filepath]", "Optional config filepath").action(function(filepath, options) {
   return __async(this, null, function* () {
     createConfig(filepath);
@@ -3748,6 +4127,11 @@ configWebFigma.name("config:create-figma-web").description("Create figma config
     createWebFigmaConfig(filepath);
   });
 });
+configAppFigma.name("config:create-figma-app").description("Create figma config file for mobile apps").argument("[filepath]", "Optional config filepath").action(function(filepath, options) {
+  return __async(this, null, function* () {
+    createAppFigmaConfig(filepath);
+  });
+});
 var auth_default = (ctx) => {
   return {
     title: `Authenticating with SmartUI`,
@@ -3778,14 +4162,21 @@ var createBuild_default = (ctx) => {
     task: (ctx2, task) => __async(void 0, null, function* () {
       updateLogContext({ task: "createBuild" });
       try {
-        let resp = yield ctx2.client.createBuild(ctx2.git, ctx2.config, ctx2.log, ctx2.build.name, ctx2.isStartExec);
-        ctx2.build = {
-          id: resp.data.buildId,
-          name: resp.data.buildName,
-          url: resp.data.buildURL,
-          baseline: resp.data.baseline,
-          useKafkaFlow: resp.data.useKafkaFlow || false
-        };
+        let resp = yield ctx2.client.createBuild(ctx2.git, ctx2.config, ctx2.log, ctx2.build.name, ctx2.isStartExec, ctx2.env.SMART_GIT, ctx2.options.markBaseline, ctx2.options.baselineBuild);
+        if (resp && resp.data && resp.data.buildId) {
+          ctx2.build = {
+            id: resp.data.buildId,
+            name: resp.data.buildName,
+            url: resp.data.buildURL,
+            baseline: resp.data.baseline,
+            useKafkaFlow: resp.data.useKafkaFlow || false
+          };
+        } else if (resp && resp.error) {
+          if (resp.error.message) {
+            ctx2.log.error(`Error while creation of build: ${resp.error.message}`);
+            throw new Error(`Error while creation of build: ${resp.error.message}`);
+          }
+        }
         task.output = chalk__default.default.gray(`build id: ${resp.data.buildId}`);
         task.title = "SmartUI build created";
       } catch (error) {
@@ -4162,15 +4553,15 @@ var captureScreenshots_default = (ctx) => {
 
 // src/commander/capture.ts
 var command2 = new commander.Command();
-command2.name("capture").description("Capture screenshots of static sites").argument("<file>", "Web static config file").option("-C, --parallel [number]", "Specify the number of instances per browser", parseInt).option("-F, --force", "forcefully apply the specified parallel instances per browser").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(file, _, command7) {
+command2.name("capture").description("Capture screenshots of static sites").argument("<file>", "Web static config file").option("-C, --parallel [number]", "Specify the number of instances per browser", parseInt).option("-F, --force", "forcefully apply the specified parallel instances per browser").option("--fetch-results [filename]", "Fetch results and optionally specify an output file, e.g., <filename>.json").option("--buildName <string>", "Specify the build name").option("--userName <string>", "Specify the LT username").option("--accessKey <string>", "Specify the LT accesskey").action(function(file, _, command9) {
   return __async(this, null, function* () {
     var _a, _b;
-    const options = command7.optsWithGlobals();
+    const options = command9.optsWithGlobals();
     if (options.buildName === "") {
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
       process.exit(1);
     }
-    let ctx = ctx_default(command7.optsWithGlobals());
+    let ctx = ctx_default(command9.optsWithGlobals());
     ctx.isSnapshotCaptured = true;
     if (!fs5__default.default.existsSync(file)) {
       ctx.log.error(`Web Static Config file ${file} not found.`);
@@ -4255,14 +4646,14 @@ command3.name("upload").description("Upload screenshots from given directory").a
   return val.split(",").map((ext) => ext.trim().toLowerCase());
 }).option("-E, --removeExtensions", "Strips file extensions from snapshot names").option("-i, --ignoreDir <patterns>", "Comma-separated list of directories to ignore", (val) => {
   return val.split(",").map((pattern) => pattern.trim());
-}).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(directory, _, command7) {
+}).option("--fetch-results [filename]", "Fetch results and optionally specify an output file, e.g., <filename>.json").option("--buildName <string>", "Specify the build name").option("--userName <string>", "Specify the LT username").option("--accessKey <string>", "Specify the LT accesskey").action(function(directory, _, command9) {
   return __async(this, null, function* () {
-    const options = command7.optsWithGlobals();
+    const options = command9.optsWithGlobals();
     if (options.buildName === "") {
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
       process.exit(1);
     }
-    let ctx = ctx_default(command7.optsWithGlobals());
+    let ctx = ctx_default(command9.optsWithGlobals());
     ctx.isSnapshotCaptured = true;
     if (!fs5__default.default.existsSync(directory)) {
       console.log(`Error: The provided directory ${directory} not found.`);
@@ -4463,12 +4854,86 @@ var uploadWebFigma_default2 = (ctx) => {
     exitOnError: true
   };
 };
+
+// src/lib/uploadAppFigma.ts
+var uploadAppFigma_default = (ctx) => __async(void 0, null, function* () {
+  var _a, _b;
+  const figmaConfig = ctx.config && ((_a = ctx.config) == null ? void 0 : _a.figma) || {};
+  const mobileConfig = ctx.config && ((_b = ctx.config) == null ? void 0 : _b.mobile) || {};
+  let results = "";
+  const buildName = ctx.options.buildName;
+  if (figmaConfig && figmaConfig.configs && figmaConfig.configs.length > 0) {
+    const authToken = `Basic ${Buffer.from(`${ctx.env.LT_USERNAME}:${ctx.env.LT_ACCESS_KEY}`).toString("base64")}`;
+    const requestBody = {
+      figma_token: ctx.env.FIGMA_TOKEN,
+      auth: authToken,
+      build_name: buildName,
+      mobile: mobileConfig,
+      figma: figmaConfig,
+      smartIgnore: ctx.config.smartIgnore,
+      git: ctx.git,
+      platformType: "app"
+    };
+    const responseData = yield ctx.client.processWebFigma(requestBody, ctx.log);
+    ctx.log.debug("responseData : " + JSON.stringify(responseData));
+    if (responseData && responseData.error && responseData.error.message) {
+      throw new Error(responseData.error.message);
+    }
+    if (responseData.data.message == "success") {
+      results = responseData.data.message;
+      ctx.build = {
+        id: responseData.data.buildId,
+        url: responseData.data.buildURL || "https://smartui.lambdatestinternal.com",
+        baseline: responseData.data.baseline ? responseData.data.baseline : false
+      };
+    }
+  } else {
+    throw new Error("No Figma configuration found in config file");
+  }
+  return results;
+});
+
+// src/tasks/uploadAppFigma.ts
+var uploadAppFigma_default2 = (ctx) => {
+  return {
+    title: "Processing App Figma",
+    task: (ctx2, task) => __async(void 0, null, function* () {
+      try {
+        ctx2.task = task;
+        updateLogContext({ task: "upload-figma-app" });
+        let results = yield uploadAppFigma_default(ctx2);
+        if (results != "success") {
+          throw new Error("Uploading App Figma Screenshot failed");
+        }
+        if (ctx2.build.id) {
+          task.output = chalk__default.default.gray(`Build Id: ${ctx2.build.id}`);
+          let figmaOutput = yield fetchFigma_default(ctx2);
+          const jsonObject = JSON.parse(figmaOutput);
+          let output = JSON.stringify(jsonObject, null, 2);
+          task.output = task.output + "\n" + chalk__default.default.green(`${output}`);
+        }
+        if (ctx2.options.fetchResults) {
+          startPolling(ctx2, "", false, "");
+        }
+        task.title = "App Figma images uploaded successfully to SmartUI";
+        ctx2.log.debug(`App Figma processed: ${results}`);
+      } catch (error) {
+        ctx2.log.debug(error);
+        task.output = chalk__default.default.gray(`${error.message}`);
+        throw new Error("Uploading App Figma Screenshots failed");
+      }
+    }),
+    rendererOptions: { persistentOutput: true },
+    exitOnError: true
+  };
+};
 var uploadFigma = new commander.Command();
 var uploadWebFigmaCommand = new commander.Command();
-uploadFigma.name("upload-figma").description("Capture screenshots of static sites").argument("<file>", "figma design config file").option("--markBaseline", "Mark the uploaded images as baseline").option("--buildName <buildName>", "Name of the build").action(function(file, _, command7) {
+var uploadAppFigmaCommand = new commander.Command();
+uploadFigma.name("upload-figma").description("Capture screenshots of static sites").argument("<file>", "figma design config file").option("--markBaseline", "Mark the uploaded images as baseline").option("--buildName <buildName>", "Name of the build").action(function(file, _, command9) {
   return __async(this, null, function* () {
     var _a, _b;
-    let ctx = ctx_default(command7.optsWithGlobals());
+    let ctx = ctx_default(command9.optsWithGlobals());
     ctx.isSnapshotCaptured = true;
     if (!fs5__default.default.existsSync(file)) {
       console.log(`Error: Figma Config file ${file} not found.`);
@@ -4507,10 +4972,10 @@ uploadFigma.name("upload-figma").description("Capture screenshots of static site
     }
   });
 });
-uploadWebFigmaCommand.name("upload-figma-web").description("Capture screenshots of static sites").argument("<file>", "figma config config file").option("--markBaseline", "Mark the uploaded images as baseline").option("--buildName <buildName>", "Name of the build").option("--fetch-results [filename]", "Fetch results and optionally specify an output file, e.g., <filename>.json").action(function(file, _, command7) {
+uploadWebFigmaCommand.name("upload-figma-web").description("Capture figma screenshots into CLI build").argument("<file>", "figma config config file").option("--markBaseline", "Mark the uploaded images as baseline").option("--buildName <buildName>", "Name of the build").option("--fetch-results [filename]", "Fetch results and optionally specify an output file, e.g., <filename>.json").action(function(file, _, command9) {
   return __async(this, null, function* () {
     var _a;
-    let ctx = ctx_default(command7.optsWithGlobals());
+    let ctx = ctx_default(command9.optsWithGlobals());
     if (!fs5__default.default.existsSync(file)) {
       console.log(`Error: figma-web config file ${file} not found.`);
       return;
@@ -4559,6 +5024,58 @@ uploadWebFigmaCommand.name("upload-figma-web").description("Capture screenshots
     }
   });
 });
+uploadAppFigmaCommand.name("upload-figma-app").description("Capture figma screenshots into App Build").argument("<file>", "figma config config file").option("--markBaseline", "Mark the uploaded images as baseline").option("--buildName <buildName>", "Name of the build").option("--fetch-results [filename]", "Fetch results and optionally specify an output file, e.g., <filename>.json").action(function(file, _, command9) {
+  return __async(this, null, function* () {
+    var _a;
+    let ctx = ctx_default(command9.optsWithGlobals());
+    if (!fs5__default.default.existsSync(file)) {
+      console.log(`Error: figma-app config file ${file} not found.`);
+      return;
+    }
+    try {
+      ctx.config = JSON.parse(fs5__default.default.readFileSync(file, "utf8"));
+      ctx.log.info(JSON.stringify(ctx.config));
+      if (!validateAppFigmaConfig(ctx.config)) {
+        ctx.log.debug(JSON.stringify(validateAppFigmaConfig.errors, null, 2));
+        (_a = validateAppFigmaConfig.errors) == null ? void 0 : _a.forEach((error) => {
+          if (error.keyword === "additionalProperties") {
+            ctx.log.warn(`Additional property "${error.params.additionalProperty}" is not allowed.`);
+          } else {
+            const validationError = error.message;
+            throw new Error(validationError || "Invalid figma-app config found in file : " + file);
+          }
+        });
+      }
+      verifyFigmaWebConfig(ctx);
+    } catch (error) {
+      ctx.log.error(chalk__default.default.red(`Invalid figma-app config; ${error.message}`));
+      return;
+    }
+    let tasks = new listr2.Listr(
+      [
+        auth_default(),
+        getGitInfo_default(),
+        uploadAppFigma_default2(),
+        finalizeBuild_default()
+      ],
+      {
+        rendererOptions: {
+          icon: {
+            [listr2.ListrDefaultRendererLogLevels.OUTPUT]: `\u2192`
+          },
+          color: {
+            [listr2.ListrDefaultRendererLogLevels.OUTPUT]: listr2.color.gray
+          }
+        }
+      }
+    );
+    try {
+      yield tasks.run(ctx);
+    } catch (error) {
+      console.log("\nRefer docs: https://www.lambdatest.com/support/docs/smart-visual-regression-testing/");
+    }
+  });
+});
 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* () {
@@ -4661,11 +5178,234 @@ command6.name("exec:ping").description("Ping the SmartUI server to check if it i
   });
 });
 var ping_default = command6;
+var fetchBranchInfo_default = (ctx) => {
+  return {
+    title: `Fetching branch info`,
+    task: (ctx2, task) => __async(void 0, null, function* () {
+      updateLogContext({ task: "fetchBranchInfo" });
+      try {
+        if (ctx2.mergeBranchSource === ctx2.mergeBranchTarget) {
+          ctx2.log.error(`Merging two similar branch is not possible`);
+          throw new Error(`Merging two similar branch is not possible`);
+        }
+        const requestData = {
+          source: ctx2.mergeBranchSource,
+          target: ctx2.mergeBranchTarget,
+          byBranch: ctx2.mergeByBranch,
+          byBuild: ctx2.mergeByBuild
+        };
+        let resp = yield ctx2.client.fetchBuildInfo(requestData, ctx2);
+        if (resp && resp.data && resp.data.source && resp.data.target) {
+          ctx2.mergeBuildSourceId = resp.data.source;
+          ctx2.mergeBuildTargetId = resp.data.target;
+          ctx2.log.debug(`Merge Build source buildId: ${ctx2.mergeBuildSourceId} and target buildId: ${ctx2.mergeBuildTargetId}`);
+        } else if (resp && resp.error) {
+          if (resp.error.message) {
+            ctx2.log.error(`Error while fetching branch Info: ${resp.error.message}`);
+            throw new Error(`Error while fetching branch Info: ${resp.error.message}`);
+          }
+        }
+        task.title = "Branch info fetched";
+        task.output = chalk__default.default.gray(`Source buildId: ${ctx2.mergeBuildSourceId} and Target buildId: ${ctx2.mergeBuildTargetId}`);
+      } catch (error) {
+        ctx2.log.debug(error);
+        task.output = chalk__default.default.gray(error.message);
+        throw new Error("Branch info fetching failed");
+      }
+    }),
+    rendererOptions: { persistentOutput: true }
+  };
+};
+var mergeBuilds_default = (ctx) => {
+  return {
+    title: `Merging smartui builds`,
+    task: (ctx2, task) => __async(void 0, null, function* () {
+      updateLogContext({ task: "mergeBuilds" });
+      try {
+        let resp;
+        if (ctx2.mergeByBranch) {
+          ctx2.git.branch = ctx2.mergeBranchTarget;
+          const requestData = {
+            source: ctx2.mergeBuildSourceId,
+            target: ctx2.mergeBuildTargetId,
+            byBranch: ctx2.mergeByBranch,
+            byBuildName: ctx2.mergeByBuild,
+            sourceBranchName: ctx2.mergeBranchSource,
+            targetBranchName: ctx2.mergeBranchTarget,
+            sourceBuildName: "",
+            targetBuildName: "",
+            git: ctx2.git
+          };
+          resp = yield ctx2.client.mergeBuildsByBuildId(requestData, ctx2);
+        } else {
+          const requestData = {
+            source: ctx2.mergeBuildSourceId,
+            target: ctx2.mergeBuildTargetId,
+            byBranch: ctx2.mergeByBranch,
+            byBuildName: ctx2.mergeByBuild,
+            sourceBranchName: "",
+            targetBranchName: "",
+            sourceBuildName: ctx2.mergeBuildSource,
+            targetBuildName: ctx2.mergeBuildTarget,
+            git: ctx2.git
+          };
+          resp = yield ctx2.client.mergeBuildsByBuildId(requestData, ctx2);
+        }
+        if (resp && resp.data && resp.data.message) {
+          ctx2.log.debug(`${resp.data.message}`);
+        } else {
+          ctx2.log.error(`Error while initiating merging process: ${resp.error.message}`);
+          throw new Error(`Error while initiating merging process: ${resp.error.message}`);
+        }
+        task.title = "Merging SmartUI builds initiated";
+        task.output = chalk__default.default.gray(`${resp.data.message}`);
+      } catch (error) {
+        ctx2.log.debug(error);
+        task.output = chalk__default.default.gray(error.message);
+        throw new Error("Merging SmartUI build failed");
+      }
+    }),
+    rendererOptions: { persistentOutput: true }
+  };
+};
 
-// src/commander/commander.ts
+// src/commander/mergeBranch.ts
+var command7 = new commander.Command();
+command7.name("branch").description("Merge a source branch into the target branch").requiredOption("--source <string>", "Source branch to merge").requiredOption("--target <string>", "Target branch to merge into").action(function(options) {
+  return __async(this, null, function* () {
+    const { source, target } = options;
+    let ctx = ctx_default(command7.optsWithGlobals());
+    if (!source || source.trim() === "") {
+      ctx.log.error("Error: The --source option cannot be empty.");
+      process.exit(1);
+    }
+    if (!target || target.trim() === "") {
+      ctx.log.error("Error: The --target option cannot be empty.");
+      process.exit(1);
+    }
+    ctx.log.debug(`Merging source branch '${source}' into branch branch '${target}'`);
+    ctx.mergeBranchSource = source;
+    ctx.mergeBranchTarget = target;
+    ctx.mergeByBranch = true;
+    let tasks = new listr2.Listr(
+      [
+        auth_default(),
+        getGitInfo_default(),
+        fetchBranchInfo_default(),
+        mergeBuilds_default()
+      ],
+      {
+        rendererOptions: {
+          icon: {
+            [listr2.ListrDefaultRendererLogLevels.OUTPUT]: "\u2192"
+          },
+          color: {
+            [listr2.ListrDefaultRendererLogLevels.OUTPUT]: listr2.color.gray
+          }
+        }
+      }
+    );
+    try {
+      yield tasks.run(ctx);
+    } catch (error) {
+      console.error("Error during merge operation:", error);
+    }
+  });
+});
+var mergeBranch_default = command7;
+var fetchBuildInfo_default = (ctx) => {
+  return {
+    title: `Fetching build info`,
+    task: (ctx2, task) => __async(void 0, null, function* () {
+      updateLogContext({ task: "fetchBuildInfo" });
+      try {
+        if (ctx2.mergeBuildSource === ctx2.mergeBuildTarget) {
+          ctx2.log.error(`Merging two similar build is not possible`);
+          throw new Error(`Merging two similar build is not possible`);
+        }
+        const requestData = {
+          source: ctx2.mergeBuildSource,
+          target: ctx2.mergeBuildTarget,
+          byBranch: ctx2.mergeByBranch,
+          byBuildName: ctx2.mergeByBuild
+        };
+        let resp = yield ctx2.client.fetchBuildInfo(requestData, ctx2);
+        if (resp && resp.data && resp.data.source && resp.data.target) {
+          ctx2.mergeBuildSourceId = resp.data.source;
+          ctx2.mergeBuildTargetId = resp.data.target;
+          ctx2.log.debug(`Merge Build source buildId: ${ctx2.mergeBuildSourceId} and target buildId: ${ctx2.mergeBuildTargetId}`);
+        } else if (resp && resp.error) {
+          if (resp.error.message) {
+            ctx2.log.error(`Error while fetching buildInfo: ${resp.error.message}`);
+            throw new Error(`Error while fetching buildInfo: ${resp.error.message}`);
+          }
+        }
+        task.title = "Build info fetched";
+        task.output = chalk__default.default.gray(`Source buildId: ${ctx2.mergeBuildSourceId} and Target buildId: ${ctx2.mergeBuildTargetId}`);
+      } catch (error) {
+        ctx2.log.debug(error);
+        task.output = chalk__default.default.gray(error.message);
+        throw new Error("Build info fetching failed");
+      }
+    }),
+    rendererOptions: { persistentOutput: true }
+  };
+};
+
+// src/commander/mergeBuild.ts
+var command8 = new commander.Command();
+command8.name("build").description("Merge a source build into the target build").requiredOption("--source <string>", "Source build to merge").requiredOption("--target <string>", "Target build to merge into").action(function(options) {
+  return __async(this, null, function* () {
+    const { source, target } = options;
+    let ctx = ctx_default(command8.optsWithGlobals());
+    if (!source || source.trim() === "") {
+      ctx.log.error("Error: The --source option cannot be empty.");
+      process.exit(1);
+    }
+    if (!target || target.trim() === "") {
+      ctx.log.error("Error: The --target option cannot be empty.");
+      process.exit(1);
+    }
+    ctx.log.debug(`Merging source build '${source}' into target build '${target}'`);
+    ctx.mergeBuildSource = source;
+    ctx.mergeBuildTarget = target;
+    ctx.mergeByBuild = true;
+    let tasks = new listr2.Listr(
+      [
+        auth_default(),
+        getGitInfo_default(),
+        fetchBuildInfo_default(),
+        mergeBuilds_default()
+      ],
+      {
+        rendererOptions: {
+          icon: {
+            [listr2.ListrDefaultRendererLogLevels.OUTPUT]: "\u2192"
+          },
+          color: {
+            [listr2.ListrDefaultRendererLogLevels.OUTPUT]: listr2.color.gray
+          }
+        }
+      }
+    );
+    try {
+      yield tasks.run(ctx);
+    } catch (error) {
+      console.error("Error during merge operation:", error);
+    }
+  });
+});
+var mergeBuild_default = command8;
+
+// src/commander/merge.ts
 var program = new commander.Command();
-program.name("smartui").description("CLI to help you run your SmartUI tests on LambdaTest platform").version(`v${version}`).option("-c --config <filepath>", "Config file path").addCommand(exec_default2).addCommand(capture_default).addCommand(configWeb).addCommand(configStatic).addCommand(upload_default).addCommand(server_default2).addCommand(stopServer_default).addCommand(ping_default).addCommand(configFigma).addCommand(uploadFigma).addCommand(configWebFigma).addCommand(uploadWebFigmaCommand);
-var commander_default = program;
+program.name("merge").description("Merge a source branch into the target branch").addCommand(mergeBranch_default).addCommand(mergeBuild_default);
+var merge_default = program;
+
+// src/commander/commander.ts
+var program2 = new commander.Command();
+program2.name("smartui").description("CLI to help you run your SmartUI tests on LambdaTest platform").version(`v${version}`).option("-c --config <filepath>", "Config file path").option("--markBaseline", "Mark this build baseline").option("--baselineBranch <string>", "Mark this build baseline").option("--baselineBuild <string>", "Mark this build baseline").addCommand(exec_default2).addCommand(capture_default).addCommand(configWeb).addCommand(configStatic).addCommand(upload_default).addCommand(server_default2).addCommand(stopServer_default).addCommand(merge_default).addCommand(ping_default).addCommand(configFigma).addCommand(uploadFigma).addCommand(configWebFigma).addCommand(configAppFigma).addCommand(uploadWebFigmaCommand).addCommand(uploadAppFigmaCommand);
+var commander_default = program2;
 (function() {
   return __async(this, null, function* () {
     let client = new httpClient(env_default());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/smartui-cli",
-  "version": "4.1.11-beta.0",
+  "version": "4.1.12",
   "description": "A command line interface (CLI) to run SmartUI tests on LambdaTest",
   "files": [
     "dist/**/*"