feat(fix): add --fix-version flag to override Coana CLI version

Ported from v1.x commit eeeb240 (#957)

- Add --fix-version flag to override default @coana-tech/cli version
- Add CoanaDlxOptions type extending DlxOptions with coanaVersion
- Update spawnCoanaDlx to accept and use coanaVersion parameter
- Pass coanaVersion through cmd-fix -> handle-fix -> coana-fix -> spawnCoanaDlx
- Update all spawnCoanaDlx calls in coana-fix.mts to pass coanaVersion
- Update test fixtures to include coanaVersion parameter

Based on PR #957

Author: jdalton

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

@@ -6,6 +6,7 @@ import { arrayUnique, joinAnd, joinOr } from '@socketsecurity/lib/arrays'
 import { getDefaultLogger } from '@socketsecurity/lib/logger'
 
 import { handleFix } from './handle-fix.mts'
+import * as constants from '../../constants.mts'
 import { DRY_RUN_NOT_SAVING, FLAG_ID } from '../../constants/cli.mts'
 import { ERROR_UNABLE_RESOLVE_ORG } from '../../constants/errors.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
@@ -90,6 +91,10 @@ const generalFlags: MeowFlags = {
       'Limit fix analysis to specific ecosystems. Can be provided as comma separated values or as multiple flags. Defaults to all ecosystems.',
     isMultiple: true,
   },
+  fixVersion: {
+    type: 'string',
+    description: `Override the version of @coana-tech/cli used for fix analysis. Default: ${constants.ENV.INLINED_SOCKET_CLI_COANA_VERSION}.`,
+  },
   id: {
     type: 'string',
     default: [],
@@ -279,6 +284,7 @@ async function run(
     autopilot,
     ecosystems,
     exclude,
+    fixVersion,
     include,
     json,
     majorUpdates,
@@ -299,6 +305,7 @@ async function run(
     autopilot: boolean
     ecosystems: string[]
     exclude: string[]
+    fixVersion: string | undefined
     include: string[]
     json: boolean
     majorUpdates: boolean
@@ -400,6 +407,7 @@ async function run(
     all,
     applyFixes,
     autopilot,
+    coanaVersion: fixVersion,
     cwd,
     disableMajorUpdates,
     ecosystems: validatedEcosystems,

packages/cli/src/commands/fix/coana-fix.mts

@@ -74,6 +74,7 @@ export async function coanaFix(
     all,
     applyFixes,
     autopilot,
+    coanaVersion,
     cwd,
     disableMajorUpdates,
     ecosystems,
@@ -217,7 +218,7 @@ export async function coanaFix(
           ...fixConfig.unknownFlags,
         ],
         fixConfig.orgSlug,
-        { cwd, spinner, stdio: coanaStdio },
+        { coanaVersion, cwd, spinner, stdio: coanaStdio },
       )
 
       spinner?.stop()
@@ -300,7 +301,7 @@ export async function coanaFix(
           ...fixConfig.unknownFlags,
         ],
         fixConfig.orgSlug,
-        { cwd, spinner, stdio: coanaStdio },
+        { coanaVersion, cwd, spinner, stdio: coanaStdio },
       )
 
       if (discoverCResult.ok) {
@@ -423,7 +424,7 @@ export async function coanaFix(
         ...fixConfig.unknownFlags,
       ],
       fixConfig.orgSlug,
-      { cwd, spinner, stdio: coanaStdio },
+      { coanaVersion, cwd, spinner, stdio: coanaStdio },
     )
 
     if (!fixCResult.ok) {

packages/cli/src/commands/fix/handle-fix.mts

@@ -106,6 +106,7 @@ export async function handleFix({
   all,
   applyFixes,
   autopilot,
+  coanaVersion,
   cwd,
   disableMajorUpdates,
   ecosystems,
@@ -129,6 +130,7 @@ export async function handleFix({
     all,
     applyFixes,
     autopilot,
+    coanaVersion,
     cwd,
     disableMajorUpdates,
     ecosystems,
@@ -151,6 +153,7 @@ export async function handleFix({
       all,
       applyFixes,
       autopilot,
+      coanaVersion,
       cwd,
       disableMajorUpdates,
       ecosystems,

packages/cli/src/commands/fix/types.mts

@@ -7,6 +7,7 @@ export type FixConfig = {
   all: boolean
   applyFixes: boolean
   autopilot: boolean
+  coanaVersion: string | undefined
   cwd: string
   disableMajorUpdates: boolean
   ecosystems: PURL_Type[]

packages/cli/src/utils/dlx/spawn.mts

@@ -36,6 +36,10 @@ export type DlxOptions = ShadowBinOptions & {
   silent?: boolean | undefined
 }
 
+export type CoanaDlxOptions = DlxOptions & {
+  coanaVersion?: string | undefined
+}
+
 export type DlxPackageSpec = {
   binaryName?: string | undefined
   name: string
@@ -110,13 +114,13 @@ export async function spawnDlx(
 export async function spawnCoanaDlx(
   args: string[] | readonly string[],
   orgSlug?: string,
-  options?: DlxOptions | undefined,
+  options?: CoanaDlxOptions | undefined,
   spawnExtra?: SpawnExtra | undefined,
 ): Promise<CResult<string>> {
-  const { env: spawnEnv, ...dlxOptions } = {
+  const { coanaVersion, env: spawnEnv, ...dlxOptions } = {
     __proto__: null,
     ...options,
-  } as DlxOptions
+  } as CoanaDlxOptions
 
   const mixinsEnv: Record<string, string> = {
     SOCKET_CLI_VERSION: ENV.INLINED_SOCKET_CLI_VERSION || '',
@@ -174,7 +178,10 @@ export async function spawnCoanaDlx(
 
     // Use dlx version.
     const result = await spawnDlx(
-      resolution.details,
+      {
+        ...resolution.details,
+        version: coanaVersion || resolution.details.version,
+      },
       args,
       {
         force: true,

packages/cli/test/unit/commands/fix/handle-fix-limit.test.mts

@@ -126,6 +126,7 @@ describe('socket fix --limit behavior verification', () => {
     all: false,
     applyFixes: true,
     autopilot: false,
+    coanaVersion: undefined,
     cwd: '/test/cwd',
     disableMajorUpdates: false,
     ecosystems: [],