Print more agent information for optimize command

Author: jdalton

src/commands/fix/handle-fix.mts

@@ -130,25 +130,22 @@ export async function handleFix({
     return
   }
 
-  logger.info(
-    `Fixing packages for ${pkgEnvDetails.agent} v${pkgEnvDetails.agentVersion}.\n`,
-  )
-
-  const { agent } = pkgEnvDetails
+  const { agent, agentVersion } = pkgEnvDetails
   if (agent !== NPM && agent !== PNPM) {
     await outputFixResult(
       {
         ok: false,
         message: 'Not supported.',
-        cause: `${agent} is not supported by this command.`,
+        cause: `${agent} v${agentVersion} is not supported by this command.`,
       },
       outputKind,
     )
     return
   }
 
-  const fixer = agent === NPM ? npmFix : pnpmFix
+  logger.info(`Fixing packages for ${agent} v${agentVersion}.\n`)
 
+  const fixer = agent === NPM ? npmFix : pnpmFix
   await outputFixResult(
     await fixer(pkgEnvDetails, {
       autoMerge,

src/commands/optimize/apply-optimization.mts

@@ -4,17 +4,18 @@ import { addOverrides } from './add-overrides.mts'
 import { CMD_NAME } from './shared.mts'
 import { updateLockfile } from './update-lockfile.mts'
 import constants from '../../constants.mts'
-import { cmdPrefixMessage } from '../../utils/cmd.mts'
-import { detectAndValidatePackageEnvironment } from '../../utils/package-environment.mts'
 
 import type { CResult } from '../../types.mts'
+import type { EnvDetails } from '../../utils/package-environment.mts'
 
-const { VLT } = constants
+export type OptimizeConfig = {
+  pin: boolean
+  prod: boolean
+}
 
 export async function applyOptimization(
-  cwd: string,
-  pin: boolean,
-  prod: boolean,
+  pkgEnvDetails: EnvDetails,
+  { pin, prod }: OptimizeConfig,
 ): Promise<
   CResult<{
     addedCount: number
@@ -24,28 +25,6 @@ export async function applyOptimization(
     addedInWorkspaces: number
   }>
 > {
-  const result = await detectAndValidatePackageEnvironment(cwd, {
-    cmdName: CMD_NAME,
-    logger,
-    prod,
-  })
-
-  if (!result.ok) {
-    return result
-  }
-  const pkgEnvDetails = result.data
-
-  if (pkgEnvDetails.agent === VLT) {
-    return {
-      ok: false,
-      message: 'Unsupported',
-      cause: cmdPrefixMessage(
-        CMD_NAME,
-        `${VLT} does not support overrides. Soon, though ⚡`,
-      ),
-    }
-  }
-
   // Lazily access constants.spinner.
   const { spinner } = constants
 

src/commands/optimize/handle-optimize.mts

@@ -1,8 +1,16 @@
+import { logger } from '@socketsecurity/registry/lib/logger'
+
 import { applyOptimization } from './apply-optimization.mts'
 import { outputOptimizeResult } from './output-optimize-result.mts'
+import { CMD_NAME } from './shared.mts'
+import constants from '../../constants.mts'
+import { cmdPrefixMessage } from '../../utils/cmd.mts'
+import { detectAndValidatePackageEnvironment } from '../../utils/package-environment.mts'
 
 import type { OutputKind } from '../../types.mts'
 
+const { VLT } = constants
+
 export async function handleOptimize({
   cwd,
   outputKind,
@@ -14,7 +22,45 @@ export async function handleOptimize({
   pin: boolean
   prod: boolean
 }) {
-  const result = await applyOptimization(cwd, pin, prod)
+  const pkgEnvCResult = await detectAndValidatePackageEnvironment(cwd, {
+    cmdName: CMD_NAME,
+    logger,
+    prod,
+  })
+  if (!pkgEnvCResult.ok) {
+    await outputOptimizeResult(pkgEnvCResult, outputKind)
+    return
+  }
+
+  const pkgEnvDetails = pkgEnvCResult.data
+  if (!pkgEnvDetails) {
+    await outputOptimizeResult(
+      {
+        ok: false,
+        message: 'No package found.',
+        cause: `No valid package environment found for project path: ${cwd}`,
+      },
+      outputKind,
+    )
+    return
+  }
+
+  const { agent, agentVersion } = pkgEnvDetails
+  if (agent === VLT) {
+    return {
+      ok: false,
+      message: 'Unsupported',
+      cause: cmdPrefixMessage(
+        CMD_NAME,
+        `${agent} v${agentVersion} does not support overrides. Soon, though ⚡`,
+      ),
+    }
+  }
+
+  logger.info(`Optimizing packages for ${agent} v${agentVersion}.\n`)
 
-  await outputOptimizeResult(result, outputKind)
+  await outputOptimizeResult(
+    await applyOptimization(pkgEnvDetails, { pin, prod }),
+    outputKind,
+  )
 }