@socketsecurity/cli-with-sentry 1.1.13 → 1.1.15

package/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [1.1.15](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.15) - 2025-09-16
+
+### Changed
+- Improved `socket fix` environment variable detection with clearer error messages when required variables are missing
+
+### Fixed
+- Resolved path handling issue in `socket optimize` command
+- Command flag parsing now correctly detects subsequent arguments
+
+## [1.1.14](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.14) - 2025-09-17
+
+### Changed
+- Enhanced 3rd-party on-demand download and execution
+
 ## [1.1.13](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.13) - 2025-09-16
 
 ### Added

package/dist/cli.js

@@ -19,7 +19,6 @@ var spawn = require('../external/@socketsecurity/registry/lib/spawn');
 var fs$2 = require('../external/@socketsecurity/registry/lib/fs');
 var strings = require('../external/@socketsecurity/registry/lib/strings');
 var path$1 = require('../external/@socketsecurity/registry/lib/path');
-var shadowNpmBin = require('./shadow-npm-bin.js');
 var require$$11 = require('../external/@socketsecurity/registry/lib/objects');
 var registry = require('../external/@socketsecurity/registry');
 var packages = require('../external/@socketsecurity/registry/lib/packages');
@@ -68,7 +67,7 @@ async function fetchRepoAnalyticsData(repo, time, options) {
 
 // Note: Widgets does not seem to actually work as code :'(
 
-const require$8 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
+const require$7 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 const METRICS = ['total_critical_alerts', 'total_high_alerts', 'total_medium_alerts', 'total_low_alerts', 'total_critical_added', 'total_medium_added', 'total_low_added', 'total_high_added', 'total_critical_prevented', 'total_high_prevented', 'total_medium_prevented', 'total_low_prevented'];
 
 // Note: This maps `new Date(date).getMonth()` to English three letters
@@ -147,11 +146,11 @@ ${utils.mdTableStringNumber('Name', 'Counts', data['top_five_alert_types'])}
 `.trim() + '\n';
 }
 function displayAnalyticsScreen(data) {
-  const ScreenWidget = /*@__PURE__*/require$8('../external/blessed/lib/widgets/screen.js');
+  const ScreenWidget = /*@__PURE__*/require$7('../external/blessed/lib/widgets/screen.js');
   const screen = new ScreenWidget({
     ...constants.default.blessedOptions
   });
-  const GridLayout = /*@__PURE__*/require$8('../external/blessed-contrib/lib/layout/grid.js');
+  const GridLayout = /*@__PURE__*/require$7('../external/blessed-contrib/lib/layout/grid.js');
   const grid = new GridLayout({
     rows: 5,
     cols: 4,
@@ -165,7 +164,7 @@ function displayAnalyticsScreen(data) {
   renderLineCharts(grid, screen, 'Total high alerts prevented from the main branch', [2, 2, 1, 2], data['total_high_prevented']);
   renderLineCharts(grid, screen, 'Total medium alerts prevented from the main branch', [3, 0, 1, 2], data['total_medium_prevented']);
   renderLineCharts(grid, screen, 'Total low alerts prevented from the main branch', [3, 2, 1, 2], data['total_low_prevented']);
-  const BarChart = /*@__PURE__*/require$8('../external/blessed-contrib/lib/widget/charts/bar.js');
+  const BarChart = /*@__PURE__*/require$7('../external/blessed-contrib/lib/widget/charts/bar.js');
   const bar = grid.set(4, 0, 1, 2, BarChart, {
     label: 'Top 5 alert types',
     barWidth: 10,
@@ -231,10 +230,10 @@ function formatDataOrg(data) {
     const topFiveAlertTypes = entry['top_five_alert_types'];
     for (const type of Object.keys(topFiveAlertTypes)) {
       const count = topFiveAlertTypes[type] ?? 0;
-      if (!totalTopAlerts[type]) {
-        totalTopAlerts[type] = count;
-      } else {
+      if (totalTopAlerts[type]) {
         totalTopAlerts[type] += count;
+      } else {
+        totalTopAlerts[type] = count;
       }
     }
   }
@@ -242,10 +241,10 @@ function formatDataOrg(data) {
     const formatted = formattedData[metric];
     for (const entry of data) {
       const date = formatDate(entry['created_at']);
-      if (!formatted[date]) {
-        formatted[date] = entry[metric];
-      } else {
+      if (formatted[date]) {
         formatted[date] += entry[metric];
+      } else {
+        formatted[date] = entry[metric];
       }
     }
   }
@@ -265,7 +264,7 @@ function formatDate(date) {
   return `${Months[new Date(date).getMonth()]} ${new Date(date).getDate()}`;
 }
 function renderLineCharts(grid, screen, title, coords, data) {
-  const LineChart = /*@__PURE__*/require$8('../external/blessed-contrib/lib/widget/charts/line.js');
+  const LineChart = /*@__PURE__*/require$7('../external/blessed-contrib/lib/widget/charts/line.js');
   const line = grid.set(...coords, LineChart, {
     style: {
       line: 'cyan',
@@ -500,7 +499,7 @@ async function fetchAuditLog(config, options) {
   });
 }
 
-const require$7 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
+const require$6 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 async function outputAuditLog(result, {
   logType,
   orgSlug,
@@ -628,7 +627,7 @@ async function outputWithBlessed(data, orgSlug) {
   const headers = [' Event id', ' Created at', ' Event type', ' User email', ' IP address', ' User agent'];
 
   // Note: this temporarily takes over the terminal (just like `man` does).
-  const ScreenWidget = /*@__PURE__*/require$7('../external/blessed/lib/widgets/screen.js');
+  const ScreenWidget = /*@__PURE__*/require$6('../external/blessed/lib/widgets/screen.js');
   const screen = new ScreenWidget({
     ...constants.default.blessedOptions
   });
@@ -637,7 +636,7 @@ async function outputWithBlessed(data, orgSlug) {
   // node process just to exit it. That's very bad UX.
   // eslint-disable-next-line n/no-process-exit
   screen.key(['escape', 'q', 'C-c'], () => process.exit(0));
-  const TableWidget = /*@__PURE__*/require$7('../external/blessed-contrib/lib/widget/table.js');
+  const TableWidget = /*@__PURE__*/require$6('../external/blessed-contrib/lib/widget/table.js');
   const tipsBoxHeight = 1; // 1 row for tips box
   const detailsBoxHeight = 20; // bottom N rows for details box. 20 gives 4 lines for condensed payload before it scrolls out of view
 
@@ -667,7 +666,7 @@ async function outputWithBlessed(data, orgSlug) {
     columnSpacing: 4,
     truncate: '_'
   });
-  const BoxWidget = /*@__PURE__*/require$7('../external/blessed/lib/widgets/box.js');
+  const BoxWidget = /*@__PURE__*/require$6('../external/blessed/lib/widgets/box.js');
   const tipsBox = new BoxWidget({
     bottom: detailsBoxHeight,
     // sits just above the details box
@@ -1636,7 +1635,7 @@ async function performReachabilityAnalysis(options) {
   }
 
   // Run Coana with the manifests tar hash.
-  const coanaResult = await utils.spawnCoana(coanaArgs, orgSlug, {
+  const coanaResult = await utils.spawnCoanaDlx(coanaArgs, orgSlug, {
     cwd,
     env: coanaEnv,
     spinner,
@@ -3395,21 +3394,72 @@ function ciRepoInfo() {
     repo: ownerSlashRepo.slice(slashIndex + 1)
   };
 }
+/**
+ * Get formatted instructions for setting CI environment variables.
+ */
+function getCiEnvInstructions() {
+  return 'To enable automatic pull request creation, run in CI with these environment variables:\n' + '  - CI=1\n' + '  - SOCKET_CLI_GITHUB_TOKEN=<your-github-token>\n' + '  - SOCKET_CLI_GIT_USER_NAME=<git-username>\n' + '  - SOCKET_CLI_GIT_USER_EMAIL=<git-email>';
+}
+
+/**
+ * Check which required CI environment variables are missing.
+ * Returns lists of missing and present variables.
+ */
+function checkCiEnvVars() {
+  const {
+    CI,
+    SOCKET_CLI_GIT_USER_EMAIL,
+    SOCKET_CLI_GIT_USER_NAME,
+    SOCKET_CLI_GITHUB_TOKEN
+  } = constants.default.ENV;
+  const missing = [];
+  const present = [];
+  if (CI) {
+    present.push('CI');
+  } else {
+    missing.push('CI');
+  }
+  if (SOCKET_CLI_GIT_USER_EMAIL) {
+    present.push('SOCKET_CLI_GIT_USER_EMAIL');
+  } else {
+    missing.push('SOCKET_CLI_GIT_USER_EMAIL');
+  }
+  if (SOCKET_CLI_GIT_USER_NAME) {
+    present.push('SOCKET_CLI_GIT_USER_NAME');
+  } else {
+    missing.push('SOCKET_CLI_GIT_USER_NAME');
+  }
+  if (SOCKET_CLI_GITHUB_TOKEN) {
+    present.push('SOCKET_CLI_GITHUB_TOKEN');
+  } else {
+    missing.push('SOCKET_CLI_GITHUB_TOKEN (or GITHUB_TOKEN)');
+  }
+  return {
+    missing,
+    present
+  };
+}
 async function getFixEnv() {
   const baseBranch = await utils.getBaseBranch();
   const gitEmail = constants.default.ENV.SOCKET_CLI_GIT_USER_EMAIL;
   const gitUser = constants.default.ENV.SOCKET_CLI_GIT_USER_NAME;
   const githubToken = constants.default.ENV.SOCKET_CLI_GITHUB_TOKEN;
   const isCi = !!(constants.default.ENV.CI && gitEmail && gitUser && githubToken);
-  if (
-  // If isCi is false,
-  !isCi && (
-  // but some CI checks are passing,
-  constants.default.ENV.CI || gitEmail || gitUser || githubToken) &&
+  const envCheck = checkCiEnvVars();
+
+  // Provide clear feedback about missing environment variables.
+  if (constants.default.ENV.CI && envCheck.missing.length > 1) {
+    // CI is set but other required vars are missing.
+    const missingExceptCi = envCheck.missing.filter(v => v !== 'CI');
+    if (missingExceptCi.length) {
+      logger.logger.warn(`CI mode detected, but pull request creation is disabled due to missing environment variables:\n` + `  Missing: ${arrays.joinAnd(missingExceptCi)}\n` + `  Set these variables to enable automatic pull request creation.`);
+    }
+  } else if (
+  // If not in CI but some CI-related env vars are set.
+  !constants.default.ENV.CI && envCheck.present.length &&
   // then log about it when in debug mode.
   require$$9.isDebug('notice')) {
-    const envVars = [...(constants.default.ENV.CI ? [] : ['process.env.CI']), ...(gitEmail ? [] : ['process.env.SOCKET_CLI_GIT_USER_EMAIL']), ...(gitUser ? [] : ['process.env.SOCKET_CLI_GIT_USER_NAME']), ...(githubToken ? [] : ['process.env.GITHUB_TOKEN'])];
-    require$$9.debugFn('notice', `miss: fixEnv.isCi is false, expected ${arrays.joinAnd(envVars)} to be set`);
+    require$$9.debugFn('notice', `miss: fixEnv.isCi is false, expected ${arrays.joinAnd(envCheck.missing)} to be set`);
   }
   let repoInfo;
   if (isCi) {
@@ -3441,6 +3491,7 @@ async function coanaFix(fixConfig) {
     autopilot,
     cwd,
     ghsas,
+    glob,
     limit,
     onlyCompute,
     orgSlug,
@@ -3486,6 +3537,19 @@ async function coanaFix(fixConfig) {
   const isAll = !ghsas.length || ghsas.length === 1 && (ghsas[0] === 'all' || ghsas[0] === 'auto');
   const shouldOpenPrs = fixEnv.isCi && fixEnv.repoInfo;
   if (!shouldOpenPrs) {
+    // Inform user about local mode when fixes will be applied.
+    if (!onlyCompute && ghsas.length) {
+      const envCheck = checkCiEnvVars();
+      if (envCheck.present.length) {
+        // Some CI vars are set but not all - show what's missing.
+        if (envCheck.missing.length) {
+          logger.logger.info('Running in local mode - fixes will be applied directly to your working directory.\n' + `Missing environment variables for PR creation: ${arrays.joinAnd(envCheck.missing)}`);
+        }
+      } else {
+        // No CI vars are present - show general local mode message.
+        logger.logger.info('Running in local mode - fixes will be applied directly to your working directory.\n' + getCiEnvInstructions());
+      }
+    }
     const ids = isAll ? ['all'] : ghsas.slice(0, limit);
     if (!ids.length) {
       spinner?.stop();
@@ -3496,7 +3560,7 @@ async function coanaFix(fixConfig) {
         }
       };
     }
-    const fixCResult = await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...(isAll ? ['all'] : ghsas), ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...fixConfig.unknownFlags, ...(onlyCompute ? ['--dry-run'] : []), ...(outputFile ? ['--output-file', outputFile] : [])], fixConfig.orgSlug, {
+    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...(isAll ? ['all'] : ghsas), ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(glob ? ['--glob', glob] : []), ...(onlyCompute ? ['--dry-run'] : []), ...(outputFile ? ['--output-file', outputFile] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner,
       stdio: 'inherit'
@@ -3533,7 +3597,7 @@ async function coanaFix(fixConfig) {
   const shouldSpawnCoana = adjustedLimit > 0;
   let ids;
   if (shouldSpawnCoana && isAll) {
-    const foundCResult = await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const foundCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(glob ? ['--glob', glob] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner
     });
@@ -3575,7 +3639,7 @@ async function coanaFix(fixConfig) {
 
     // Apply fix for single GHSA ID.
     // eslint-disable-next-line no-await-in-loop
-    const fixCResult = await utils.spawnCoana(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ghsaId, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ghsaId, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(glob ? ['--glob', glob] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner,
       stdio: 'inherit'
@@ -3630,6 +3694,16 @@ async function coanaFix(fixConfig) {
       }
 
       // Set up git remote.
+      if (!fixEnv.githubToken) {
+        logger.logger.error('Cannot create pull request: SOCKET_CLI_GITHUB_TOKEN environment variable is not set.\n' + 'Set SOCKET_CLI_GITHUB_TOKEN or GITHUB_TOKEN to enable PR creation.');
+        // eslint-disable-next-line no-await-in-loop
+        await utils.gitResetAndClean(fixEnv.baseBranch, cwd);
+        // eslint-disable-next-line no-await-in-loop
+        await utils.gitCheckoutBranch(fixEnv.baseBranch, cwd);
+        // eslint-disable-next-line no-await-in-loop
+        await utils.gitDeleteBranch(branch, cwd);
+        continue ghsaLoop;
+      }
       // eslint-disable-next-line no-await-in-loop
       await utils.setGitRemoteGithubRepoUrl(fixEnv.repoInfo.owner, fixEnv.repoInfo.repo, fixEnv.githubToken, cwd);
 
@@ -3751,7 +3825,7 @@ async function convertIdsToGhsas(ids) {
       const conversionResult = await utils.convertPurlToGhsas(trimmedId);
       if (conversionResult.ok && conversionResult.data.length) {
         validGhsas.push(...conversionResult.data);
-        logger.logger.info(`Converted ${trimmedId} to ${conversionResult.data.length} GHSA(s): ${conversionResult.data.join(', ')}`);
+        logger.logger.info(`Converted ${trimmedId} to ${conversionResult.data.length} GHSA(s): ${arrays.joinAnd(conversionResult.data)}`);
       } else {
         errors.push(`${trimmedId}: ${conversionResult.message || 'No GHSAs found'}`);
       }
@@ -3769,6 +3843,7 @@ async function handleFix({
   autopilot,
   cwd,
   ghsas,
+  glob,
   limit,
   minSatisfying,
   onlyCompute,
@@ -3785,6 +3860,7 @@ async function handleFix({
     cwd,
     // Convert mixed CVE/GHSA/PURL inputs to GHSA IDs only
     ghsas: await convertIdsToGhsas(ghsas),
+    glob,
     limit,
     orgSlug,
     rangeStyle,
@@ -3855,6 +3931,12 @@ const hiddenFlags = {
     ...generalFlags$2['id'],
     hidden: true
   },
+  glob: {
+    type: 'string',
+    default: '',
+    description: 'Glob pattern to pass to coana for filtering files',
+    hidden: true
+  },
   maxSatisfying: {
     type: 'boolean',
     default: true,
@@ -3917,8 +3999,15 @@ async function run$K(argv, importMeta, {
     Options
       ${utils.getFlagListOutput(config.flags)}
 
+    Environment Variables (for CI/PR mode)
+      CI                          Set to enable CI mode
+      SOCKET_CLI_GITHUB_TOKEN     GitHub token for PR creation (or GITHUB_TOKEN)
+      SOCKET_CLI_GIT_USER_NAME    Git username for commits
+      SOCKET_CLI_GIT_USER_EMAIL   Git email for commits
+
     Examples
       $ ${command}
+      $ ${command} --id CVE-2021-23337
       $ ${command} ./path/to/project --range-style pin
     `
   };
@@ -3931,6 +4020,7 @@ async function run$K(argv, importMeta, {
   });
   const {
     autopilot,
+    glob,
     json,
     limit,
     markdown,
@@ -3966,7 +4056,7 @@ async function run$K(argv, importMeta, {
   const orgSlugCResult = await utils.getDefaultOrgSlug();
   if (!orgSlugCResult.ok) {
     process.exitCode = orgSlugCResult.code ?? 1;
-    logger.logger.fail('Unable to resolve a Socket account organization.\nEnsure a Socket API token is specified for the organization using the SOCKET_CLI_API_TOKEN environment variable.');
+    logger.logger.fail(`${constants.ERROR_UNABLE_RESOLVE_ORG}.\nEnsure a Socket API token is specified for the organization using the SOCKET_CLI_API_TOKEN environment variable.`);
     return;
   }
   const orgSlug = orgSlugCResult.data;
@@ -3982,6 +4072,7 @@ async function run$K(argv, importMeta, {
     autopilot,
     cwd,
     ghsas,
+    glob,
     limit,
     minSatisfying,
     prCheck,
@@ -4250,15 +4341,15 @@ async function run$I(argv, importMeta, {
 }
 
 function applyLogin(apiToken, enforcedOrgs, apiBaseUrl, apiProxy) {
-  utils.updateConfigValue('enforcedOrgs', enforcedOrgs);
-  utils.updateConfigValue('apiToken', apiToken);
-  utils.updateConfigValue('apiBaseUrl', apiBaseUrl);
-  utils.updateConfigValue('apiProxy', apiProxy);
+  utils.updateConfigValue(constants.CONFIG_KEY_ENFORCED_ORGS, enforcedOrgs);
+  utils.updateConfigValue(constants.CONFIG_KEY_API_TOKEN, apiToken);
+  utils.updateConfigValue(constants.CONFIG_KEY_API_BASE_URL, apiBaseUrl);
+  utils.updateConfigValue(constants.CONFIG_KEY_API_PROXY, apiProxy);
 }
 
 async function attemptLogin(apiBaseUrl, apiProxy) {
-  apiBaseUrl ??= utils.getConfigValueOrUndef('apiBaseUrl') ?? undefined;
-  apiProxy ??= utils.getConfigValueOrUndef('apiProxy') ?? undefined;
+  apiBaseUrl ??= utils.getConfigValueOrUndef(constants.CONFIG_KEY_API_BASE_URL) ?? undefined;
+  apiProxy ??= utils.getConfigValueOrUndef(constants.CONFIG_KEY_API_PROXY) ?? undefined;
   const apiTokenInput = await prompts.password({
     message: `Enter your ${vendor.terminalLinkExports('Socket.dev API token', 'https://docs.socket.dev/docs/api-keys')} (leave blank to use a limited public token)`
   });
@@ -4372,8 +4463,8 @@ async function attemptLogin(apiBaseUrl, apiProxy) {
       logger.logger.fail('Failed to install tab completion script. Try `socket install completion` later.');
     }
   }
-  utils.updateConfigValue('defaultOrg', orgSlugs[0]);
-  const previousPersistedToken = utils.getConfigValueOrUndef('apiToken');
+  utils.updateConfigValue(constants.CONFIG_KEY_DEFAULT_ORG, orgSlugs[0]);
+  const previousPersistedToken = utils.getConfigValueOrUndef(constants.CONFIG_KEY_API_TOKEN);
   try {
     applyLogin(apiToken, enforcedOrgs, apiBaseUrl, apiProxy);
     logger.logger.success(`API credentials ${previousPersistedToken === apiToken ? 'refreshed' : previousPersistedToken ? 'updated' : 'set'}`);
@@ -4454,10 +4545,10 @@ async function run$H(argv, importMeta, {
 }
 
 function applyLogout() {
-  utils.updateConfigValue('apiToken', null);
-  utils.updateConfigValue('apiBaseUrl', null);
-  utils.updateConfigValue('apiProxy', null);
-  utils.updateConfigValue('enforcedOrgs', null);
+  utils.updateConfigValue(constants.CONFIG_KEY_API_TOKEN, null);
+  utils.updateConfigValue(constants.CONFIG_KEY_API_BASE_URL, null);
+  utils.updateConfigValue(constants.CONFIG_KEY_API_PROXY, null);
+  utils.updateConfigValue(constants.CONFIG_KEY_ENFORCED_ORGS, null);
 }
 
 function attemptLogout() {
@@ -4512,11 +4603,9 @@ async function run$G(argv, importMeta, {
   attemptLogout();
 }
 
-const require$6 = require$$5.createRequire((typeof document === 'undefined' ? require$$0.pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
 const {
   PACKAGE_LOCK_JSON,
   PNPM_LOCK_YAML,
-  YARN,
   YARN_LOCK
 } = constants.default;
 const nodejsPlatformTypes = new Set(['javascript', 'js', 'nodejs', constants.NPM, constants.PNPM, 'ts', 'tsx', 'typescript']);
@@ -4578,30 +4667,20 @@ async function runCdxgen(argvObj) {
   const yarnLockPath = pnpmLockPath || npmLockPath ? undefined : await utils.findUp(YARN_LOCK, {
     onlyFiles: true
   });
+  const agent = pnpmLockPath ? constants.PNPM : yarnLockPath && utils.isYarnBerry() ? constants.YARN : constants.NPM;
   let cleanupPackageLock = false;
-  if (argvMutable['type'] !== YARN && nodejsPlatformTypes.has(argvMutable['type']) && yarnLockPath) {
+  if (argvMutable['type'] !== constants.YARN && nodejsPlatformTypes.has(argvMutable['type']) && yarnLockPath) {
     if (npmLockPath) {
       argvMutable['type'] = constants.NPM;
     } else {
       // Use synp to create a package-lock.json from the yarn.lock,
       // based on the node_modules folder, for a more accurate SBOM.
       try {
-        const useYarnBerry = utils.isYarnBerry();
-        let args;
-        let synpPromise;
-        if (pnpmLockPath) {
-          args = ['dlx', `synp@${constants.default.ENV.INLINED_SOCKET_CLI_SYNP_VERSION}`, '--source-file', `./${YARN_LOCK}`];
-          const shadowPnpmBin = /*@__PURE__*/require$6(constants.default.shadowPnpmBinPath);
-          synpPromise = (await shadowPnpmBin(args, shadowOpts)).spawnPromise;
-        } else if (useYarnBerry) {
-          args = ['dlx', `synp@${constants.default.ENV.INLINED_SOCKET_CLI_SYNP_VERSION}`, '--source-file', `./${YARN_LOCK}`];
-          const shadowYarnBin = /*@__PURE__*/require$6(constants.default.shadowYarnBinPath);
-          synpPromise = (await shadowYarnBin(args, shadowOpts)).spawnPromise;
-        } else {
-          args = ['exec', '--yes', `synp@${constants.default.ENV.INLINED_SOCKET_CLI_SYNP_VERSION}`, '--source-file', `./${YARN_LOCK}`];
-          synpPromise = (await shadowNpmBin('npm', args, shadowOpts)).spawnPromise;
-        }
-        await synpPromise;
+        const synpResult = await utils.spawnSynpDlx(['--source-file', `./${YARN_LOCK}`], {
+          ...shadowOpts,
+          agent
+        });
+        await synpResult.spawnPromise;
         argvMutable['type'] = constants.NPM;
         cleanupPackageLock = true;
       } catch {}
@@ -4609,19 +4688,15 @@ async function runCdxgen(argvObj) {
   }
 
   // Use appropriate package manager for cdxgen
-  let shadowResult;
-  if (pnpmLockPath) {
-    const shadowPnpmBin = /*@__PURE__*/require$6(constants.default.shadowPnpmBinPath);
-    shadowResult = await shadowPnpmBin(['dlx', '--silent', `@cyclonedx/cdxgen@${constants.default.ENV.INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION}`, ...argvToArray(argvMutable)], shadowOpts);
-  } else if (yarnLockPath && utils.isYarnBerry()) {
-    const shadowYarnBin = /*@__PURE__*/require$6(constants.default.shadowYarnBinPath);
-    shadowResult = await shadowYarnBin(['dlx', '--quiet', `@cyclonedx/cdxgen@${constants.default.ENV.INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION}`, ...argvToArray(argvMutable)], shadowOpts);
-  } else {
-    shadowResult = await shadowNpmBin('npm', ['exec', '--silent', '--yes', `@cyclonedx/cdxgen@${constants.default.ENV.INLINED_SOCKET_CLI_CYCLONEDX_CDXGEN_VERSION}`, '--', ...argvToArray(argvMutable)], shadowOpts);
-  }
+  const shadowResult = await utils.spawnCdxgenDlx(argvToArray(argvMutable), {
+    ...shadowOpts,
+    agent
+  });
   shadowResult.spawnPromise.process.on('exit', () => {
     if (cleanupPackageLock) {
       try {
+        // TODO: Consider using trash instead of rmSync for safer deletion.
+        // This removes the temporary package-lock.json we created for cdxgen.
         fs$1.rmSync(`./${PACKAGE_LOCK_JSON}`);
       } catch {}
     }
@@ -4887,7 +4962,7 @@ async function run$F(argv, importMeta, context) {
     // options or missing arguments.
     // https://www.gnu.org/software/bash/manual/html_node/Exit-Status.html
     process.exitCode = 2;
-    logger.logger.fail(`Unknown ${words.pluralize('argument', unknownsCount)}: ${unknowns.join(', ')}`);
+    logger.logger.fail(`Unknown ${words.pluralize('argument', unknownsCount)}: ${arrays.joinAnd(unknowns)}`);
     return;
   }
   if (dryRun) {
@@ -6234,7 +6309,7 @@ async function run$x(argv, importMeta, context) {
   const argsToForward = utils.filterFlags(argv, {
     ...flags.commonFlags,
     ...flags.outputFlags
-  }, ['--json']);
+  }, [constants.FLAG_JSON]);
   const {
     spawnPromise
   } = await shadowBin(constants.NPM, argsToForward, {
@@ -8413,7 +8488,7 @@ async function fetchPurlsShallowScore(purls, options) {
     return sockSdkCResult;
   }
   const sockSdk = sockSdkCResult.data;
-  logger.logger.info(`Requesting shallow score data for ${purls.length} package urls (purl): ${purls.join(', ')}`);
+  logger.logger.info(`Requesting shallow score data for ${purls.length} package urls (purl): ${arrays.joinAnd(purls)}`);
   const batchPackageCResult = await utils.handleApiCall(sockSdk.batchPackageFetch({
     components: purls.map(purl => ({
       purl
@@ -13971,7 +14046,7 @@ async function run$3(argv, importMeta, {
     }
   });
   if (argSet.size) {
-    logger.logger.info(`Warning: ignoring these excessive args: ${Array.from(argSet).join(', ')}`);
+    logger.logger.info(`Warning: ignoring these excessive args: ${arrays.joinAnd(Array.from(argSet))}`);
   }
   const hasApiToken = utils.hasDefaultApiToken();
   const {
@@ -14660,5 +14735,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=5d651596-3967-43af-9860-99f4bc7ab867
+//# debugId=243906f3-caec-435c-aaca-fe5ec4aeb381
 //# sourceMappingURL=cli.js.map