socket 0.15.60 → 0.15.61

package/dist/cli.js

@@ -3859,6 +3859,28 @@ async function gitUnstagedModifiedFiles(cwd = process.cwd()) {
   }
 }
 
+function getActiveBranchesForPackage(ciEnv, partialPurl, openPrs) {
+  if (!ciEnv) {
+    return [];
+  }
+  const partialPurlObj = utils.getPurlObject(partialPurl);
+  const activeBranches = [];
+  const branchFullName = getSocketBranchFullNameComponent(partialPurlObj);
+  const branchPurlType = getSocketBranchPurlTypeComponent(partialPurlObj);
+  for (const pr of openPrs) {
+    const parsedBranch = ciEnv.branchParser(pr.headRefName);
+    if (branchPurlType === parsedBranch?.type && branchFullName === parsedBranch?.fullName) {
+      activeBranches.push(parsedBranch);
+    }
+  }
+  if (activeBranches.length) {
+    debug.debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches);
+  } else if (openPrs.length) {
+    debug.debugFn('miss: 0 active branches found');
+  }
+  return activeBranches;
+}
+
 let _octokit;
 function getOctokit() {
   if (_octokit === undefined) {
@@ -4252,6 +4274,26 @@ async function setGitRemoteGithubRepoUrl(owner, repo, token, cwd = process.cwd()
   }
 }
 
+function getCiEnv() {
+  const gitEmail = constants.ENV.SOCKET_CLI_GIT_USER_EMAIL;
+  const gitUser = constants.ENV.SOCKET_CLI_GIT_USER_NAME;
+  const githubToken = constants.ENV.SOCKET_CLI_GITHUB_TOKEN;
+  const isCi = !!(constants.ENV.CI && constants.ENV.GITHUB_ACTIONS && constants.ENV.GITHUB_REPOSITORY && gitEmail && gitUser && githubToken);
+  return isCi ? {
+    gitEmail,
+    gitUser,
+    githubToken,
+    repoInfo: getGithubEnvRepoInfo(),
+    baseBranch: getBaseGitBranch(),
+    branchParser: createSocketBranchParser()
+  } : null;
+}
+async function getOpenPrsForEnvironment(env) {
+  return env ? await getOpenSocketPrs(env.repoInfo.owner, env.repoInfo.repo, {
+    author: env.gitUser
+  }) : [];
+}
+
 const CMD_NAME$1 = 'socket fix';
 function getAlertsMapOptions(options = {}) {
   return {
@@ -4303,19 +4345,9 @@ async function npmFix(pkgEnvDetails, {
   const {
     pkgPath: rootPath
   } = pkgEnvDetails;
-
-  // Lazily access constants.ENV properties.
-  const gitEmail = constants.ENV.SOCKET_CLI_GIT_USER_EMAIL;
-  const gitUser = constants.ENV.SOCKET_CLI_GIT_USER_NAME;
-  const githubToken = constants.ENV.SOCKET_CLI_GITHUB_TOKEN;
-  const isCi = !!(constants.ENV.CI && constants.ENV.GITHUB_ACTIONS && constants.ENV.GITHUB_REPOSITORY && gitEmail && gitUser && githubToken);
-  const repoInfo = isCi ? getGithubEnvRepoInfo() : null;
   spinner?.start();
-  const openPrs =
-  // Check repoInfo to make TypeScript happy.
-  isCi && repoInfo ? await getOpenSocketPrs(repoInfo.owner, repoInfo.repo, {
-    author: gitUser
-  }) : [];
+  const ciEnv = getCiEnv();
+  const openPrs = ciEnv ? await getOpenPrsForEnvironment(ciEnv) : [];
   let count = 0;
   const arb = new shadowNpmInject.Arborist({
     path: rootPath,
@@ -4353,17 +4385,23 @@ async function npmFix(pkgEnvDetails, {
       }
     };
   }
-  const baseBranch = isCi ? getBaseGitBranch() : '';
-  const branchParser = isCi ? createSocketBranchParser() : null;
+
+  // Lazily access constants.packumentCache.
+  const {
+    packumentCache
+  } = constants;
   const workspacePkgJsonPaths = await utils.globWorkspace(pkgEnvDetails.agent, rootPath);
   const pkgJsonPaths = [...workspacePkgJsonPaths,
   // Process the workspace root last since it will add an override to package.json.
   pkgEnvDetails.editablePkgJson.filename];
   const sortedInfoEntries = [...infoByPartialPurl.entries()].sort((a, b) => sorts.naturalCompare(a[0], b[0]));
-  const handleInstallFail = () => {
-    debug.debugFn(`fail: ${pkgEnvDetails.agent} install\n`);
+  const cleanupInfoEntriesLoop = () => {
     logger.logger.dedent();
     spinner?.dedent();
+    packumentCache.clear();
+  };
+  const handleInstallFail = () => {
+    cleanupInfoEntriesLoop();
     return {
       ok: false,
       message: 'Installation failure',
@@ -4382,22 +4420,7 @@ async function npmFix(pkgEnvDetails, {
     if (!infos.length) {
       continue infoEntriesLoop;
     }
-    const activeBranches = [];
-    if (isCi) {
-      const branchFullName = getSocketBranchFullNameComponent(partialPurlObj);
-      const branchPurlType = getSocketBranchPurlTypeComponent(partialPurlObj);
-      for (const pr of openPrs) {
-        const parsedBranch = branchParser(pr.headRefName);
-        if (branchPurlType === parsedBranch?.type && branchFullName === parsedBranch?.fullName) {
-          activeBranches.push(parsedBranch);
-        }
-      }
-      if (activeBranches.length) {
-        debug.debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches);
-      } else if (openPrs.length) {
-        debug.debugFn('miss: 0 active branches found');
-      }
-    }
+    const activeBranches = getActiveBranchesForPackage(ciEnv, infoEntry[0], openPrs);
     logger.logger.log(`Processing vulns for ${name}:`);
     logger.logger.indent();
     spinner?.indent();
@@ -4408,8 +4431,7 @@ async function npmFix(pkgEnvDetails, {
     const packument = await packages.fetchPackagePackument(name);
     if (!packument) {
       logger.logger.warn(`Unexpected condition: No packument found for ${name}.\n`);
-      logger.logger.dedent();
-      spinner?.dedent();
+      cleanupInfoEntriesLoop();
       continue infoEntriesLoop;
     }
     const availableVersions = Object.keys(packument.versions);
@@ -4424,13 +4446,12 @@ async function npmFix(pkgEnvDetails, {
       const pkgPath = path.dirname(pkgJsonPath);
       const isWorkspaceRoot = pkgJsonPath === pkgEnvDetails.editablePkgJson.filename;
       const workspace = isWorkspaceRoot ? 'root' : path.relative(rootPath, pkgPath);
-      const branchWorkspace = isCi ? getSocketBranchWorkspaceComponent(workspace) : '';
+      const branchWorkspace = ciEnv ? getSocketBranchWorkspaceComponent(workspace) : '';
       const oldVersions = arrays.arrayUnique(shadowNpmInject.findPackageNodes(actualTree, name).map(n => n.target?.version ?? n.version).filter(Boolean));
       if (!oldVersions.length) {
         debug.debugFn(`skip: ${name} not found\n`);
         // Skip to next package.
-        logger.logger.dedent();
-        spinner?.dedent();
+        cleanupInfoEntriesLoop();
         continue infoEntriesLoop;
       }
 
@@ -4459,25 +4480,24 @@ async function npmFix(pkgEnvDetails, {
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos.values()) {
-          if (vendor.semverExports.gte(oldVersion, firstPatchedVersionIdentifier)) {
-            debug.debugFn(`skip: ${oldId} is >= ${firstPatchedVersionIdentifier}`);
+          const newVersion = shadowNpmInject.findBestPatchVersion(node, availableVersions, vulnerableVersionRange);
+          const newVersionPackument = newVersion ? packument.versions[newVersion] : undefined;
+          if (!(newVersion && newVersionPackument)) {
+            warningsForAfter.add(`${oldId} not updated: requires >=${firstPatchedVersionIdentifier}`);
+            continue infosLoop;
+          }
+          if (vendor.semverExports.gte(oldVersion, newVersion)) {
+            debug.debugFn(`skip: ${oldId} is >= ${newVersion}`);
             continue infosLoop;
           }
-          const newVersion = shadowNpmInject.findBestPatchVersion(node, availableVersions, vulnerableVersionRange);
           if (activeBranches.find(b => b.workspace === branchWorkspace && b.newVersion === newVersion)) {
             debug.debugFn(`skip: open PR found for ${name}@${newVersion}`);
             if (++count >= limit) {
-              logger.logger.dedent();
-              spinner?.dedent();
+              cleanupInfoEntriesLoop();
               break infoEntriesLoop;
             }
             continue infosLoop;
           }
-          const newVersionPackument = newVersion ? packument.versions[newVersion] : undefined;
-          if (!(newVersion && newVersionPackument)) {
-            warningsForAfter.add(`${oldId} not updated: requires >=${firstPatchedVersionIdentifier}`);
-            continue infosLoop;
-          }
           const newVersionRange = utils.applyRange(oldVersion, newVersion, rangeStyle);
           const newId = `${name}@${newVersionRange}`;
           const revertData = {
@@ -4507,9 +4527,9 @@ async function npmFix(pkgEnvDetails, {
           }))) {
             debug.debugFn(`skip: ${workspace}/package.json unchanged`);
             // Reset things just in case.
-            if (isCi) {
+            if (ciEnv) {
               // eslint-disable-next-line no-await-in-loop
-              await gitResetAndClean(baseBranch, cwd);
+              await gitResetAndClean(ciEnv.baseBranch, cwd);
             }
             continue infosLoop;
           }
@@ -4547,7 +4567,7 @@ async function npmFix(pkgEnvDetails, {
           spinner?.stop();
 
           // Check repoInfo to make TypeScript happy.
-          if (!errored && isCi && repoInfo) {
+          if (!errored && ciEnv?.repoInfo) {
             try {
               // eslint-disable-next-line no-await-in-loop
               const result = await gitUnstagedModifiedFiles(cwd);
@@ -4569,7 +4589,7 @@ async function npmFix(pkgEnvDetails, {
               let skipPr = false;
               if (
               // eslint-disable-next-line no-await-in-loop
-              await prExistForBranch(repoInfo.owner, repoInfo.repo, branch)) {
+              await prExistForBranch(ciEnv.repoInfo.owner, ciEnv.repoInfo.repo, branch)) {
                 skipPr = true;
                 debug.debugFn(`skip: branch "${branch}" exists`);
               }
@@ -4581,15 +4601,15 @@ async function npmFix(pkgEnvDetails, {
               // eslint-disable-next-line no-await-in-loop
               !(await gitCreateAndPushBranch(branch, getSocketCommitMessage(oldPurl, newVersion, workspace), moddedFilepaths, {
                 cwd,
-                email: gitEmail,
-                user: gitUser
+                email: ciEnv.gitEmail,
+                user: ciEnv.gitUser
               }))) {
                 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);
+                await gitResetAndClean(ciEnv.baseBranch, cwd);
                 // eslint-disable-next-line no-await-in-loop
                 const maybeActualTree = await install$1(arb, {
                   cwd
@@ -4603,14 +4623,14 @@ async function npmFix(pkgEnvDetails, {
               }
 
               // eslint-disable-next-line no-await-in-loop
-              await Promise.allSettled([setGitRemoteGithubRepoUrl(repoInfo.owner, repoInfo.repo, githubToken, cwd), cleanupOpenPrs(repoInfo.owner, repoInfo.repo, {
+              await Promise.allSettled([setGitRemoteGithubRepoUrl(ciEnv.repoInfo.owner, ciEnv.repoInfo.repo, ciEnv.githubToken, cwd), cleanupOpenPrs(ciEnv.repoInfo.owner, ciEnv.repoInfo.repo, {
                 newVersion,
                 purl: oldPurl,
                 workspace
               })]);
               // eslint-disable-next-line no-await-in-loop
-              const prResponse = await openPr(repoInfo.owner, repoInfo.repo, branch, oldPurl, newVersion, {
-                baseBranch,
+              const prResponse = await openPr(ciEnv.repoInfo.owner, ciEnv.repoInfo.repo, branch, oldPurl, newVersion, {
+                baseBranch: ciEnv.baseBranch,
                 cwd,
                 workspace
               });
@@ -4643,10 +4663,10 @@ async function npmFix(pkgEnvDetails, {
               errored = true;
             }
           }
-          if (isCi) {
+          if (ciEnv) {
             spinner?.start();
             // eslint-disable-next-line no-await-in-loop
-            await gitResetAndClean(baseBranch, cwd);
+            await gitResetAndClean(ciEnv.baseBranch, cwd);
             // eslint-disable-next-line no-await-in-loop
             const maybeActualTree = await install$1(arb, {
               cwd
@@ -4659,7 +4679,7 @@ async function npmFix(pkgEnvDetails, {
             }
           }
           if (errored) {
-            if (!isCi) {
+            if (!ciEnv) {
               spinner?.start();
               editablePkgJson.update(revertData);
               // eslint-disable-next-line no-await-in-loop
@@ -4680,8 +4700,7 @@ async function npmFix(pkgEnvDetails, {
             logger.logger.fail(`Update failed for ${oldId} in ${workspace}.`, error);
           }
           if (++count >= limit) {
-            logger.logger.dedent();
-            spinner?.dedent();
+            cleanupInfoEntriesLoop();
             break infoEntriesLoop;
           }
         }
@@ -4696,8 +4715,7 @@ async function npmFix(pkgEnvDetails, {
     if (!isLastInfoEntry) {
       logger.logger.logNewline();
     }
-    logger.logger.dedent();
-    spinner?.dedent();
+    cleanupInfoEntriesLoop();
   }
   spinner?.stop();
   return {
@@ -4764,19 +4782,9 @@ async function pnpmFix(pkgEnvDetails, {
   const {
     pkgPath: rootPath
   } = pkgEnvDetails;
-
-  // Lazily access constants.ENV properties.
-  const gitEmail = constants.ENV.SOCKET_CLI_GIT_USER_EMAIL;
-  const gitUser = constants.ENV.SOCKET_CLI_GIT_USER_NAME;
-  const githubToken = constants.ENV.SOCKET_CLI_GITHUB_TOKEN;
-  const isCi = !!(constants.ENV.CI && constants.ENV.GITHUB_ACTIONS && constants.ENV.GITHUB_REPOSITORY && gitEmail && gitUser && githubToken);
-  const repoInfo = isCi ? getGithubEnvRepoInfo() : null;
   spinner?.start();
-  const openPrs =
-  // Check repoInfo to make TypeScript happy.
-  isCi && repoInfo ? await getOpenSocketPrs(repoInfo.owner, repoInfo.repo, {
-    author: gitUser
-  }) : [];
+  const ciEnv = getCiEnv();
+  const openPrs = ciEnv ? await getOpenPrsForEnvironment(ciEnv) : [];
   let count = 0;
   let actualTree;
   const lockfilePath = path.join(rootPath, 'pnpm-lock.yaml');
@@ -4852,16 +4860,23 @@ async function pnpmFix(pkgEnvDetails, {
       }
     };
   }
-  const baseBranch = isCi ? getBaseGitBranch() : '';
-  const branchParser = isCi ? createSocketBranchParser() : null;
+
+  // Lazily access constants.packumentCache.
+  const {
+    packumentCache
+  } = constants;
   const workspacePkgJsonPaths = await utils.globWorkspace(pkgEnvDetails.agent, rootPath);
   const pkgJsonPaths = [...workspacePkgJsonPaths,
   // Process the workspace root last since it will add an override to package.json.
   pkgEnvDetails.editablePkgJson.filename];
   const sortedInfoEntries = [...infoByPartialPurl.entries()].sort((a, b) => sorts.naturalCompare(a[0], b[0]));
-  const handleInstallFail = () => {
+  const cleanupInfoEntriesLoop = () => {
     logger.logger.dedent();
     spinner?.dedent();
+    packumentCache.clear();
+  };
+  const handleInstallFail = () => {
+    cleanupInfoEntriesLoop();
     return {
       ok: false,
       message: 'Install failed',
@@ -4880,22 +4895,7 @@ async function pnpmFix(pkgEnvDetails, {
     if (!infos.length) {
       continue infoEntriesLoop;
     }
-    const activeBranches = [];
-    if (isCi) {
-      const branchFullName = getSocketBranchFullNameComponent(partialPurlObj);
-      const branchPurlType = getSocketBranchPurlTypeComponent(partialPurlObj);
-      for (const pr of openPrs) {
-        const parsedBranch = branchParser(pr.headRefName);
-        if (branchPurlType === parsedBranch?.type && branchFullName === parsedBranch?.fullName) {
-          activeBranches.push(parsedBranch);
-        }
-      }
-      if (activeBranches.length) {
-        debug.debugFn(`found: ${activeBranches.length} active branches\n`, activeBranches);
-      } else if (openPrs.length) {
-        debug.debugFn('miss: 0 active branches found');
-      }
-    }
+    const activeBranches = getActiveBranchesForPackage(ciEnv, infoEntry[0], openPrs);
     logger.logger.log(`Processing vulns for ${name}:`);
     logger.logger.indent();
     spinner?.indent();
@@ -4906,8 +4906,7 @@ async function pnpmFix(pkgEnvDetails, {
     const packument = await packages.fetchPackagePackument(name);
     if (!packument) {
       logger.logger.warn(`Unexpected condition: No packument found for ${name}.\n`);
-      logger.logger.dedent();
-      spinner?.dedent();
+      cleanupInfoEntriesLoop();
       continue infoEntriesLoop;
     }
     const availableVersions = Object.keys(packument.versions);
@@ -4922,15 +4921,15 @@ async function pnpmFix(pkgEnvDetails, {
       const pkgPath = path.dirname(pkgJsonPath);
       const isWorkspaceRoot = pkgJsonPath === pkgEnvDetails.editablePkgJson.filename;
       const workspace = isWorkspaceRoot ? 'root' : path.relative(rootPath, pkgPath);
-      const branchWorkspace = isCi ? getSocketBranchWorkspaceComponent(workspace) : '';
+      const branchWorkspace = ciEnv ? getSocketBranchWorkspaceComponent(workspace) : '';
 
       // actualTree may not be defined on the first iteration of pkgJsonPathsLoop.
       if (!actualTree) {
-        if (!isCi) {
+        if (!ciEnv) {
           // eslint-disable-next-line no-await-in-loop
           await utils.removeNodeModules(cwd);
         }
-        const maybeActualTree = isCi && fs$1.existsSync(path.join(rootPath, 'node_modules')) ?
+        const maybeActualTree = ciEnv && fs$1.existsSync(path.join(rootPath, 'node_modules')) ?
         // eslint-disable-next-line no-await-in-loop
         await getActualTree(cwd) :
         // eslint-disable-next-line no-await-in-loop
@@ -4954,8 +4953,7 @@ async function pnpmFix(pkgEnvDetails, {
       if (!oldVersions.length) {
         debug.debugFn(`skip: ${name} not found\n`);
         // Skip to next package.
-        logger.logger.dedent();
-        spinner?.dedent();
+        cleanupInfoEntriesLoop();
         continue infoEntriesLoop;
       }
 
@@ -4987,25 +4985,24 @@ async function pnpmFix(pkgEnvDetails, {
           firstPatchedVersionIdentifier,
           vulnerableVersionRange
         } of infos) {
-          if (vendor.semverExports.gte(oldVersion, firstPatchedVersionIdentifier)) {
-            debug.debugFn(`skip: ${oldId} is >= ${firstPatchedVersionIdentifier}`);
+          const newVersion = shadowNpmInject.findBestPatchVersion(node, availableVersions, vulnerableVersionRange);
+          const newVersionPackument = newVersion ? packument.versions[newVersion] : undefined;
+          if (!(newVersion && newVersionPackument)) {
+            warningsForAfter.add(`${oldId} not updated: requires >=${firstPatchedVersionIdentifier}`);
+            continue infosLoop;
+          }
+          if (vendor.semverExports.gte(oldVersion, newVersion)) {
+            debug.debugFn(`skip: ${oldId} is >= ${newVersion}`);
             continue infosLoop;
           }
-          const newVersion = shadowNpmInject.findBestPatchVersion(node, availableVersions, vulnerableVersionRange);
           if (activeBranches.find(b => b.workspace === branchWorkspace && b.newVersion === newVersion)) {
             debug.debugFn(`skip: open PR found for ${name}@${newVersion}`);
             if (++count >= limit) {
-              logger.logger.dedent();
-              spinner?.dedent();
+              cleanupInfoEntriesLoop();
               break infoEntriesLoop;
             }
             continue infosLoop;
           }
-          const newVersionPackument = newVersion ? packument.versions[newVersion] : undefined;
-          if (!(newVersion && newVersionPackument)) {
-            warningsForAfter.add(`${oldId} not updated: requires >=${firstPatchedVersionIdentifier}`);
-            continue infosLoop;
-          }
           const overrideKey = `${name}@${vulnerableVersionRange}`;
           const newVersionRange = utils.applyRange(oldOverrides?.[overrideKey] ?? oldVersion, newVersion, rangeStyle);
           const newId = `${name}@${newVersionRange}`;
@@ -5057,9 +5054,9 @@ async function pnpmFix(pkgEnvDetails, {
           }))) {
             debug.debugFn(`skip: ${workspace}/package.json unchanged`);
             // Reset things just in case.
-            if (isCi) {
+            if (ciEnv) {
               // eslint-disable-next-line no-await-in-loop
-              await gitResetAndClean(baseBranch, cwd);
+              await gitResetAndClean(ciEnv.baseBranch, cwd);
             }
             continue infosLoop;
           }
@@ -5116,7 +5113,7 @@ async function pnpmFix(pkgEnvDetails, {
           spinner?.stop();
 
           // Check repoInfo to make TypeScript happy.
-          if (!errored && isCi && repoInfo) {
+          if (!errored && ciEnv?.repoInfo) {
             try {
               // eslint-disable-next-line no-await-in-loop
               const result = await gitUnstagedModifiedFiles(cwd);
@@ -5136,7 +5133,7 @@ async function pnpmFix(pkgEnvDetails, {
               let skipPr = false;
               if (
               // eslint-disable-next-line no-await-in-loop
-              await prExistForBranch(repoInfo.owner, repoInfo.repo, branch)) {
+              await prExistForBranch(ciEnv.repoInfo.owner, ciEnv.repoInfo.repo, branch)) {
                 skipPr = true;
                 debug.debugFn(`skip: branch "${branch}" exists`);
               }
@@ -5148,15 +5145,15 @@ async function pnpmFix(pkgEnvDetails, {
               // eslint-disable-next-line no-await-in-loop
               !(await gitCreateAndPushBranch(branch, getSocketCommitMessage(oldPurl, newVersion, workspace), moddedFilepaths, {
                 cwd,
-                email: gitEmail,
-                user: gitUser
+                email: ciEnv.gitEmail,
+                user: ciEnv.gitUser
               }))) {
                 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);
+                await gitResetAndClean(ciEnv.baseBranch, cwd);
                 // eslint-disable-next-line no-await-in-loop
                 const maybeActualTree = await install(pkgEnvDetails, {
                   cwd,
@@ -5175,14 +5172,14 @@ async function pnpmFix(pkgEnvDetails, {
               }
 
               // eslint-disable-next-line no-await-in-loop
-              await Promise.allSettled([setGitRemoteGithubRepoUrl(repoInfo.owner, repoInfo.repo, githubToken, cwd), cleanupOpenPrs(repoInfo.owner, repoInfo.repo, {
+              await Promise.allSettled([setGitRemoteGithubRepoUrl(ciEnv.repoInfo.owner, ciEnv.repoInfo.repo, ciEnv.githubToken, cwd), cleanupOpenPrs(ciEnv.repoInfo.owner, ciEnv.repoInfo.repo, {
                 newVersion,
                 purl: oldPurl,
                 workspace
               })]);
               // eslint-disable-next-line no-await-in-loop
-              const prResponse = await openPr(repoInfo.owner, repoInfo.repo, branch, oldPurl, newVersion, {
-                baseBranch,
+              const prResponse = await openPr(ciEnv.repoInfo.owner, ciEnv.repoInfo.repo, branch, oldPurl, newVersion, {
+                baseBranch: ciEnv.baseBranch,
                 cwd,
                 workspace
               });
@@ -5215,10 +5212,10 @@ async function pnpmFix(pkgEnvDetails, {
               errored = true;
             }
           }
-          if (isCi) {
+          if (ciEnv) {
             spinner?.start();
             // eslint-disable-next-line no-await-in-loop
-            await gitResetAndClean(baseBranch, cwd);
+            await gitResetAndClean(ciEnv.baseBranch, cwd);
             // eslint-disable-next-line no-await-in-loop
             const maybeActualTree = await install(pkgEnvDetails, {
               cwd,
@@ -5236,7 +5233,7 @@ async function pnpmFix(pkgEnvDetails, {
             }
           }
           if (errored) {
-            if (!isCi) {
+            if (!ciEnv) {
               spinner?.start();
               editablePkgJson.update(revertData);
               // eslint-disable-next-line no-await-in-loop
@@ -5269,8 +5266,7 @@ async function pnpmFix(pkgEnvDetails, {
           debug.debugFn('name:', name);
           debug.debugFn('increment: count', count + 1);
           if (++count >= limit) {
-            logger.logger.dedent();
-            spinner?.dedent();
+            cleanupInfoEntriesLoop();
             break infoEntriesLoop;
           }
         }
@@ -5285,8 +5281,7 @@ async function pnpmFix(pkgEnvDetails, {
     if (!isLastInfoEntry) {
       logger.logger.logNewline();
     }
-    logger.logger.dedent();
-    spinner?.dedent();
+    cleanupInfoEntriesLoop();
   }
   spinner?.stop();
 
@@ -14645,5 +14640,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=858f0ee1-e2b9-482a-bf53-f0c50425ff4
+//# debugId=f55e6ed3-61c1-4ff4-b932-f2758fcef19
 //# sourceMappingURL=cli.js.map