refactor(cli)!: remove shadow bins for pnpm and yarn

packages/cli/src/cli-dispatch.mts

@@ -3,10 +3,10 @@
  *
  * This single file handles all Socket CLI commands by detecting how it was invoked:
  * - socket (main CLI)
- * - socket-npm (npm wrapper)
- * - socket-npx (npx wrapper)
- * - socket-pnpm (pnpm wrapper)
- * - socket-yarn (yarn wrapper)
+ * - socket-npm (calls socket npm command directly)
+ * - socket-npx (calls socket npx command directly)
+ * - socket-pnpm (calls socket pnpm command directly)
+ * - socket-yarn (calls socket yarn command directly)
  *
  * Perfect for SEA packaging and single-file distribution.
  *
@@ -20,6 +20,10 @@ import path from 'node:path'
 
 import { getDefaultLogger } from '@socketsecurity/lib-internal/logger'
 
+import { cmdNpm } from './commands/npm/cmd-npm.mts'
+import { cmdNpx } from './commands/npx/cmd-npx.mts'
+import { cmdPnpm } from './commands/pnpm/cmd-pnpm.mts'
+import { cmdYarn } from './commands/yarn/cmd-yarn.mts'
 import { waitForBootstrapHandshake } from './utils/sea/boot.mjs'
 
 const logger = getDefaultLogger()
@@ -102,28 +106,37 @@ async function main() {
   // Import and run the appropriate CLI function.
   switch (mode) {
     case 'npm': {
-      const { default: runNpmCli } = await import('./npm-cli.mjs')
-      await runNpmCli()
+      // Call socket npm command directly.
+      await cmdNpm.run(process.argv.slice(2), import.meta, {
+        parentName: 'socket',
+      })
       break
     }
 
     case 'npx': {
-      const { default: runNpxCli } = await import('./npx-cli.mjs')
-      await runNpxCli()
+      // Call socket npx command directly.
+      await cmdNpx.run(process.argv.slice(2), import.meta, {
+        parentName: 'socket',
+      })
       break
     }
 
     case 'pnpm': {
-      const { default: runPnpmCli } = await import('./pnpm-cli.mjs')
-      await runPnpmCli()
+      // Call socket pnpm command directly.
+      await cmdPnpm.run(process.argv.slice(2), import.meta, {
+        parentName: 'socket',
+      })
       break
     }
 
     case 'yarn': {
-      const { default: runYarnCli } = await import('./yarn-cli.mjs')
-      await runYarnCli()
+      // Call socket yarn command directly.
+      await cmdYarn.run(process.argv.slice(2), import.meta, {
+        parentName: 'socket',
+      })
       break
     }
+
     default:
       await import('./cli-entry.mjs')
       break

packages/cli/src/commands/npm/cmd-npm.mts

@@ -1,5 +1,3 @@
-import { createRequire } from 'node:module'
-
 import { NPM } from '@socketsecurity/lib-internal/constants/agents'
 import { getDefaultLogger } from '@socketsecurity/lib-internal/logger'
 
@@ -9,8 +7,8 @@ import {
   FLAG_HELP,
   FLAG_JSON,
 } from '../../constants/cli.mts'
-import { getShadowNpmBinPath } from '../../constants/paths.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
+import shadowNpmBin from '../../shadow/npm/bin.mts'
 import { meowOrExit } from '../../utils/cli/with-subcommands.mjs'
 import { getFlagApiRequirementsOutput } from '../../utils/output/formatting.mts'
 import { filterFlags } from '../../utils/process/cmd.mts'
@@ -20,7 +18,6 @@ import type {
   CliCommandContext,
 } from '../../utils/cli/with-subcommands.mjs'
 
-const require = createRequire(import.meta.url)
 const logger = getDefaultLogger()
 
 export const CMD_NAME = NPM
@@ -81,8 +78,6 @@ async function run(
     return
   }
 
-  const shadowNpmBin = /*@__PURE__*/ require(getShadowNpmBinPath())
-
   process.exitCode = 1
 
   // Filter Socket flags from argv but keep --json for npm.
@@ -94,7 +89,7 @@ async function run(
   })
 
   // See https://nodejs.org/api/child_process.html#event-exit.
-  spawnPromise.process.on(
+  ;(spawnPromise as any).process.on(
     'exit',
     (code: string | null, signalName: NodeJS.Signals | null) => {
       if (signalName) {

packages/cli/src/commands/npx/cmd-npx.mts

@@ -1,5 +1,3 @@
-import { createRequire } from 'node:module'
-
 import { NPX } from '@socketsecurity/lib-internal/constants/agents'
 import { getDefaultLogger } from '@socketsecurity/lib-internal/logger'
 
@@ -8,8 +6,8 @@ import {
   FLAG_DRY_RUN,
   FLAG_HELP,
 } from '../../constants/cli.mts'
-import { getShadowNpxBinPath } from '../../constants/paths.mts'
 import { commonFlags } from '../../flags.mts'
+import shadowNpxBin from '../../shadow/npx/bin.mts'
 import { meowOrExit } from '../../utils/cli/with-subcommands.mjs'
 import { getFlagApiRequirementsOutput } from '../../utils/output/formatting.mts'
 
@@ -18,7 +16,6 @@ import type {
   CliCommandContext,
 } from '../../utils/cli/with-subcommands.mjs'
 
-const require = createRequire(import.meta.url)
 const logger = getDefaultLogger()
 
 const CMD_NAME = NPX
@@ -77,14 +74,12 @@ async function run(
     return
   }
 
-  const shadowNpxBin = /*@__PURE__*/ require(getShadowNpxBinPath())
-
   process.exitCode = 1
 
   const { spawnPromise } = await shadowNpxBin(argv, { stdio: 'inherit' })
 
   // See https://nodejs.org/api/child_process.html#event-exit.
-  spawnPromise.process.on(
+  ;(spawnPromise as any).process.on(
     'exit',
     (code: string | null, signalName: NodeJS.Signals | null) => {
       if (signalName) {

packages/cli/src/commands/pnpm/cmd-pnpm.mts

@@ -1,14 +1,13 @@
-import { createRequire } from 'node:module'
-
-import { PNPM } from '@socketsecurity/lib-internal/constants/agents'
-import { getDefaultLogger } from '@socketsecurity/lib-internal/logger'
+import { WIN32 } from '@socketsecurity/lib/constants/platform'
+import { getDefaultLogger } from '@socketsecurity/lib/logger'
+import { spawn } from '@socketsecurity/lib/spawn'
 
+import { PNPM } from '../../constants/agents.mts'
 import {
   DRY_RUN_BAILING_NOW,
   FLAG_DRY_RUN,
   FLAG_HELP,
 } from '../../constants/cli.mts'
-import { getShadowPnpmBinPath } from '../../constants/paths.mts'
 import { commonFlags } from '../../flags.mts'
 import { meowOrExit } from '../../utils/cli/with-subcommands.mjs'
 import { getFlagApiRequirementsOutput } from '../../utils/output/formatting.mts'
@@ -19,7 +18,6 @@ import type {
   CliCommandContext,
 } from '../../utils/cli/with-subcommands.mjs'
 
-const require = createRequire(import.meta.url)
 const logger = getDefaultLogger()
 
 export const CMD_NAME = PNPM
@@ -81,14 +79,13 @@ async function run(
     return
   }
 
-  const shadowPnpmBin = /*@__PURE__*/ require(getShadowPnpmBinPath())
-
   process.exitCode = 1
 
   // Filter Socket flags from argv.
   const filteredArgv = filterFlags(argv, config.flags)
 
-  const { spawnPromise } = await shadowPnpmBin(filteredArgv, {
+  const spawnPromise = spawn(PNPM, filteredArgv, {
+    shell: WIN32,
     stdio: 'inherit',
   })
 

packages/cli/src/commands/yarn/cmd-yarn.mts

@@ -1,14 +1,13 @@
-import { createRequire } from 'node:module'
-
-import { YARN } from '@socketsecurity/lib-internal/constants/agents'
-import { getDefaultLogger } from '@socketsecurity/lib-internal/logger'
+import { WIN32 } from '@socketsecurity/lib/constants/platform'
+import { getDefaultLogger } from '@socketsecurity/lib/logger'
+import { spawn } from '@socketsecurity/lib/spawn'
 
+import { YARN } from '../../constants/agents.mts'
 import {
   DRY_RUN_BAILING_NOW,
   FLAG_DRY_RUN,
   FLAG_HELP,
 } from '../../constants/cli.mts'
-import { getShadowYarnBinPath } from '../../constants/paths.mts'
 import { commonFlags } from '../../flags.mts'
 import { meowOrExit } from '../../utils/cli/with-subcommands.mjs'
 import { getFlagApiRequirementsOutput } from '../../utils/output/formatting.mts'
@@ -19,7 +18,7 @@ import type {
   CliCommandContext,
 } from '../../utils/cli/with-subcommands.mjs'
 
-const require = createRequire(import.meta.url)
+const logger = getDefaultLogger()
 
 export const CMD_NAME = YARN
 
@@ -76,19 +75,17 @@ async function run(
   const dryRun = !!cli.flags['dryRun']
 
   if (dryRun) {
-    const logger = getDefaultLogger()
     logger.log(DRY_RUN_BAILING_NOW)
     return
   }
 
-  const shadowYarnBin = /*@__PURE__*/ require(getShadowYarnBinPath())
-
   process.exitCode = 1
 
   // Filter Socket flags from argv.
   const filteredArgv = filterFlags(argv, config.flags)
 
-  const { spawnPromise } = await shadowYarnBin(filteredArgv, {
+  const spawnPromise = spawn(YARN, filteredArgv, {
+    shell: WIN32,
     stdio: 'inherit',
   })