@lambdatest/smartui-cli 4.1.11 → 4.1.13

package/dist/index.cjs

@@ -1738,7 +1738,8 @@ var env_default = () => {
     PROJECT_NAME,
     SMARTUI_API_PROXY,
     SMARTUI_API_SKIP_CERTIFICATES,
-    USE_REMOTE_DISCOVERY
+    USE_REMOTE_DISCOVERY,
+    SMART_GIT
   } = process.env;
   return {
     PROJECT_TOKEN,
@@ -1759,7 +1760,8 @@ var env_default = () => {
     PROJECT_NAME,
     SMARTUI_API_PROXY,
     SMARTUI_API_SKIP_CERTIFICATES: SMARTUI_API_SKIP_CERTIFICATES === "true",
-    USE_REMOTE_DISCOVERY: USE_REMOTE_DISCOVERY === "true"
+    USE_REMOTE_DISCOVERY: USE_REMOTE_DISCOVERY === "true",
+    SMART_GIT: SMART_GIT === "true"
   };
 };
 var logContext = {};
@@ -1854,7 +1856,7 @@ var authExec_default = (ctx) => {
 };
 
 // package.json
-var version = "4.1.11";
+var version = "4.1.13";
 var package_default = {
   name: "@lambdatest/smartui-cli",
   version,
@@ -2084,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",
@@ -2093,7 +2095,10 @@ var httpClient = class {
         config,
         buildName,
         isStartExec,
-        packageVersion: package_default.version
+        packageVersion: package_default.version,
+        smartGit,
+        markBaseline,
+        baselineBuild
       }
     }, log2);
   }
@@ -2411,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;
@@ -2432,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;
@@ -2439,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) {
@@ -2543,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,
@@ -2553,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"
@@ -2577,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 || ""
     };
   }
 };
@@ -2636,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");
@@ -2659,6 +2712,7 @@ var createBuildExec_default = (ctx) => {
           }
         }
         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, "");
           }
@@ -2800,6 +2854,10 @@ var finalizeBuild_default = (ctx) => {
       }
       let buildUrls = `build url: ${ctx2.build.url}
 `;
+      if (pingIntervalId !== null) {
+        clearInterval(pingIntervalId);
+        ctx2.log.debug("Ping polling stopped immediately.");
+      }
       for (const [sessionId, capabilities] of ctx2.sessionCapabilitiesMap.entries()) {
         try {
           const buildId = (capabilities == null ? void 0 : capabilities.buildId) || "";
@@ -3775,7 +3833,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,
@@ -3879,15 +3937,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").option("--userName <string>", "Specify the LT username").option("--accessKey <string>", "Specify the LT accesskey").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;
@@ -4109,14 +4167,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) {
@@ -4493,15 +4558,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").option("--userName <string>", "Specify the LT username").option("--accessKey <string>", "Specify the LT accesskey").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.`);
@@ -4586,14 +4651,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").option("--userName <string>", "Specify the LT username").option("--accessKey <string>", "Specify the LT accesskey").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.`);
@@ -4870,10 +4935,10 @@ var uploadAppFigma_default2 = (ctx) => {
 var uploadFigma = new commander.Command();
 var uploadWebFigmaCommand = new commander.Command();
 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, _, command7) {
+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.`);
@@ -4912,10 +4977,10 @@ uploadFigma.name("upload-figma").description("Capture screenshots of static site
     }
   });
 });
-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, _, 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;
@@ -4964,10 +5029,10 @@ uploadWebFigmaCommand.name("upload-figma-web").description("Capture figma screen
     }
   });
 });
-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, _, command7) {
+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(command7.optsWithGlobals());
+    let ctx = ctx_default(command9.optsWithGlobals());
     if (!fs5__default.default.existsSync(file)) {
       console.log(`Error: figma-app config file ${file} not found.`);
       return;
@@ -5118,11 +5183,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(configAppFigma).addCommand(uploadWebFigmaCommand).addCommand(uploadAppFigmaCommand);
-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",
+  "version": "4.1.13",
   "description": "A command line interface (CLI) to run SmartUI tests on LambdaTest",
   "files": [
     "dist/**/*"