socket 0.14.148 → 0.14.150

package/dist/cli.js

@@ -5,7 +5,6 @@ const require$$0 = require('node:url')
 const vendor = require('./vendor.js')
 const debug = require('../external/@socketsecurity/registry/lib/debug')
 const logger = require('../external/@socketsecurity/registry/lib/logger')
-const assert = require('node:assert')
 const fs = require('node:fs/promises')
 const strings = require('../external/@socketsecurity/registry/lib/strings')
 const shadowNpmInject = require('./shadow-npm-inject.js')
@@ -14,10 +13,10 @@ const path$1 = require('node:path')
 const objects = require('../external/@socketsecurity/registry/lib/objects')
 const path = require('../external/@socketsecurity/registry/lib/path')
 const regexps = require('../external/@socketsecurity/registry/lib/regexps')
+const prompts = require('../external/@socketsecurity/registry/lib/prompts')
 const words = require('../external/@socketsecurity/registry/lib/words')
 const fs$1 = require('node:fs')
 const shadowBin = require('./shadow-bin.js')
-const prompts = require('../external/@socketsecurity/registry/lib/prompts')
 const shadowNpmPaths = require('./shadow-npm-paths.js')
 const util = require('node:util')
 const arrays = require('../external/@socketsecurity/registry/lib/arrays')
@@ -33,9 +32,8 @@ function failMsgWithBadge(badge, msg) {
   return `${vendor.yoctocolorsCjsExports.bgRed(vendor.yoctocolorsCjsExports.bold(vendor.yoctocolorsCjsExports.white(` ${badge}: `)))} ${vendor.yoctocolorsCjsExports.bold(msg)}`
 }
 
-function handleUnsuccessfulApiResponse(_name, sockSdkError) {
-  const message = sockSdkError.error || 'No error message returned'
-  const { status } = sockSdkError
+function handleUnsuccessfulApiResponse(_name, { cause, error, status }) {
+  const message = `${error || 'No error message returned'}${cause ? ` (reason: ${cause})` : ''}`
   if (status === 401 || status === 403) {
     // Lazily access constants.spinner.
     const { spinner } = constants
@@ -904,11 +902,17 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.148:b04f898:6146c5b2:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.150:cc2913a:aa0fe20d:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
   const nodeVersion = process$1.version
   const apiToken = shadowNpmInject.getDefaultToken()
   const defaultOrg = shadowNpmInject.getConfigValue('defaultOrg')
   const readOnlyConfig = shadowNpmInject.isReadOnlyConfig() ? '*' : '.'
+  const v1test = shadowNpmInject.isTestingV1() ? ' (is testing v1)' : ''
+  const feedback = shadowNpmInject.isTestingV1()
+    ? vendor.yoctocolorsCjsExports.green(
+        '   (Thank you for testing the v1 bump! Please send us any feedback you might have!)\n'
+      )
+    : ''
   const shownToken = apiToken ? getLastFiveOfApiToken(apiToken) : 'no'
   const relCwd = path.normalizePath(
     process$1
@@ -921,12 +925,22 @@ function getAsciiHeader(command) {
         '~/'
       )
   )
+  let nodeVerWarn = ''
+  if ((vendor.semverExports.parse(constants.NODE_VERSION)?.major ?? 0) < 20) {
+    nodeVerWarn += vendor.yoctocolorsCjsExports.bold(
+      `   ${vendor.yoctocolorsCjsExports.red('Warning:')} NodeJS version 19 and lower will be ${vendor.yoctocolorsCjsExports.red('unsupported')} after April 30th, 2025.`
+    )
+    nodeVerWarn += '\n'
+    nodeVerWarn +=
+      '            Soon after the Socket CLI will require NodeJS version 20 or higher.'
+    nodeVerWarn += '\n'
+  }
   const body = `
    _____         _       _        /---------------
-  |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver ${cliVersion}
+  |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver ${cliVersion}${v1test}
   |__   | ${readOnlyConfig} |  _| '_| -_|  _|     | Node: ${nodeVersion}, API token set: ${shownToken}${defaultOrg ? `, default org: ${defaultOrg}` : ''}
   |_____|___|___|_,_|___|_|.dev   | Command: \`${command}\`, cwd: ${relCwd}`.trimStart()
-  return `   ${body}\n`
+  return `   ${body}\n${nodeVerWarn}${feedback}`
 }
 
 const { DRY_RUN_BAIL_TEXT: DRY_RUN_BAIL_TEXT$J } = constants
@@ -964,25 +978,34 @@ const config$M = {
       description: 'Time filter - either 7, 30 or 90, default: 7'
     }
   },
-  help: (command, { flags }) => `
+  help: (command, { flags }) =>
+    `
     Usage
-      $ ${command} --scope=<scope> --time=<time filter>
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '[ org | repo <reponame>] [time]' : '--scope=<scope> --time=<time filter>'}
 
     API Token Requirements
       - Quota: 1 unit
       - Permissions: report:write
 
-    Default parameters are set to show the organization-level analytics over the
-    last 7 days.
+    ${shadowNpmInject.isTestingV1() ? '' : 'Default parameters are set to show the organization-level analytics over the'}
+    ${shadowNpmInject.isTestingV1() ? '' : 'last 7 days.'}
+
+    ${shadowNpmInject.isTestingV1() ? 'The scope is either org or repo level, defaults to org.' : ''}
+
+    ${shadowNpmInject.isTestingV1() ? 'When scope is repo, a repo slug must be given as well.' : ''}
+
+    ${shadowNpmInject.isTestingV1() ? 'The time argument must be number 7, 30, or 90 and defaults to 7.' : ''}
 
     Options
       ${getFlagListOutput(flags, 6)}
 
     Examples
-      $ ${command} --scope=org --time=7
-      $ ${command} --scope=org --time=30
-      $ ${command} --scope=repo --repo=test-repo --time=30
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'org 7' : '--scope=org --time=7'}
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'repo test-repo 30' : '--scope=org --time=30'}
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '90' : '--scope=repo --repo=test-repo --time=30'}
   `
+      // Drop consecutive empty lines. Temporarily necessary to deal with v1 prep.
+      .replace(/\n(?: *\n)+/g, '\n\n')
 }
 const cmdAnalytics = {
   description: config$M.description,
@@ -996,28 +1019,87 @@ async function run$M(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { file, json, markdown, repo, scope, time } = cli.flags
+  const { file, json, markdown } = cli.flags
+
+  // In v1 mode support:
+  // - []        (no args)
+  // - ['org']
+  // - ['org', '30']
+  // - ['repo', 'name']
+  // - ['repo', 'name', '30']
+  // - ['30']
+  // Validate final values in the next step
+  let scope = 'org'
+  let time = shadowNpmInject.isTestingV1() ? '7' : 7
+  let repoName = ''
+  if (shadowNpmInject.isTestingV1()) {
+    if (cli.input[0] === 'org') {
+      if (cli.input[1]) {
+        time = cli.input[1]
+      }
+    } else if (cli.input[0] === 'repo') {
+      scope = 'repo'
+      if (cli.input[1]) {
+        repoName = cli.input[1]
+      }
+      if (cli.input[2]) {
+        time = cli.input[2]
+      }
+    } else if (cli.input[0]) {
+      time = cli.input[0]
+    }
+  } else {
+    if (cli.flags['scope']) {
+      scope = String(cli.flags['scope'] || '')
+    }
+    if (scope === 'repo') {
+      repoName = String(cli.flags['repoName'] || '')
+    }
+    if (cli.flags['time']) {
+      time = Number(cli.flags['time'] || 7)
+    }
+  }
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
+      // In v1 this can't go wrong anymore since the unknown value goes to time
+      nook: !shadowNpmInject.isTestingV1(),
       test: scope === 'org' || scope === 'repo',
       message: 'Scope must be "repo" or "org"',
       pass: 'ok',
       fail: 'bad'
     },
     {
-      test: time === 7 || time === 30 || time === 90,
-      message: 'The time filter must either be 7, 30 or 90',
+      nook: true,
+      test: scope === 'org' || !!repoName,
+      message: shadowNpmInject.isTestingV1()
+        ? 'When scope=repo, repo name should be the second argument'
+        : 'When scope=repo, repo name should be set through --repo',
       pass: 'ok',
-      fail: 'bad'
+      fail: 'missing'
     },
     {
       nook: true,
-      test: scope === 'org' || !!repo,
-      message: 'When scope=repo, repo name should be set through --repo',
+      test:
+        scope === 'org' ||
+        (shadowNpmInject.isTestingV1() &&
+          repoName !== '7' &&
+          repoName !== '30' &&
+          repoName !== '90'),
+      message: 'Missing the repo name as second argument',
       pass: 'ok',
       fail: 'missing'
     },
+    {
+      test: shadowNpmInject.isTestingV1()
+        ? time === '7' || time === '30' || time === '90'
+        : time === 7 || time === 30 || time === 90,
+      message: 'The time filter must either be 7, 30 or 90',
+      pass: 'ok',
+      fail: shadowNpmInject.isTestingV1()
+        ? 'invalid range set, see --help for command arg details.'
+        : 'bad'
+    },
     {
       nook: true,
       test: file === '-' || !!json || !!markdown,
@@ -1050,22 +1132,14 @@ async function run$M(argv, importMeta, { parentName }) {
     logger.logger.log(DRY_RUN_BAIL_TEXT$J)
     return
   }
-  assert(assertScope(scope))
-  assert(assertTime(time))
   return await displayAnalytics({
     scope,
-    time,
-    repo: String(repo || ''),
+    time: time === '90' ? 90 : time === '30' ? 30 : 7,
+    repo: repoName,
     outputKind: json ? 'json' : markdown ? 'markdown' : 'print',
     filePath: String(file || '')
   })
 }
-function assertScope(scope) {
-  return scope === 'org' || scope === 'repo'
-}
-function assertTime(time) {
-  return time === 7 || time === 30 || time === 90
-}
 
 async function fetchAuditLog({ logType, orgSlug, outputKind, page, perPage }) {
   const sockSdk = await shadowNpmInject.setupSdk()
@@ -1222,12 +1296,92 @@ async function handleAuditLog({ logType, orgSlug, outputKind, page, perPage }) {
   })
 }
 
+async function suggestOrgSlug() {
+  const sockSdk = await shadowNpmInject.setupSdk()
+  const result = await handleApiCall(
+    sockSdk.getOrganizations(),
+    'looking up organizations'
+  )
+  // Ignore a failed request here. It was not the primary goal of
+  // running this command and reporting it only leads to end-user confusion.
+  if (result.success) {
+    const proceed = await prompts.select({
+      message:
+        'Missing org name; do you want to use any of these orgs for this scan?',
+      choices: [
+        ...Object.values(result.data.organizations).map(org => {
+          const slug = org.name ?? 'undefined'
+          return {
+            name: `Yes [${slug}]`,
+            value: slug,
+            description: `Use "${slug}" as the organization`
+          }
+        }),
+        {
+          name: 'No',
+          value: '',
+          description:
+            'Do not use any of these organizations (will end in a no-op)'
+        }
+      ]
+    })
+    if (proceed) {
+      return proceed
+    }
+  } else {
+    logger.logger.fail(
+      'Failed to lookup organization list from API, unable to suggest'
+    )
+  }
+}
+
+async function determineOrgSlug(orgFlag, firstArg, interactive, dryRun) {
+  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg') || ''
+  let orgSlug = String(orgFlag || defaultOrgSlug || '')
+  if (!orgSlug) {
+    if (shadowNpmInject.isTestingV1()) {
+      // ask from server
+      logger.logger.error(
+        'Missing the org slug and no --org flag set. Trying to auto-discover the org now...'
+      )
+      logger.logger.error(
+        'Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.'
+      )
+      if (dryRun) {
+        logger.logger.fail('Skipping auto-discovery of org in dry-run mode')
+      } else if (!interactive) {
+        logger.logger.fail(
+          'Skipping auto-discovery of org when interactive = false'
+        )
+      } else {
+        orgSlug = (await suggestOrgSlug()) || ''
+      }
+    } else {
+      orgSlug = firstArg || ''
+    }
+  }
+  return [orgSlug, defaultOrgSlug]
+}
+
 const { DRY_RUN_BAIL_TEXT: DRY_RUN_BAIL_TEXT$I } = constants
 const config$L = {
   commandName: 'audit-log',
   description: 'Look up the audit log for an organization',
   hidden: false,
   flags: {
+    ...commonFlags,
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     type: {
       type: 'string',
       shortFlag: 't',
@@ -1245,13 +1399,11 @@ const config$L = {
       shortFlag: 'p',
       default: 1,
       description: 'Page number - default is 1'
-    },
-    ...commonFlags,
-    ...outputFlags
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '<repo>' : '<org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -1264,7 +1416,7 @@ const config$L = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '' : 'FakeOrg'}
   `
 }
 const cmdAuditLog = {
@@ -1279,15 +1431,31 @@ async function run$L(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { json, markdown, page, perPage, type } = cli.flags
+  const {
+    dryRun,
+    interactive,
+    json,
+    markdown,
+    org: orgFlag,
+    page,
+    perPage,
+    type
+  } = cli.flags
   const logType = String(type || '')
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
+      nook: true,
       test: !!orgSlug,
-      message: 'Org name should be the first arg',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
@@ -1375,7 +1543,7 @@ async function runCycloneDX(yargvWithYes) {
   await shadowBin(NPX$3, [
     ...yesArgs,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_CYCLONEDX_CDXGEN_VERSION']".
-    `@cyclonedx/cdxgen@${'11.2.5'}`,
+    `@cyclonedx/cdxgen@${'11.2.6'}`,
     ...argvToArray(yargv)
   ])
   if (cleanupPackageLock) {
@@ -3598,7 +3766,13 @@ const config$C = {
         'Path to a local file where the output should be saved. Use `-` to force stdout.'
     }
   },
-  help: (command, config) => `
+  help: (command, config) =>
+    shadowNpmInject.isTestingV1()
+      ? 'This command will be removed in v1'
+      : `
+    Note: This command is deprecated, to be dropped in the next major bump.
+          Please see \`socket scan diff\`
+
     Usage
       $ ${command} <org slug> --before=<before> --after=<after>
 
@@ -5452,7 +5626,10 @@ const config$A = {
     ...outputFlags,
     ...validationFlags
   },
-  help: (command, config) => `
+  help: (command, config) =>
+    shadowNpmInject.isTestingV1()
+      ? 'This command will be removed in v1'
+      : `
     Usage
       $ ${command} <name>
 
@@ -8055,11 +8232,22 @@ const config$m = {
   hidden: true,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, _config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -8072,8 +8260,8 @@ const config$m = {
     the request will fail with an authentication error.
 
     Examples
-      $ ${command} mycorp
-      $ ${command} mycorp --json
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' mycorp'}
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' mycorp'} --json
   `
 }
 const cmdOrganizationPolicyLicense = {
@@ -8088,16 +8276,21 @@ async function run$m(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const json = Boolean(cli.flags['json'])
-  const markdown = Boolean(cli.flags['markdown'])
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: true,
       test: !!orgSlug,
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
@@ -8197,11 +8390,22 @@ const config$l = {
   hidden: true,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, _config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -8214,8 +8418,8 @@ const config$l = {
     the request will fail with an authentication error.
 
     Examples
-      $ ${command} mycorp
-      $ ${command} mycorp --json
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' mycorp'}
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' mycorp'} --json
   `
 }
 const cmdOrganizationPolicyPolicy = {
@@ -8230,10 +8434,13 @@ async function run$l(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const json = Boolean(cli.flags['json'])
-  const markdown = Boolean(cli.flags['markdown'])
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
@@ -9414,11 +9621,28 @@ const config$d = {
   hidden: false,
   flags: {
     ...commonFlags,
-    repoName: {
+    defaultBranch: {
       type: 'string',
-      shortFlag: 'n',
+      shortFlag: 'b',
+      default: 'main',
+      description: 'Repository default branch'
+    },
+    homepage: {
+      type: 'string',
+      shortFlag: 'h',
       default: '',
-      description: 'Repository name'
+      description: 'Repository url'
+    },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
     },
     repoDescription: {
       type: 'string',
@@ -9426,17 +9650,11 @@ const config$d = {
       default: '',
       description: 'Repository description'
     },
-    homepage: {
+    repoName: {
       type: 'string',
-      shortFlag: 'h',
+      shortFlag: 'n',
       default: '',
-      description: 'Repository url'
-    },
-    defaultBranch: {
-      type: 'string',
-      shortFlag: 'b',
-      default: 'main',
-      description: 'Repository default branch'
+      description: 'Repository name'
     },
     visibility: {
       type: 'string',
@@ -9447,7 +9665,7 @@ const config$d = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> --repo-name=<name>
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '<repo>' : '<org slug> --repo-name=<name>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -9457,7 +9675,7 @@ const config$d = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg --repoName=test-repo
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'test-repo' : 'FakeOrg --repoName=test-repo'}
   `
 }
 const cmdReposCreate = {
@@ -9472,21 +9690,36 @@ async function run$d(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const repoName = cli.flags['repoName']
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const {
+    dryRun,
+    interactive,
+    org: orgFlag,
+    repoName: repoNameFlag
+  } = cli.flags
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+  const repoName =
+    (shadowNpmInject.isTestingV1() ? cli.input[0] : repoNameFlag) || ''
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: true,
       test: !!orgSlug,
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
     {
       test: !!repoName,
-      message: 'Repository name using --repoNam',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Repository name as first argument'
+        : 'Repository name using --repoName',
       pass: 'ok',
       fail: 'missing'
     },
@@ -9497,12 +9730,19 @@ async function run$d(argv, importMeta, { parentName }) {
         'You need to be logged in to use this command. See `socket login`.',
       pass: 'ok',
       fail: 'missing API token'
+    },
+    {
+      nook: true,
+      test: !shadowNpmInject.isTestingV1() || !repoNameFlag,
+      message: 'In v1 the first arg should be the repo, not the flag',
+      pass: 'ok',
+      fail: 'received --repo-name flag'
     }
   )
   if (wasBadInput) {
     return
   }
-  if (cli.flags['dryRun']) {
+  if (dryRun) {
     logger.logger.log(DRY_RUN_BAIL_TEXT$d)
     return
   }
@@ -9538,11 +9778,22 @@ const config$c = {
   description: 'Delete a repository in an organization',
   hidden: false,
   flags: {
-    ...commonFlags
+    ...commonFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <repo slug>
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '<repo>' : '<org slug> --repo-name=<name>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -9552,7 +9803,7 @@ const config$c = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg test-repo
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
   `
 }
 const cmdReposDel = {
@@ -9567,21 +9818,33 @@ async function run$c(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const repoName = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+  const repoName =
+    (defaultOrgSlug || shadowNpmInject.isTestingV1()
+      ? cli.input[0]
+      : cli.input[1]) || ''
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: true,
       test: !!orgSlug,
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
     {
       test: !!repoName,
-      message: 'Repository name argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Repository name as first argument'
+        : 'Repository name using --repoName',
       pass: 'ok',
       fail: 'missing'
     },
@@ -9597,7 +9860,7 @@ async function run$c(argv, importMeta, { parentName }) {
   if (wasBadInput) {
     return
   }
-  if (cli.flags['dryRun']) {
+  if (dryRun) {
     logger.logger.log(DRY_RUN_BAIL_TEXT$c)
     return
   }
@@ -9705,6 +9968,17 @@ const config$b = {
       default: 'desc',
       description: 'Direction option'
     },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     perPage: {
       type: 'number',
       shortFlag: 'pp',
@@ -9721,7 +9995,7 @@ const config$b = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '' : '<org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -9731,7 +10005,7 @@ const config$b = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '' : '<org slug>'}
   `
 }
 const cmdReposList = {
@@ -9747,14 +10021,21 @@ async function run$b(argv, importMeta, { parentName }) {
     parentName
   })
   const { json, markdown } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: true,
       test: !!orgSlug,
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
@@ -9856,6 +10137,29 @@ const config$a = {
   hidden: false,
   flags: {
     ...commonFlags,
+    defaultBranch: {
+      type: 'string',
+      shortFlag: 'b',
+      default: 'main',
+      description: 'Repository default branch'
+    },
+    homepage: {
+      type: 'string',
+      shortFlag: 'h',
+      default: '',
+      description: 'Repository url'
+    },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     repoName: {
       type: 'string',
       shortFlag: 'n',
@@ -9868,18 +10172,6 @@ const config$a = {
       default: '',
       description: 'Repository description'
     },
-    homepage: {
-      type: 'string',
-      shortFlag: 'h',
-      default: '',
-      description: 'Repository url'
-    },
-    defaultBranch: {
-      type: 'string',
-      shortFlag: 'b',
-      default: 'main',
-      description: 'Repository default branch'
-    },
     visibility: {
       type: 'string',
       shortFlag: 'v',
@@ -9889,7 +10181,7 @@ const config$a = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> --repo-name=<name>
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '<repo>' : '<org slug> --repo-name=<name>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -9899,7 +10191,7 @@ const config$a = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
   `
 }
 const cmdReposUpdate = {
@@ -9914,21 +10206,32 @@ async function run$a(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const repoName = cli.flags['repoName']
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+  const repoNameFlag = cli.flags['repoName']
+  const repoName =
+    (shadowNpmInject.isTestingV1() ? cli.input[0] : repoNameFlag) || ''
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: true,
       test: !!orgSlug,
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
     {
       test: !!repoName,
-      message: 'Repository name using --repoName',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Repository name as first argument'
+        : 'Repository name using --repoName',
       pass: 'ok',
       fail: 'missing'
     },
@@ -9939,6 +10242,13 @@ async function run$a(argv, importMeta, { parentName }) {
         'You need to be logged in to use this command. See `socket login`.',
       pass: 'ok',
       fail: 'missing API token'
+    },
+    {
+      nook: true,
+      test: !shadowNpmInject.isTestingV1() || !repoNameFlag,
+      message: 'In v1 the first arg should be the repo, not the flag',
+      pass: 'ok',
+      fail: 'received --repo-name flag'
     }
   )
   if (wasBadInput) {
@@ -10055,6 +10365,17 @@ const config$9 = {
   flags: {
     ...commonFlags,
     ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     repoName: {
       description: 'The repository to check',
       default: '',
@@ -10063,7 +10384,7 @@ const config$9 = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> --repo-name=<name>
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '<repo>' : '<org slug> --repo-name=<name>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -10073,7 +10394,7 @@ const config$9 = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
   `
 }
 const cmdReposView = {
@@ -10088,21 +10409,38 @@ async function run$9(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { json, markdown, repoName } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const {
+    dryRun,
+    interactive,
+    json,
+    markdown,
+    org: orgFlag,
+    repoName: repoNameFlag
+  } = cli.flags
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+  const repoName =
+    (shadowNpmInject.isTestingV1() ? cli.input[0] : repoNameFlag) || ''
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: true,
       test: !!orgSlug,
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
     {
       test: !!repoName,
-      message: 'Repository name using --repoName',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Repository name as first argument'
+        : 'Repository name using --repoName',
       pass: 'ok',
       fail: 'missing'
     },
@@ -10121,6 +10459,13 @@ async function run$9(argv, importMeta, { parentName }) {
         'You need to be logged in to use this command. See `socket login`.',
       pass: 'ok',
       fail: 'missing API token'
+    },
+    {
+      nook: true,
+      test: !shadowNpmInject.isTestingV1() || !repoNameFlag,
+      message: 'In v1 the first arg should be the repo, not the flag',
+      pass: 'ok',
+      fail: 'received --repo-name flag'
     }
   )
   if (wasBadInput) {
@@ -10159,45 +10504,6 @@ const cmdRepos = {
   }
 }
 
-async function suggestOrgSlug() {
-  const sockSdk = await shadowNpmInject.setupSdk()
-  const result = await handleApiCall(
-    sockSdk.getOrganizations(),
-    'looking up organizations'
-  )
-  // Ignore a failed request here. It was not the primary goal of
-  // running this command and reporting it only leads to end-user confusion.
-  if (result.success) {
-    const proceed = await prompts.select({
-      message:
-        'Missing org name; do you want to use any of these orgs for this scan?',
-      choices: [
-        ...Object.values(result.data.organizations).map(org => {
-          const slug = org.name ?? 'undefined'
-          return {
-            name: `Yes [${slug}]`,
-            value: slug,
-            description: `Use "${slug}" as the organization`
-          }
-        }),
-        {
-          name: 'No',
-          value: '',
-          description:
-            'Do not use any of these organizations (will end in a no-op)'
-        }
-      ]
-    })
-    if (proceed) {
-      return proceed
-    }
-  } else {
-    logger.logger.fail(
-      'Failed to lookup organization list from API, unable to suggest'
-    )
-  }
-}
-
 async function suggestTarget() {
   // We could prefill this with sub-dirs of the current
   // dir ... but is that going to be useful?
@@ -10281,6 +10587,11 @@ const config$8 = {
       shortFlag: 'pr',
       description: 'Commit hash'
     },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     readOnly: {
       type: 'boolean',
       default: false,
@@ -10310,7 +10621,7 @@ const config$8 = {
   // TODO: your project's "socket.yml" file's "projectIgnorePaths"
   help: (command, config) => `
     Usage
-      $ ${command} [...options] <org> <TARGET> [TARGET...]
+      $ ${command} [...options]${shadowNpmInject.isTestingV1() ? '' : ' <org>'} <TARGET> [TARGET...]
 
     API Token Requirements
       - Quota: 1 unit
@@ -10343,7 +10654,8 @@ const config$8 = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} --repo=test-repo --branch=main FakeOrg ./package.json
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} .
+      $ ${command} --repo=test-repo --branch=main${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} ./package.json
   `
 }
 const cmdScanCreate = {
@@ -10365,10 +10677,11 @@ async function run$8(argv, importMeta, { parentName }) {
     committers,
     cwd: cwdOverride,
     defaultBranch,
-    dryRun,
+    dryRun = false,
     interactive = true,
     json,
     markdown,
+    org: orgFlag,
     pendingHead,
     pullRequest,
     readOnly,
@@ -10376,9 +10689,19 @@ async function run$8(argv, importMeta, { parentName }) {
     report,
     tmp
   } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  let orgSlug = defaultOrgSlug || cli.input[0] || ''
-  let targets = cli.input.slice(defaultOrgSlug ? 0 : 1)
+  let [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    interactive,
+    dryRun
+  )
+  if (!defaultOrgSlug) {
+    // Tmp. just for TS. will drop this later.
+    defaultOrgSlug = ''
+  }
+  let targets = cli.input.slice(
+    shadowNpmInject.isTestingV1() || defaultOrgSlug ? 0 : 1
+  )
   const cwd =
     cwdOverride && cwdOverride !== 'process.cwd()'
       ? String(cwdOverride)
@@ -10422,9 +10745,11 @@ async function run$8(argv, importMeta, { parentName }) {
   }
   const wasBadInput = handleBadInput(
     {
-      nook: !!defaultOrgSlug,
+      nook: !shadowNpmInject.isTestingV1() && !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
@@ -10538,11 +10863,22 @@ const config$7 = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <scan ID>
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'} <scan ID>
 
     API Token Requirements
       - Quota: 1 unit
@@ -10552,7 +10888,7 @@ const config$7 = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0
   `
 }
 const cmdScanDel = {
@@ -10567,15 +10903,25 @@ async function run$7(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const scanId = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+  const scanId =
+    (shadowNpmInject.isTestingV1() || defaultOrgSlug
+      ? cli.input[0]
+      : cli.input[1]) || ''
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
@@ -10860,11 +11206,22 @@ const config$6 = {
       default: '',
       description:
         'Path to a local file where the output should be saved. Use `-` to force stdout.'
+    },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
     }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <ID1> <ID2>
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'} <ID1> <ID2>
 
     API Token Requirements
       - Quota: 1 unit
@@ -10881,8 +11238,8 @@ const config$6 = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeCorp aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
-      $ ${command} FakeCorp aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json
   `
 }
 const cmdScanDiff = {
@@ -10897,9 +11254,21 @@ async function run$6(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { depth, file, json, markdown } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const {
+    depth,
+    dryRun,
+    file,
+    interactive,
+    json,
+    markdown,
+    org: orgFlag
+  } = cli.flags
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
   let id1 = cli.input[defaultOrgSlug ? 0 : 1] || ''
   let id2 = cli.input[defaultOrgSlug ? 1 : 2] || ''
   if (id1.startsWith(SOCKET_SBOM_URL_PREFIX)) {
@@ -10925,7 +11294,9 @@ async function run$6(argv, importMeta, { parentName }) {
     {
       test: !!orgSlug,
       nook: true,
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail: 'missing'
     },
@@ -11106,6 +11477,12 @@ const config$5 = {
       default: '',
       description: 'From time - as a unix timestamp'
     },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
     page: {
       type: 'number',
       shortFlag: 'p',
@@ -11118,6 +11495,11 @@ const config$5 = {
       default: 30,
       description: 'Results per page - Default is 30'
     },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     repo: {
       type: 'string',
       description: 'Filter to show only scans with this repository name'
@@ -11138,7 +11520,7 @@ const config$5 = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -11148,7 +11530,7 @@ const config$5 = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'}
   `
 }
 const cmdScanList = {
@@ -11163,15 +11545,29 @@ async function run$5(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { branch, json, markdown, repo } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const {
+    branch,
+    dryRun,
+    interactive,
+    json,
+    markdown,
+    org: orgFlag,
+    repo
+  } = cli.flags
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
@@ -11282,11 +11678,22 @@ const config$4 = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <scan ID>
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'} <scan ID>
 
     API Token Requirements
       - Quota: 1 unit
@@ -11296,7 +11703,7 @@ const config$4 = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0
   `
 }
 const cmdScanMetadata = {
@@ -11311,16 +11718,25 @@ async function run$4(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { json, markdown } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const scanId = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+  const scanId =
+    (shadowNpmInject.isTestingV1() || defaultOrgSlug
+      ? cli.input[0]
+      : cli.input[1]) || ''
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
@@ -11377,6 +11793,17 @@ const config$3 = {
       default: 'none',
       description: 'Fold reported alerts to some degree'
     },
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     reportLevel: {
       type: 'string',
       default: 'warn',
@@ -11395,7 +11822,7 @@ const config$3 = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <scan ID> [path to output file]
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'} <scan ID> [path to output file]
 
     API Token Requirements
       - Quota: 2 units
@@ -11414,8 +11841,8 @@ const config$3 = {
     Short responses: JSON: \`{healthy:bool}\`, markdown: \`healthy = bool\`, text: \`OK/ERR\`
 
     Examples
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json --fold=version
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 --license --markdown --short
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json --fold=version
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --license --markdown --short
   `
 }
 const cmdScanReport = {
@@ -11437,16 +11864,29 @@ async function run$3(argv, importMeta, { parentName }) {
     markdown,
     reportLevel = 'warn'
   } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const scanId = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
-  const file = (defaultOrgSlug ? cli.input[1] : cli.input[2]) || '-'
+  const { dryRun, interactive, org: orgFlag } = cli.flags
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+  const scanId =
+    (shadowNpmInject.isTestingV1() || defaultOrgSlug
+      ? cli.input[0]
+      : cli.input[1]) || ''
+  const file =
+    (shadowNpmInject.isTestingV1() || defaultOrgSlug
+      ? cli.input[1]
+      : cli.input[2]) || '-'
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
@@ -11605,11 +12045,22 @@ const config$2 = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    }
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug> <scan ID> [path to output file]
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'} <scan ID> [path to output file]
 
     API Token Requirements
       - Quota: 1 unit
@@ -11621,7 +12072,7 @@ const config$2 = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt
   `
 }
 const cmdScanView = {
@@ -11636,17 +12087,29 @@ async function run$2(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { json, markdown } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const scanId = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
-  const file = (defaultOrgSlug ? cli.input[1] : cli.input[2]) || '-'
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
+  const scanId =
+    (shadowNpmInject.isTestingV1() || defaultOrgSlug
+      ? cli.input[0]
+      : cli.input[1]) || ''
+  const file =
+    (shadowNpmInject.isTestingV1() || defaultOrgSlug
+      ? cli.input[1]
+      : cli.input[2]) || '-'
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
       nook: !!defaultOrgSlug,
       test: !!orgSlug && orgSlug !== '.',
-      message: 'Org name as the first argument',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Org name by default setting, --org, or auto-discovered'
+        : 'Org name must be the first argument',
       pass: 'ok',
       fail:
         orgSlug === '.'
@@ -11934,6 +12397,17 @@ const config$1 = {
   flags: {
     ...commonFlags,
     ...outputFlags,
+    interactive: {
+      type: 'boolean',
+      default: true,
+      description:
+        'Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.'
+    },
+    org: {
+      type: 'string',
+      description:
+        'Force override the organization slug, overrides the default org from config'
+    },
     perPage: {
       type: 'number',
       shortFlag: 'pp',
@@ -11967,7 +12441,7 @@ const config$1 = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' <org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -12004,8 +12478,8 @@ const config$1 = {
       - pypi
 
     Examples
-      $ ${command}
-      $ ${command} --perPage=5 --page=2 --direction=asc --filter=joke
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'}
+      $ ${command}${shadowNpmInject.isTestingV1() ? '' : ' FakeOrg'} --perPage=5 --page=2 --direction=asc --filter=joke
   `
 }
 const cmdThreatFeed = {
@@ -12020,9 +12494,13 @@ async function run$1(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { json, markdown } = cli.flags
-  const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    cli.input[0] || '',
+    !!interactive,
+    !!dryRun
+  )
   const apiToken = shadowNpmInject.getDefaultToken()
   const wasBadInput = handleBadInput(
     {
@@ -12274,7 +12752,7 @@ void (async () => {
   await vendor.updater({
     name: SOCKET_CLI_BIN_NAME,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-    version: '0.14.148',
+    version: '0.14.150',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12342,5 +12820,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=574124cd-9782-42bb-ba9e-f71cc52dd4c3
+//# debugId=f9eb8bc8-da58-4963-a26b-58b7c8dc44b6
 //# sourceMappingURL=cli.js.map