Don't alert on CLI upgrade

Author: jdalton

src/shadow/arborist/lib/arborist/index.ts

@@ -8,6 +8,9 @@ import type { ArboristClass, ArboristReifyOptions } from './types'
 import type { SafeNode } from '../node'
 
 const {
+  SOCKET_CLI_LEGACY_PACKAGE_NAME,
+  SOCKET_CLI_PACKAGE_NAME,
+  SOCKET_CLI_SENTRY_PACKAGE_NAME,
   SOCKET_CLI_SAFE_WRAPPER,
   kInternalsSymbol,
   [kInternalsSymbol as unknown as 'Symbol(kInternalsSymbol)']: { getIPC }
@@ -78,16 +81,30 @@ export class SafeArborist extends Arborist {
       __proto__: null,
       ...(args.length ? args[0] : undefined)
     }
+    const { add } = options
+    const skipSocketCliUpgrade =
+      options.global &&
+      options['npmCommand'] === 'install' &&
+      Array.isArray(add) &&
+      add.length === 1 &&
+      (add[0] === SOCKET_CLI_PACKAGE_NAME ||
+        add[0] === SOCKET_CLI_LEGACY_PACKAGE_NAME ||
+        add[0] === SOCKET_CLI_SENTRY_PACKAGE_NAME)
+
+    if (
+      options.dryRun ||
+      skipSocketCliUpgrade ||
+      !(await getIPC(SOCKET_CLI_SAFE_WRAPPER))
+    ) {
+      return await this[kRiskyReify](...args)
+    }
     const safeArgs = [
       {
         ...options,
         progress: false
       },
       ...args.slice(1)
     ]
-    if (options.dryRun || !(await getIPC(SOCKET_CLI_SAFE_WRAPPER))) {
-      return await this[kRiskyReify](...safeArgs)
-    }
     Object.assign(options, SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES)
     const old = args[0]
     args[0] = options

src/shadow/shadow-bin.ts

@@ -10,8 +10,12 @@ import { installLinks } from './link'
 import constants from '../constants'
 
 const {
+  NPM,
+  SOCKET_CLI_LEGACY_PACKAGE_NAME,
+  SOCKET_CLI_PACKAGE_NAME,
   SOCKET_CLI_SAFE_WRAPPER,
   SOCKET_CLI_SENTRY_BUILD,
+  SOCKET_CLI_SENTRY_PACKAGE_NAME,
   SOCKET_IPC_HANDSHAKE
 } = constants
 
@@ -21,9 +25,18 @@ export default async function shadowBin(
 ) {
   process.exitCode = 1
   const terminatorPos = args.indexOf('--')
-  const binArgs = (
-    terminatorPos === -1 ? args : args.slice(0, terminatorPos)
-  ).filter(a => !isProgressFlag(a))
+  const skipSocketCliUpgrade = binName === NPM
+  args.length === 3 &&
+    args[0] === 'install' &&
+    args[1] === '-g' &&
+    (args[2] === SOCKET_CLI_PACKAGE_NAME ||
+      args[2] === SOCKET_CLI_LEGACY_PACKAGE_NAME ||
+      args[2] === SOCKET_CLI_SENTRY_PACKAGE_NAME)
+
+  let binArgs = terminatorPos === -1 ? args : args.slice(0, terminatorPos)
+  if (!skipSocketCliUpgrade) {
+    binArgs = binArgs.filter(a => !isProgressFlag(a))
+  }
   const otherArgs = terminatorPos === -1 ? [] : args.slice(terminatorPos)
   const spawnPromise = spawn(
     // Lazily access constants.execPath.
@@ -46,9 +59,13 @@ export default async function shadowBin(
       await installLinks(constants.shadowBinPath, binName),
       // Add `--no-progress` and `--quiet` flags to fix input being swallowed by
       // the spinner when running the command with recent versions of npm.
-      '--no-progress',
+      ...(skipSocketCliUpgrade ? [] : ['--no-progress']),
       // Add the '--quiet' flag if a loglevel flag is not provided.
-      ...(binArgs.some(isLoglevelFlag) ? [] : ['--quiet']),
+      ...(binArgs.some(isLoglevelFlag)
+        ? []
+        : skipSocketCliUpgrade
+          ? ['--loglevel', 'error']
+          : ['--quiet']),
       ...binArgs,
       ...otherArgs
     ],