@socketsecurity/cli-with-sentry 0.14.147 → 0.14.149

package/dist/cli.js

@@ -3,31 +3,31 @@
 const process$1 = require('node:process')
 const require$$0 = require('node:url')
 const vendor = require('./vendor.js')
-const debug = require('./@socketsecurity/registry/lib/debug')
-const logger = require('./@socketsecurity/registry/lib/logger')
+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('./@socketsecurity/registry/lib/strings')
+const strings = require('../external/@socketsecurity/registry/lib/strings')
 const shadowNpmInject = require('./shadow-npm-inject.js')
 const constants = require('./constants.js')
 const path$1 = require('node:path')
-const objects = require('./@socketsecurity/registry/lib/objects')
-const path = require('./@socketsecurity/registry/lib/path')
-const regexps = require('./@socketsecurity/registry/lib/regexps')
-const words = require('./@socketsecurity/registry/lib/words')
+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 words = require('../external/@socketsecurity/registry/lib/words')
 const fs$1 = require('node:fs')
 const shadowBin = require('./shadow-bin.js')
-const prompts = require('./@socketsecurity/registry/lib/prompts')
+const prompts = require('../external/@socketsecurity/registry/lib/prompts')
 const shadowNpmPaths = require('./shadow-npm-paths.js')
 const util = require('node:util')
-const arrays = require('./@socketsecurity/registry/lib/arrays')
-const registry = require('./@socketsecurity/registry')
-const npm = require('./@socketsecurity/registry/lib/npm')
-const packages = require('./@socketsecurity/registry/lib/packages')
-const spawn = require('./@socketsecurity/registry/lib/spawn')
-const sorts = require('./@socketsecurity/registry/lib/sorts')
-const registryConstants = require('./@socketsecurity/registry/lib/constants')
-const promises = require('./@socketsecurity/registry/lib/promises')
+const arrays = require('../external/@socketsecurity/registry/lib/arrays')
+const registry = require('../external/@socketsecurity/registry')
+const npm = require('../external/@socketsecurity/registry/lib/npm')
+const packages = require('../external/@socketsecurity/registry/lib/packages')
+const spawn = require('../external/@socketsecurity/registry/lib/spawn')
+const sorts = require('../external/@socketsecurity/registry/lib/sorts')
+const registryConstants = require('../external/@socketsecurity/registry/lib/constants')
+const promises = require('../external/@socketsecurity/registry/lib/promises')
 
 function failMsgWithBadge(badge, msg) {
   return `${vendor.yoctocolorsCjsExports.bgRed(vendor.yoctocolorsCjsExports.bold(vendor.yoctocolorsCjsExports.white(` ${badge}: `)))} ${vendor.yoctocolorsCjsExports.bold(msg)}`
@@ -387,12 +387,12 @@ ${mdTableStringNumber('Name', 'Counts', data['top_five_alert_types'])}
 `
 }
 function displayAnalyticsScreen(data) {
-  const ScreenWidget = require('./blessed/lib/widgets/screen')
+  const ScreenWidget = require('../external/blessed/lib/widgets/screen.js')
   // Lazily access constants.blessedOptions.
   const screen = new ScreenWidget({
     ...constants.blessedOptions
   })
-  const GridLayout = require('./blessed-contrib/lib/layout/grid')
+  const GridLayout = require('../external/blessed-contrib/lib/layout/grid.js')
   const grid = new GridLayout({
     rows: 5,
     cols: 4,
@@ -454,7 +454,7 @@ function displayAnalyticsScreen(data) {
     [3, 2, 1, 2],
     data['total_low_prevented']
   )
-  const BarChart = require('./blessed-contrib/lib/widget/charts/bar')
+  const BarChart = require('../external/blessed-contrib/lib/widget/charts/bar.js')
   const bar = grid.set(4, 0, 1, 2, BarChart, {
     label: 'Top 5 alert types',
     barWidth: 10,
@@ -551,7 +551,7 @@ function formatDate(date) {
   return `${Months[new Date(date).getMonth()]} ${new Date(date).getDate()}`
 }
 function renderLineCharts(grid, screen, title, coords, data) {
-  const LineChart = require('./blessed-contrib/lib/widget/charts/line')
+  const LineChart = require('../external/blessed-contrib/lib/widget/charts/line.js')
   const line = grid.set(...coords, LineChart, {
     style: {
       line: 'cyan',
@@ -904,11 +904,17 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.147:be0fdf7:51b26920:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.149:e5f0cba:2e3185e5: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
@@ -923,10 +929,10 @@ function getAsciiHeader(command) {
   )
   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${feedback}`
 }
 
 const { DRY_RUN_BAIL_TEXT: DRY_RUN_BAIL_TEXT$J } = constants
@@ -3741,7 +3747,7 @@ function getSocketBranchName(purl, newVersion, workspaceName) {
     ? `${formatBranchName(purlObj.namespace)}-`
     : ''
   const fullName = `${maybeWorkspaceName}${maybeNamespace}${formatBranchName(purlObj.name)}`
-  return `socket-fix-${fullName}-${formatBranchName(newVersion)}`
+  return `socket/${fullName}-${formatBranchName(newVersion)}`
 }
 function getSocketPullRequestTitle(purl, newVersion, workspaceName) {
   const purlObj = vendor.packageurlJsExports.PackageURL.fromString(purl)
@@ -3761,32 +3767,15 @@ function getSocketCommitMessage(purl, newVersion, workspaceName) {
   const workspaceDetails = workspaceName ? ` in ${workspaceName}` : ''
   return `socket: Bump ${pkgName} from ${purlObj.version} to ${newVersion}${workspaceDetails}`
 }
-async function gitBranchExists(branch, cwd = process.cwd()) {
-  try {
-    await spawn.spawn(
-      'git',
-      ['show-ref', '--verify', '--quiet', `refs/heads/${branch}`],
-      {
-        cwd,
-        stdio: 'ignore'
-      }
-    )
-    return true
-  } catch {}
-  return false
-}
-async function gitCleanFdx(cwd = process.cwd()) {
-  await spawn.spawn('git', ['clean', '-fdx'], {
-    cwd
-  })
-}
 async function gitCreateAndPushBranchIfNeeded(
   branch,
   commitMsg,
   cwd = process.cwd()
 ) {
-  if (await gitBranchExists(branch, cwd)) {
-    logger.logger.warn(`Branch "${branch}" already exists, skipping creation.`)
+  if (await gitRemoteBranchExists(branch, cwd)) {
+    logger.logger.warn(
+      `Branch "${branch}" already exists remotely, skipping push.`
+    )
     return true
   }
   const moddedFilepaths = (await gitUnstagedModifiedFiles(cwd)).filter(p => {
@@ -3810,16 +3799,50 @@ async function gitCreateAndPushBranchIfNeeded(
   await spawn.spawn('git', ['commit', '-m', commitMsg], {
     cwd
   })
-  await spawn.spawn('git', ['push', '--set-upstream', 'origin', branch], {
-    cwd
-  })
-  return true
+  try {
+    await spawn.spawn('git', ['push', '--set-upstream', 'origin', branch], {
+      cwd
+    })
+    return true
+  } catch {}
+  logger.logger.warn(`Push failed for "${branch}", trying force-push`)
+  try {
+    await spawn.spawn(
+      'git',
+      ['push', '--force', '--set-upstream', 'origin', branch],
+      {
+        cwd
+      }
+    )
+    return true
+  } catch {}
+  logger.logger.warn(`Force-push failed for "${branch}"`)
+  return false
 }
 async function gitHardReset(branch = 'HEAD', cwd = process.cwd()) {
   await spawn.spawn('git', ['reset', '--hard', branch], {
     cwd
   })
 }
+async function gitCleanFdx(cwd = process.cwd()) {
+  await spawn.spawn('git', ['clean', '-fdx'], {
+    cwd
+  })
+}
+async function gitRemoteBranchExists(branch, cwd = process.cwd()) {
+  try {
+    const { stdout } = await spawn.spawn(
+      'git',
+      ['ls-remote', '--heads', 'origin', branch],
+      {
+        cwd
+      }
+    )
+    return stdout.trim().length > 0
+  } catch {
+    return false
+  }
+}
 async function gitUnstagedModifiedFiles(cwd = process.cwd()) {
   const { stdout } = await spawn.spawn('git', ['diff', '--name-only'], {
     cwd
@@ -3984,11 +4007,11 @@ function normalizeFixOptions(options_) {
     __proto__: null,
     ...options_
   }
-  if (typeof options.autoPilot !== 'boolean') {
-    options.autoPilot = false
+  if (typeof options.autopilot !== 'boolean') {
+    options.autopilot = false
   }
   if (typeof options.autoMerge !== 'boolean') {
-    options.autoMerge = !!options.autoPilot
+    options.autoMerge = !!options.autopilot
   }
   if (typeof options.cwd !== 'string') {
     options.cwd = process.cwd()
@@ -4000,7 +4023,7 @@ function normalizeFixOptions(options_) {
     options.rangeStyle = 'preserve'
   }
   if (typeof options.test !== 'boolean') {
-    options.test = !!options.autoPilot || !!options.testScript
+    options.test = !!options.autopilot || !!options.testScript
   }
   if (typeof options.testScript !== 'string') {
     options.testScript = 'test'
@@ -5151,7 +5174,7 @@ const config$B = {
   hidden: false,
   flags: {
     ...commonFlags,
-    autoPilot: {
+    autopilot: {
       type: 'boolean',
       default: false,
       description: `Shorthand for --autoMerge --test`
@@ -5164,25 +5187,25 @@ const config$B = {
     purl: {
       type: 'string',
       default: [],
-      description: `Provide a list of ${vendor.terminalLinkExports('package URLs (PURLs)', 'https://github.com/package-url/purl-spec?tab=readme-ov-file#purl')} to fix, as either a comma separated value or as multiple flags, instead of querying the Socket API`,
+      description: `Provide a list of ${vendor.terminalLinkExports('package URLs', 'https://github.com/package-url/purl-spec?tab=readme-ov-file#purl')} (PURLs) to fix, as either a comma separated value or as multiple flags,\n                        instead of querying the Socket API`,
       isMultiple: true,
       shortFlag: 'p'
     },
     rangeStyle: {
       type: 'string',
       default: 'preserve',
-      description: vendor.html`
-      Define how updated dependency versions should be written in package.json.
-      Available styles:
-        *	caret - Use ^ range for compatible updates (e.g. ^1.2.3)
-        *	gt - Use > to allow any newer version (e.g. >1.2.3)
-        *	gte - Use >= to allow any newer version (e.g. >=1.2.3)
-        *	lt - Use < to allow only lower versions (e.g. <1.2.3)
-        *	lte - Use <= to allow only lower versions (e.g. <=1.2.3)
-        *	pin - Use the exact version (e.g. 1.2.3)
-        *	preserve - Retain the existing version range style as-is
-        *	tilde - Use ~ range for patch/minor updates (e.g. ~1.2.3)
-      `
+      description: `
+                        Define how updated dependency versions should be written in package.json.
+                        Available styles:
+                          * caret - Use ^ range for compatible updates (e.g. ^1.2.3)
+                          * gt - Use > to allow any newer version (e.g. >1.2.3)
+                          * gte - Use >= to allow any newer version (e.g. >=1.2.3)
+                          * lt - Use < to allow only lower versions (e.g. <1.2.3)
+                          * lte - Use <= to allow only lower versions (e.g. <=1.2.3)
+                          * pin - Use the exact version (e.g. 1.2.3)
+                          * preserve - Retain the existing version range style as-is
+                          * tilde - Use ~ range for patch/minor updates (e.g. ~1.2.3)
+      `.trim()
     },
     test: {
       type: 'boolean',
@@ -5233,7 +5256,7 @@ async function run$B(argv, importMeta, { parentName }) {
   const { spinner } = constants
   await runFix({
     autoMerge: Boolean(cli.flags['autoMerge']),
-    autoPilot: Boolean(cli.flags['autoPilot']),
+    autopilot: Boolean(cli.flags['autopilot']),
     purls: Array.isArray(cli.flags['purl']) ? cli.flags['purl'] : [],
     spinner,
     rangeStyle: cli.flags['rangeStyle'] ?? undefined,
@@ -6036,7 +6059,7 @@ async function convertGradleToMaven(target, bin, cwd, verbose, gradleOpts) {
     // I'd prefer something plain-text if it is to be committed.
 
     // Note: init.gradle will be exported by .config/rollup.dist.config.mjs
-    const initLocation = path$1.join(constants.rootDistPath, 'init.gradle')
+    const initLocation = path$1.join(constants.distPath, 'init.gradle')
     const commandArgs = ['--init-script', initLocation, ...gradleOpts, 'pom']
     if (verbose) {
       logger.logger.log('[VERBOSE] Executing:', [bin], ', args:', commandArgs)
@@ -9394,6 +9417,45 @@ async function handleCreateRepo({
   await outputCreateRepo()
 }
 
+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'
+    )
+  }
+}
+
 const { DRY_RUN_BAIL_TEXT: DRY_RUN_BAIL_TEXT$d } = constants
 const config$d = {
   commandName: 'create',
@@ -9401,11 +9463,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',
@@ -9413,17 +9492,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',
@@ -9434,7 +9507,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
@@ -9444,7 +9517,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 = {
@@ -9459,21 +9532,51 @@ 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 interactive = cli.flags['interactive']
+  const dryRun = cli.flags['dryRun']
+  let orgSlug = String(cli.flags['org'] || 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 = cli.input[0] || ''
+    }
+  }
+  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 --repoNam',
+      message: shadowNpmInject.isTestingV1()
+        ? 'Repository name as first argument'
+        : 'Repository name using --repoName',
       pass: 'ok',
       fail: 'missing'
     },
@@ -9484,12 +9587,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
   }
@@ -9525,11 +9635,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
@@ -9539,7 +9660,7 @@ const config$c = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg test-repo
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
   `
 }
 const cmdReposDel = {
@@ -9555,20 +9676,51 @@ async function run$c(argv, importMeta, { parentName }) {
     parentName
   })
   const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
-  const repoName = (defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
+  const interactive = cli.flags['interactive']
+  const dryRun = cli.flags['dryRun']
+  let orgSlug = String(cli.flags['org'] || 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 = cli.input[0] || ''
+    }
+  }
+  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'
     },
@@ -9584,7 +9736,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
   }
@@ -9692,6 +9844,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',
@@ -9708,7 +9871,7 @@ const config$b = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '' : '<org slug>'}
 
     API Token Requirements
       - Quota: 1 unit
@@ -9718,7 +9881,7 @@ const config$b = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command} ${shadowNpmInject.isTestingV1() ? '' : '<org slug>'}
   `
 }
 const cmdReposList = {
@@ -9735,13 +9898,39 @@ async function run$b(argv, importMeta, { parentName }) {
   })
   const { json, markdown } = cli.flags
   const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const interactive = cli.flags['interactive']
+  const dryRun = cli.flags['dryRun']
+  let orgSlug = String(cli.flags['org'] || 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 = cli.input[0] || ''
+    }
+  }
   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'
     },
@@ -9843,6 +10032,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',
@@ -9855,18 +10067,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',
@@ -9876,7 +10076,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
@@ -9886,7 +10086,7 @@ const config$a = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
   `
 }
 const cmdReposUpdate = {
@@ -9901,21 +10101,51 @@ 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 interactive = cli.flags['interactive']
+  const dryRun = cli.flags['dryRun']
+  let orgSlug = String(cli.flags['org'] || 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 = cli.input[0] || ''
+    }
+  }
+  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'
     },
@@ -9926,6 +10156,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) {
@@ -10042,6 +10279,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: '',
@@ -10050,7 +10298,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
@@ -10060,7 +10308,7 @@ const config$9 = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} FakeOrg
+      $ ${command} ${shadowNpmInject.isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
   `
 }
 const cmdReposView = {
@@ -10075,21 +10323,52 @@ async function run$9(argv, importMeta, { parentName }) {
     importMeta,
     parentName
   })
-  const { json, markdown, repoName } = cli.flags
+  const { json, markdown } = cli.flags
   const defaultOrgSlug = shadowNpmInject.getConfigValue('defaultOrg')
-  const orgSlug = defaultOrgSlug || cli.input[0] || ''
+  const interactive = cli.flags['interactive']
+  const dryRun = cli.flags['dryRun']
+  let orgSlug = String(cli.flags['org'] || 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 = cli.input[0] || ''
+    }
+  }
+  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'
     },
@@ -10108,6 +10387,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) {
@@ -10146,45 +10432,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?
@@ -11752,7 +11999,7 @@ async function outputThreatFeed(data, { outputKind }) {
   const descriptions = data.results.map(d => d.description)
 
   // Note: this temporarily takes over the terminal (just like `man` does).
-  const ScreenWidget = require('./blessed/lib/widgets/screen')
+  const ScreenWidget = require('../external/blessed/lib/widgets/screen.js')
   // Lazily access constants.blessedOptions.
   const screen = new ScreenWidget({
     ...constants.blessedOptions
@@ -11762,7 +12009,7 @@ async function outputThreatFeed(data, { outputKind }) {
   // node process just to exit it. That's very bad UX.
   // eslint-disable-next-line n/no-process-exit
   screen.key(['escape', 'q', 'C-c'], () => process.exit(0))
-  const TableWidget = require('./blessed-contrib/lib/widget/table')
+  const TableWidget = require('../external/blessed-contrib/lib/widget/table.js')
   const table = new TableWidget({
     keys: 'true',
     fg: 'white',
@@ -11785,7 +12032,7 @@ async function outputThreatFeed(data, { outputKind }) {
   })
 
   // Create details box at the bottom
-  const BoxWidget = require('./blessed/lib/widgets/box')
+  const BoxWidget = require('../external/blessed/lib/widgets/box.js')
   const detailsBox = new BoxWidget({
     bottom: 0,
     height: '30%',
@@ -12261,7 +12508,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.147',
+    version: '0.14.149',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -12329,5 +12576,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=a603ceaf-8d64-4a4b-a62c-3e5eaccc586b
+//# debugId=b16c9682-c6cb-499e-9433-037f8e571bc1
 //# sourceMappingURL=cli.js.map