From b04f169e5a0f033b48554d9f1ad4ffe699a9ed46 Mon Sep 17 00:00:00 2001
From: Raghav Singhak <raghav.s@browserstack.com>
Date: Mon, 24 Nov 2025 13:25:33 +0530
Subject: [PATCH 1/2] zip deletion metric fix

---
 bin/commands/runs.js       | 2 +-
 bin/helpers/fileHelpers.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/commands/runs.js b/bin/commands/runs.js
index 8bf716f9..24a388bd 100644
--- a/bin/commands/runs.js
+++ b/bin/commands/runs.js
@@ -471,8 +471,8 @@ module.exports = function run(args, rawArgs) {
                 utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.LOCAL_START_FAILED}`, Constants.messageTypes.ERROR, 'local_start_failed', buildReportData, rawArgs);
               } else {
                 logger.error(Constants.userMessages.ZIP_UPLOAD_FAILED);
-                fileHelpers.deleteZip();
                 utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.ZIP_UPLOAD_FAILED}`, Constants.messageTypes.ERROR, 'zip_upload_failed', buildReportData, rawArgs);
+                fileHelpers.deleteZip();
                 try {
                   fileHelpers.deletePackageArchieve();
                 } catch (err) {
diff --git a/bin/helpers/fileHelpers.js b/bin/helpers/fileHelpers.js
index cdd73932..a33bf471 100644
--- a/bin/helpers/fileHelpers.js
+++ b/bin/helpers/fileHelpers.js
@@ -32,7 +32,7 @@ exports.deleteZip = () => {
     return 0;
   } catch (err) {
     logger.info(Constants.userMessages.ZIP_DELETE_FAILED);
-    return 1;
+    throw err;
   }
 };
 

From fa4cb2ef88b890025e01edac84d89d0814aa5812 Mon Sep 17 00:00:00 2001
From: Raghav Singhak <raghav.s@browserstack.com>
Date: Mon, 1 Dec 2025 16:21:35 +0530
Subject: [PATCH 2/2] small edge case fix

---
 bin/commands/runs.js       | 6 +++++-
 bin/helpers/fileHelpers.js | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/commands/runs.js b/bin/commands/runs.js
index 24a388bd..a4e21b5a 100644
--- a/bin/commands/runs.js
+++ b/bin/commands/runs.js
@@ -472,7 +472,11 @@ module.exports = function run(args, rawArgs) {
               } else {
                 logger.error(Constants.userMessages.ZIP_UPLOAD_FAILED);
                 utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.ZIP_UPLOAD_FAILED}`, Constants.messageTypes.ERROR, 'zip_upload_failed', buildReportData, rawArgs);
-                fileHelpers.deleteZip();
+                try {
+                    fileHelpers.deleteZip();
+                } catch (err) {
+                  utils.sendUsageReport(bsConfig, args, Constants.userMessages.ZIP_DELETE_FAILED, Constants.messageTypes.ERROR, 'zip_deletion_failed', buildReportData, rawArgs);
+                }
                 try {
                   fileHelpers.deletePackageArchieve();
                 } catch (err) {
diff --git a/bin/helpers/fileHelpers.js b/bin/helpers/fileHelpers.js
index a33bf471..e993c667 100644
--- a/bin/helpers/fileHelpers.js
+++ b/bin/helpers/fileHelpers.js
@@ -27,6 +27,9 @@ exports.fileExists = function (filePath, cb) {
 
 exports.deleteZip = () => {
   try {
+    if (!fs.existsSync(config.fileName)) {
+      return 0;
+    }
     fs.unlinkSync(config.fileName);
     logger.info(Constants.userMessages.ZIP_DELETED);
     return 0;