@socketsecurity/cli-with-sentry 0.15.17 → 0.15.18

package/dist/cli.js

@@ -27,7 +27,7 @@ var fs$2 = require('../external/@socketsecurity/registry/lib/fs');
 var shadowInject = require('./shadow-inject.js');
 var objects = require('../external/@socketsecurity/registry/lib/objects');
 var registryConstants = require('../external/@socketsecurity/registry/lib/constants');
-var promises = require('../external/@socketsecurity/registry/lib/promises');
+var require$$7 = require('../external/@socketsecurity/registry/lib/promises');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 async function fetchOrgAnalyticsData(time) {
@@ -1808,23 +1808,23 @@ async function convertGradleToMaven(target, bin, cwd, verbose, gradleOpts) {
   if (verbose) {
     logger.logger.log('[VERBOSE] Resolving:', [cwd, bin]);
   }
-  const rbin = path.resolve(cwd, bin);
+  const rBin = path.resolve(cwd, bin);
   if (verbose) {
     logger.logger.log('[VERBOSE] Resolving:', [cwd, target]);
   }
-  const rtarget = path.resolve(cwd, target);
-  const binExists = fs$1.existsSync(rbin);
-  const targetExists = fs$1.existsSync(rtarget);
+  const rTarget = path.resolve(cwd, target);
+  const binExists = fs$1.existsSync(rBin);
+  const targetExists = fs$1.existsSync(rTarget);
   logger.logger.group('gradle2maven:');
   if (verbose || debug.isDebug()) {
-    logger.logger.log(`[VERBOSE] - Absolute bin path: \`${rbin}\` (${binExists ? 'found' : vendor.yoctocolorsCjsExports.red('not found!')})`);
-    logger.logger.log(`[VERBOSE] - Absolute target path: \`${rtarget}\` (${targetExists ? 'found' : vendor.yoctocolorsCjsExports.red('not found!')})`);
+    logger.logger.log(`[VERBOSE] - Absolute bin path: \`${rBin}\` (${binExists ? 'found' : vendor.yoctocolorsCjsExports.red('not found!')})`);
+    logger.logger.log(`[VERBOSE] - Absolute target path: \`${rTarget}\` (${targetExists ? 'found' : vendor.yoctocolorsCjsExports.red('not found!')})`);
   } else {
-    logger.logger.log(`- executing: \`${rbin}\``);
+    logger.logger.log(`- executing: \`${rBin}\``);
     if (!binExists) {
       logger.logger.warn('Warning: It appears the executable could not be found at this location. An error might be printed later because of that.');
     }
-    logger.logger.log(`- src dir: \`${rtarget}\``);
+    logger.logger.log(`- src dir: \`${rTarget}\``);
     if (!targetExists) {
       logger.logger.warn('Warning: It appears the src dir could not be found at this location. An error might be printed later because of that.');
     }
@@ -1836,7 +1836,6 @@ async function convertGradleToMaven(target, bin, cwd, verbose, gradleOpts) {
     // we can upload them and predict them through the GitHub API. We could do a
     // .socket folder. We could do a socket.pom.gz with all the poms, although
     // I'd prefer something plain-text if it is to be committed.
-
     // Note: init.gradle will be exported by .config/rollup.dist.config.mjs
     const initLocation = path.join(constants.distPath, 'init.gradle');
     const commandArgs = ['--init-script', initLocation, ...gradleOpts, 'pom'];
@@ -1844,7 +1843,7 @@ async function convertGradleToMaven(target, bin, cwd, verbose, gradleOpts) {
       logger.logger.log('[VERBOSE] Executing:', [bin], ', args:', commandArgs);
     }
     logger.logger.log(`Converting gradle to maven from \`${bin}\` on \`${target}\` ...`);
-    const output = await execGradleWithSpinner(rbin, commandArgs, rtarget, cwd);
+    const output = await execGradleWithSpinner(rBin, commandArgs, rTarget, cwd);
     if (verbose) {
       logger.logger.group('[VERBOSE] gradle stdout:');
       logger.logger.log(output);
@@ -1921,12 +1920,12 @@ async function convertSbtToMaven(target, bin, out, verbose, sbtOpts) {
   const {
     spinner
   } = constants;
-  const rbin = path.resolve(bin);
-  const rtarget = path.resolve(target);
+  const rBin = path.resolve(bin);
+  const rTarget = path.resolve(target);
   if (verbose) {
     logger.logger.group('sbt2maven:');
-    logger.logger.log(`[VERBOSE] - Absolute bin path: \`${rbin}\``);
-    logger.logger.log(`[VERBOSE] - Absolute target path: \`${rtarget}\``);
+    logger.logger.log(`[VERBOSE] - Absolute bin path: \`${rBin}\``);
+    logger.logger.log(`[VERBOSE] - Absolute target path: \`${rTarget}\``);
     // logger.log(`[VERBOSE] - Absolute out path: \`${rout}\``)
     logger.logger.groupEnd();
   } else {
@@ -1944,8 +1943,8 @@ async function convertSbtToMaven(target, bin, out, verbose, sbtOpts) {
     // we can upload them and predict them through the GitHub API. We could do a
     // .socket folder. We could do a socket.pom.gz with all the poms, although
     // I'd prefer something plain-text if it is to be committed.
-    const output = await spawn.spawn(bin, ['makePom'].concat(sbtOpts), {
-      cwd: target || '.'
+    const output = await spawn.spawn(bin, ['makePom', ...sbtOpts], {
+      cwd: target || process.cwd()
     });
     spinner.stop();
     if (verbose) {
@@ -3591,8 +3590,8 @@ const cmdDiffScan = {
 
 const GITHUB_ACTIONS_BOT_USERNAME = 'github-actions[bot]';
 const GITHUB_ACTIONS_BOT_EMAIL = `${GITHUB_ACTIONS_BOT_USERNAME}@users.noreply.github.com`;
-function formatBranchName(str) {
-  return str.replace(/[-_.\\/]+/g, '-').replace(/[^-a-zA-Z0-9]+/g, '').replace(/^-+|-+$/g, '');
+function formatBranchName(name) {
+  return name.replace(/[-_.\\/]+/g, '-').replace(/[^-a-zA-Z0-9]+/g, '').replace(/^-+|-+$/g, '');
 }
 function getBaseGitBranch() {
   // Lazily access constants.ENV.GITHUB_REF_NAME.
@@ -3632,56 +3631,52 @@ function getSocketCommitMessage(purl, newVersion, workspaceName) {
   const workspaceDetails = workspaceName ? ` in ${workspaceName}` : '';
   return `socket: Bump ${pkgFullName} from ${purlObj.version} to ${newVersion}${workspaceDetails}`;
 }
+async function gitCleanFdx(cwd = process.cwd()) {
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: 'ignore'
+  };
+  await spawn.spawn('git', ['clean', '-fdx'], stdioIgnoreOptions);
+}
 async function gitCreateAndPushBranch(branch, commitMsg, filepaths, cwd = process.cwd()) {
-  await gitEnsureIdentity(cwd);
-  await spawn.spawn('git', ['checkout', '-b', branch], {
-    cwd
-  });
-  await spawn.spawn('git', ['add', ...filepaths], {
-    cwd
-  });
-  await spawn.spawn('git', ['commit', '-m', commitMsg], {
-    cwd
-  });
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: 'ignore'
+  };
   try {
-    await spawn.spawn('git', ['push', '--force', '--set-upstream', 'origin', branch], {
-      cwd
-    });
+    await gitEnsureIdentity(cwd);
+    await spawn.spawn('git', ['checkout', '-b', branch], stdioIgnoreOptions);
+    await spawn.spawn('git', ['add', ...filepaths], stdioIgnoreOptions);
+    await spawn.spawn('git', ['commit', '-m', commitMsg], stdioIgnoreOptions);
+    await spawn.spawn('git', ['push', '--force', '--set-upstream', 'origin', branch], stdioIgnoreOptions);
     return true;
   } catch {}
-  await spawn.spawn('git', ['branch', '-D', branch], {
-    cwd
-  });
+  try {
+    await spawn.spawn('git', ['branch', '-D', branch], stdioIgnoreOptions);
+  } catch {}
   return false;
 }
 async function gitEnsureIdentity(cwd = process.cwd()) {
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: 'ignore'
+  };
+  const stdioPipeOptions = {
+    cwd
+  };
   let hasUserName = false;
   try {
-    const {
-      stdout
-    } = await spawn.spawn('git', ['config', '--get', 'user.name'], {
-      cwd
-    });
-    hasUserName = !!stdout.trim();
+    hasUserName = !!(await spawn.spawn('git', ['config', '--get', 'user.name'], stdioPipeOptions)).stdout.trim();
   } catch {}
   if (!hasUserName) {
-    await spawn.spawn('git', ['config', 'user.name', GITHUB_ACTIONS_BOT_USERNAME], {
-      cwd
-    });
+    await spawn.spawn('git', ['config', 'user.name', GITHUB_ACTIONS_BOT_USERNAME], stdioIgnoreOptions);
   }
   let hasUserEmail = false;
   try {
-    const {
-      stdout
-    } = await spawn.spawn('git', ['config', '--get', 'user.email'], {
-      cwd
-    });
-    hasUserEmail = !!stdout.trim();
+    hasUserEmail = !!(await spawn.spawn('git', ['config', '--get', 'user.email'], stdioPipeOptions)).stdout.trim();
   } catch {}
   if (!hasUserEmail) {
-    await spawn.spawn('git', ['config', 'user.email', GITHUB_ACTIONS_BOT_EMAIL], {
-      cwd
-    });
+    await spawn.spawn('git', ['config', 'user.email', GITHUB_ACTIONS_BOT_EMAIL], stdioIgnoreOptions);
   }
 }
 async function gitResetAndClean(branch = 'HEAD', cwd = process.cwd()) {
@@ -3691,34 +3686,28 @@ async function gitResetAndClean(branch = 'HEAD', cwd = process.cwd()) {
   await gitCleanFdx(cwd);
 }
 async function gitResetHard(branch = 'HEAD', cwd = process.cwd()) {
-  await spawn.spawn('git', ['reset', '--hard', branch], {
-    cwd
-  });
-}
-async function gitCleanFdx(cwd = process.cwd()) {
-  await spawn.spawn('git', ['clean', '-fdx'], {
-    cwd
-  });
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: 'ignore'
+  };
+  await spawn.spawn('git', ['reset', '--hard', branch], stdioIgnoreOptions);
 }
 async function gitRemoteBranchExists(branch, cwd = process.cwd()) {
+  const stdioPipeOptions = {
+    cwd
+  };
   try {
-    const {
-      stdout
-    } = await spawn.spawn('git', ['ls-remote', '--heads', 'origin', branch], {
-      cwd
-    });
-    return stdout.trim().length > 0;
+    return (await spawn.spawn('git', ['ls-remote', '--heads', 'origin', branch], stdioPipeOptions)).stdout.trim().length > 0;
   } catch {
     return false;
   }
 }
 async function gitUnstagedModifiedFiles(cwd = process.cwd()) {
-  const {
-    stdout
-  } = await spawn.spawn('git', ['diff', '--name-only'], {
+  const stdioPipeOptions = {
     cwd
-  });
-  const rawFiles = stdout?.trim().split('\n') ?? [];
+  };
+  const stdout = (await spawn.spawn('git', ['diff', '--name-only'], stdioPipeOptions)).stdout.trim();
+  const rawFiles = stdout.split('\n') ?? [];
   return rawFiles.map(relPath => path$1.normalizePath(relPath));
 }
 
@@ -3886,8 +3875,9 @@ async function cleanupOpenPrs(owner, repo, purl, newVersion, options) {
     } = match;
     const versionText = /(?<= to )\S+/.exec(props.title)?.[0];
     const {
-      number: prNumber
+      number: prNum
     } = props;
+    const prRef = `PR #${prNum}`;
     const prVersion = vendor.semverExports.coerce(versionText);
     // Close older PRs.
     if (prVersion && vendor.semverExports.lt(prVersion, newVersion)) {
@@ -3895,16 +3885,16 @@ async function cleanupOpenPrs(owner, repo, purl, newVersion, options) {
         await octokit.pulls.update({
           owner,
           repo,
-          pull_number: prNumber,
+          pull_number: prNum,
           state: 'closed'
         });
-        logger.logger.info(`Closed PR #${prNumber} for older version ${prVersion}`);
+        debug.debugLog(`Closed ${prRef} for older version ${prVersion}.`);
         // Remove entry from parent object.
         match.parent.splice(match.index, 1);
         // Mark cache to be saved.
         cachesToSave.set(match.cacheKey, match.data);
       } catch (e) {
-        logger.logger.warn(`Failed to close PR #${prNumber}: ${e.message}`);
+        debug.debugLog(`Failed to close ${prRef}: ${e?.message || 'Unknown error'}`);
         return;
       }
     }
@@ -3918,7 +3908,7 @@ async function cleanupOpenPrs(owner, repo, purl, newVersion, options) {
           base: props.headRefName,
           head: props.baseRefName
         });
-        logger.logger.info(`Updated stale PR #${prNumber}`);
+        debug.debugLog(`Updated stale ${prRef}.`);
         // Update entry entry.
         if (match.apiType === 'graphql') {
           match.entry.mergeStateStatus = 'CLEAN';
@@ -3928,8 +3918,8 @@ async function cleanupOpenPrs(owner, repo, purl, newVersion, options) {
         // Mark cache to be saved.
         cachesToSave.set(match.cacheKey, match.data);
       } catch (e) {
-        const message = e?.message ?? 'Unknown error';
-        logger.logger.warn(`Failed to update PR #${prNumber}: ${message}`);
+        const message = e?.message || 'Unknown error';
+        debug.debugLog(`Failed to update ${prRef}: ${message}`);
       }
     }
   }));
@@ -3941,8 +3931,7 @@ async function cleanupOpenPrs(owner, repo, purl, newVersion, options) {
   }
 }
 async function enablePrAutoMerge({
-  node_id: prId,
-  number: prNumber
+  node_id: prId
 }) {
   const octokitGraphql = getOctokitGraphql();
   let error;
@@ -3962,28 +3951,32 @@ async function enablePrAutoMerge({
     });
     const respPrNumber = response?.enablePullRequestAutoMerge?.pullRequest?.number;
     if (respPrNumber) {
-      logger.logger.info(`Auto-merge enabled for PR #${respPrNumber}`);
-      return true;
+      return {
+        enabled: true
+      };
     }
   } catch (e) {
     error = e;
   }
-  let message = `Failed to enable auto-merge for PR #${prNumber}`;
-  if (error instanceof vendor.GraphqlResponseError && error.errors) {
+  if (error instanceof vendor.GraphqlResponseError && Array.isArray(error.errors)) {
     const details = error.errors.map(({
       message
-    }) => ` - ${message.trim()}`).join('\n').trim();
-    message += `:\n${details}`;
+    }) => message.trim());
+    return {
+      enabled: false,
+      details
+    };
   }
-  logger.logger.error(message);
-  return false;
+  return {
+    enabled: false
+  };
 }
 function getGitHubEnvRepoInfo() {
   // Lazily access constants.ENV.GITHUB_REPOSITORY.
   const ownerSlashRepo = constants.ENV.GITHUB_REPOSITORY;
   const slashIndex = ownerSlashRepo.indexOf('/');
   if (slashIndex === -1) {
-    throw new Error('Missing GITHUB_REPOSITORY environment variable');
+    return null;
   }
   return {
     owner: ownerSlashRepo.slice(0, slashIndex),
@@ -3993,44 +3986,36 @@ function getGitHubEnvRepoInfo() {
 async function openPr(owner, repo, branch, purl, newVersion, options) {
   const {
     baseBranch = 'main',
-    cwd = process.cwd(),
     workspaceName
   } = {
     __proto__: null,
     ...options
   };
   // Lazily access constants.ENV.GITHUB_ACTIONS.
-  if (constants.ENV.GITHUB_ACTIONS) {
-    // Lazily access constants.ENV properties.
-    const token = constants.ENV.SOCKET_SECURITY_GITHUB_PAT || constants.ENV.GITHUB_TOKEN;
-    const url = `https://x-access-token:${token}@github.com/${owner}/${repo}`;
-    await spawn.spawn('git', ['remote', 'set-url', 'origin', url], {
-      cwd
+  if (!constants.ENV.GITHUB_ACTIONS) {
+    debug.debugLog('Missing GITHUB_ACTIONS environment variable.');
+    return null;
+  }
+  const octokit = getOctokit();
+  try {
+    return await octokit.pulls.create({
+      owner,
+      repo,
+      title: getSocketPullRequestTitle(purl, newVersion, workspaceName),
+      head: branch,
+      base: baseBranch,
+      body: getSocketPullRequestBody(purl, newVersion, workspaceName)
     });
-    const octokit = getOctokit();
-    try {
-      return await octokit.pulls.create({
-        owner,
-        repo,
-        title: getSocketPullRequestTitle(purl, newVersion, workspaceName),
-        head: branch,
-        base: baseBranch,
-        body: getSocketPullRequestBody(purl, newVersion, workspaceName)
-      });
-    } catch (e) {
-      let message = `Failed to open pull request`;
-      if (e instanceof vendor.RequestError) {
-        const restErrors = e.response?.data?.['errors'];
-        if (Array.isArray(restErrors)) {
-          const details = restErrors.map(restErr => `- ${restErr.message?.trim() ?? `${restErr.resource}.${restErr.field} (${restErr.code})`}`).join('\n');
-          message += `:\n${details}`;
-        }
-      }
-      logger.logger.error(message);
-      return null;
+  } catch (e) {
+    let message = `Failed to open pull request`;
+    const errors = e instanceof vendor.RequestError ? e.response?.data?.['errors'] : undefined;
+    if (Array.isArray(errors)) {
+      const details = errors.map(d => `- ${d.message?.trim() ?? `${d.resource}.${d.field} (${d.code})`}`).join('\n');
+      message += `:\n${details}`;
     }
+    debug.debugLog(message);
   }
-  throw new Error('Missing GITHUB_ACTIONS environment variable');
+  return null;
 }
 async function prExistForBranch(owner, repo, branch) {
   const octokit = getOctokit();
@@ -4048,6 +4033,14 @@ async function prExistForBranch(owner, repo, branch) {
   } catch {}
   return false;
 }
+async function setGitRemoteGitHubRepoUrl(owner, repo, token, cwd = process.cwd()) {
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: 'ignore'
+  };
+  const url = `https://x-access-token:${token}@github.com/${owner}/${repo}`;
+  await spawn.spawn('git', ['remote', 'set-url', 'origin', url], stdioIgnoreOptions);
+}
 
 const CMD_NAME$1 = 'socket fix';
 function getAlertMapOptions(options = {}) {
@@ -4163,8 +4156,9 @@ async function npmFix(pkgEnvDetails, {
     return;
   }
 
-  // Lazily access constants.ENV.CI.
-  const isCi = constants.ENV.CI;
+  // Lazily access constants.ENV properties.
+  const token = constants.ENV.SOCKET_SECURITY_GITHUB_PAT || constants.ENV.GITHUB_TOKEN;
+  const isCi = !!(constants.ENV.CI && constants.ENV.GITHUB_ACTIONS && constants.ENV.GITHUB_REPOSITORY && token);
   const baseBranch = isCi ? getBaseGitBranch() : '';
   const workspacePkgJsonPaths = await utils.globWorkspace(pkgEnvDetails.agent, rootPath);
   const pkgJsonPaths = [...workspacePkgJsonPaths,
@@ -4190,7 +4184,7 @@ async function npmFix(pkgEnvDetails, {
     // eslint-disable-next-line no-await-in-loop
     const packument = await packages.fetchPackagePackument(name);
     if (!packument) {
-      logger.logger.warn(`Unexpected condition: No packument found for ${name}\n`);
+      logger.logger.warn(`Unexpected condition: No packument found for ${name}.\n`);
       logger.logger.dedent();
       spinner?.dedent();
       continue infoEntriesLoop;
@@ -4289,7 +4283,7 @@ async function npmFix(pkgEnvDetails, {
             workspaceLogCallCount = logger.logger.logCallCount;
           }
           spinner?.start();
-          spinner?.info(`Installing ${newId} in ${workspaceName}`);
+          spinner?.info(`Installing ${newId} in ${workspaceName}.`);
           let error;
           let errored = false;
           try {
@@ -4305,14 +4299,13 @@ async function npmFix(pkgEnvDetails, {
                 stdio: 'ignore'
               });
             }
-            spinner?.success(`Fixed ${name} in ${workspaceName}`);
+            spinner?.success(`Fixed ${name} in ${workspaceName}.`);
           } catch (e) {
             errored = true;
             error = e;
           }
           spinner?.stop();
           if (!errored && isCi) {
-            const branch = getSocketBranchName(oldPurl, newVersion, workspaceName);
             try {
               const moddedFilepaths =
               // eslint-disable-next-line no-await-in-loop
@@ -4324,36 +4317,26 @@ async function npmFix(pkgEnvDetails, {
                 logger.logger.warn('Unexpected condition: Nothing to commit, skipping PR creation.');
                 continue infosLoop;
               }
-              const {
-                owner,
-                repo
-              } = getGitHubEnvRepoInfo();
+              const repoInfo = getGitHubEnvRepoInfo();
+              const branch = getSocketBranchName(oldPurl, newVersion, workspaceName);
+              let skipPr = false;
+              if (
               // eslint-disable-next-line no-await-in-loop
-              if (await prExistForBranch(owner, repo, branch)) {
+              await prExistForBranch(repoInfo.owner, repoInfo.repo, branch)) {
+                skipPr = true;
                 debug.debugLog(`Branch "${branch}" exists, skipping PR creation.`);
-                // eslint-disable-next-line no-await-in-loop
-                await gitResetAndClean(baseBranch, cwd);
-                // eslint-disable-next-line no-await-in-loop
-                actualTree = await install$1(arb, {
-                  cwd
-                });
-                continue infosLoop;
               }
               // eslint-disable-next-line no-await-in-loop
-              if (await gitRemoteBranchExists(branch, cwd)) {
+              else if (await gitRemoteBranchExists(branch, cwd)) {
+                skipPr = true;
                 debug.debugLog(`Remote branch "${branch}" exists, skipping PR creation.`);
-                // eslint-disable-next-line no-await-in-loop
-                await gitResetAndClean(baseBranch, cwd);
-                // eslint-disable-next-line no-await-in-loop
-                actualTree = await install$1(arb, {
-                  cwd
-                });
-                continue infosLoop;
-              }
-              if (
+              } else if (
               // eslint-disable-next-line no-await-in-loop
               !(await gitCreateAndPushBranch(branch, getSocketCommitMessage(oldPurl, newVersion, workspaceName), moddedFilepaths, cwd))) {
+                skipPr = true;
                 logger.logger.warn('Unexpected condition: Push failed, skipping PR creation.');
+              }
+              if (skipPr) {
                 // eslint-disable-next-line no-await-in-loop
                 await gitResetAndClean(baseBranch, cwd);
                 // eslint-disable-next-line no-await-in-loop
@@ -4362,12 +4345,13 @@ async function npmFix(pkgEnvDetails, {
                 });
                 continue infosLoop;
               }
+
               // eslint-disable-next-line no-await-in-loop
-              await cleanupOpenPrs(owner, repo, oldPurl, newVersion, {
+              await Promise.allSettled([setGitRemoteGitHubRepoUrl(repoInfo.owner, repoInfo.repo, token, cwd), cleanupOpenPrs(repoInfo.owner, repoInfo.repo, oldPurl, newVersion, {
                 workspaceName
-              });
+              })]);
               // eslint-disable-next-line no-await-in-loop
-              const prResponse = await openPr(owner, repo, branch, oldPurl, newVersion, {
+              const prResponse = await openPr(repoInfo.owner, repoInfo.repo, branch, oldPurl, newVersion, {
                 baseBranch,
                 cwd,
                 workspaceName
@@ -4376,12 +4360,22 @@ async function npmFix(pkgEnvDetails, {
                 const {
                   data
                 } = prResponse;
-                logger.logger.success(`Opened PR #${data.number}.`);
+                const prRef = `PR #${data.number}`;
+                logger.logger.success(`Opened ${prRef}.`);
                 if (autoMerge) {
                   logger.logger.indent();
                   spinner?.indent();
                   // eslint-disable-next-line no-await-in-loop
-                  await enablePrAutoMerge(data);
+                  const {
+                    details,
+                    enabled
+                  } = await enablePrAutoMerge(data);
+                  if (enabled) {
+                    logger.logger.info(`Auto-merge enabled for ${prRef}.`);
+                  } else {
+                    const message = `Failed to enable auto-merge for ${prRef}${details ? `:\n${details.map(d => ` - ${d}`).join('\n')}` : '.'}`;
+                    logger.logger.error(message);
+                  }
                   logger.logger.dedent();
                   spinner?.dedent();
                 }
@@ -4548,8 +4542,9 @@ async function pnpmFix(pkgEnvDetails, {
     return;
   }
 
-  // Lazily access constants.ENV.CI.
-  const isCi = constants.ENV.CI;
+  // Lazily access constants.ENV properties.
+  const token = constants.ENV.SOCKET_SECURITY_GITHUB_PAT || constants.ENV.GITHUB_TOKEN;
+  const isCi = !!(constants.ENV.CI && constants.ENV.GITHUB_ACTIONS && constants.ENV.GITHUB_REPOSITORY && token);
   const baseBranch = isCi ? getBaseGitBranch() : '';
   const workspacePkgJsonPaths = await utils.globWorkspace(pkgEnvDetails.agent, rootPath);
   const pkgJsonPaths = [...workspacePkgJsonPaths,
@@ -4708,7 +4703,7 @@ async function pnpmFix(pkgEnvDetails, {
             workspaceLogCallCount = logger.logger.logCallCount;
           }
           spinner?.start();
-          spinner?.info(`Installing ${newId} in ${workspaceName}`);
+          spinner?.info(`Installing ${newId} in ${workspaceName}.`);
           let error;
           let errored = false;
           try {
@@ -4725,14 +4720,13 @@ async function pnpmFix(pkgEnvDetails, {
                 stdio: 'ignore'
               });
             }
-            spinner?.success(`Fixed ${name} in ${workspaceName}`);
+            spinner?.success(`Fixed ${name} in ${workspaceName}.`);
           } catch (e) {
             error = e;
             errored = true;
           }
           spinner?.stop();
           if (!errored && isCi) {
-            const branch = getSocketBranchName(oldPurl, newVersion, workspaceName);
             try {
               const moddedFilepaths =
               // eslint-disable-next-line no-await-in-loop
@@ -4744,38 +4738,26 @@ async function pnpmFix(pkgEnvDetails, {
                 logger.logger.warn('Unexpected condition: Nothing to commit, skipping PR creation.');
                 continue infosLoop;
               }
-              const {
-                owner,
-                repo
-              } = getGitHubEnvRepoInfo();
+              const repoInfo = getGitHubEnvRepoInfo();
+              const branch = getSocketBranchName(oldPurl, newVersion, workspaceName);
+              let skipPr = false;
+              if (
               // eslint-disable-next-line no-await-in-loop
-              if (await prExistForBranch(owner, repo, branch)) {
+              await prExistForBranch(repoInfo.owner, repoInfo.repo, branch)) {
+                skipPr = true;
                 debug.debugLog(`Branch "${branch}" exists, skipping PR creation.`);
-                // eslint-disable-next-line no-await-in-loop
-                await gitResetAndClean(baseBranch, cwd);
-                // eslint-disable-next-line no-await-in-loop
-                actualTree = await install(pkgEnvDetails, {
-                  cwd,
-                  spinner
-                });
-                continue infosLoop;
               }
               // eslint-disable-next-line no-await-in-loop
-              if (await gitRemoteBranchExists(branch, cwd)) {
+              else if (await gitRemoteBranchExists(branch, cwd)) {
+                skipPr = true;
                 debug.debugLog(`Remote branch "${branch}" exists, skipping PR creation.`);
-                // eslint-disable-next-line no-await-in-loop
-                await gitResetAndClean(baseBranch, cwd);
-                // eslint-disable-next-line no-await-in-loop
-                actualTree = await install(pkgEnvDetails, {
-                  cwd,
-                  spinner
-                });
-                continue infosLoop;
-              }
-              if (
+              } else if (
               // eslint-disable-next-line no-await-in-loop
               !(await gitCreateAndPushBranch(branch, getSocketCommitMessage(oldPurl, newVersion, workspaceName), moddedFilepaths, cwd))) {
+                skipPr = true;
                 logger.logger.warn('Unexpected condition: Push failed, skipping PR creation.');
+              }
+              if (skipPr) {
                 // eslint-disable-next-line no-await-in-loop
                 await gitResetAndClean(baseBranch, cwd);
                 // eslint-disable-next-line no-await-in-loop
@@ -4785,12 +4767,13 @@ async function pnpmFix(pkgEnvDetails, {
                 });
                 continue infosLoop;
               }
+
               // eslint-disable-next-line no-await-in-loop
-              await cleanupOpenPrs(owner, repo, oldPurl, newVersion, {
+              await Promise.allSettled([setGitRemoteGitHubRepoUrl(repoInfo.owner, repoInfo.repo, token, cwd), cleanupOpenPrs(repoInfo.owner, repoInfo.repo, oldPurl, newVersion, {
                 workspaceName
-              });
+              })]);
               // eslint-disable-next-line no-await-in-loop
-              const prResponse = await openPr(owner, repo, branch, oldPurl, newVersion, {
+              const prResponse = await openPr(repoInfo.owner, repoInfo.repo, branch, oldPurl, newVersion, {
                 baseBranch,
                 cwd,
                 workspaceName
@@ -4799,12 +4782,22 @@ async function pnpmFix(pkgEnvDetails, {
                 const {
                   data
                 } = prResponse;
-                logger.logger.success(`Opened PR #${data.number}.`);
+                const prRef = `PR #${data.number}`;
+                logger.logger.success(`Opened ${prRef}.`);
                 if (autoMerge) {
                   logger.logger.indent();
                   spinner?.indent();
                   // eslint-disable-next-line no-await-in-loop
-                  await enablePrAutoMerge(data);
+                  const {
+                    details,
+                    enabled
+                  } = await enablePrAutoMerge(data);
+                  if (enabled) {
+                    logger.logger.info(`Auto-merge enabled for ${prRef}.`);
+                  } else {
+                    const message = `Failed to enable auto-merge for ${prRef}${details ? `:\n${details.map(d => ` - ${d}`).join('\n')}` : '.'}`;
+                    logger.logger.error(message);
+                  }
                   logger.logger.dedent();
                   spinner?.dedent();
                 }
@@ -6638,7 +6631,7 @@ async function npmQuery(npmExecPath, cwd) {
       cwd,
       // Lazily access constants.WIN32.
       shell: constants.WIN32
-    })).stdout;
+    })).stdout.trim();
   } catch {}
   return cleanupQueryStdout(stdout);
 }
@@ -6650,7 +6643,7 @@ async function lsBun(pkgEnvDetails, cwd) {
       cwd,
       // Lazily access constants.WIN32.
       shell: constants.WIN32
-    })).stdout;
+    })).stdout.trim();
   } catch {}
   return '';
 }
@@ -6674,7 +6667,7 @@ async function lsPnpm(pkgEnvDetails, cwd, options) {
       cwd,
       // Lazily access constants.WIN32.
       shell: constants.WIN32
-    })).stdout;
+    })).stdout.trim();
   } catch {}
   return parsableToQueryStdout(stdout);
 }
@@ -6686,7 +6679,7 @@ async function lsVlt(pkgEnvDetails, cwd) {
       cwd,
       // Lazily access constants.WIN32.
       shell: constants.WIN32
-    })).stdout;
+    })).stdout.trim();
   } catch {}
   return cleanupQueryStdout(stdout);
 }
@@ -6892,7 +6885,7 @@ async function addOverrides(pkgEnvDetails, pkgPath, options) {
   vendor.semverExports.coerce(data.engines.node), pkgEnvDetails.pkgRequirements.node));
 
   // Chunk package names to process them in parallel 3 at a time.
-  await promises.pEach(manifestEntries, 3, async ({
+  await require$$7.pEach(manifestEntries, 3, async ({
     1: data
   }) => {
     const {
@@ -6942,7 +6935,7 @@ async function addOverrides(pkgEnvDetails, pkgPath, options) {
         npmExecPath
       });
       // Chunk package names to process them in parallel 3 at a time.
-      await promises.pEach(overridesDataObjects, 3, async ({
+      await require$$7.pEach(overridesDataObjects, 3, async ({
         overrides,
         type
       }) => {
@@ -6992,7 +6985,7 @@ async function addOverrides(pkgEnvDetails, pkgPath, options) {
   });
   if (isWorkspace) {
     // Chunk package names to process them in parallel 3 at a time.
-    await promises.pEach(workspacePkgJsonPaths, 3, async workspacePkgJsonPath => {
+    await require$$7.pEach(workspacePkgJsonPaths, 3, async workspacePkgJsonPath => {
       const otherState = await addOverrides(pkgEnvDetails, path.dirname(workspacePkgJsonPath), {
         logger,
         pin,
@@ -11746,5 +11739,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=a62b48d4-63b9-4b1e-b260-b363f86c80da
+//# debugId=9dea3102-060a-4a56-a311-fca26f56933e
 //# sourceMappingURL=cli.js.map