diff --git a/src/cli.mts b/src/cli.mts
index 95b474da1..a8a0d4af1 100755
--- a/src/cli.mts
+++ b/src/cli.mts
@@ -11,30 +11,27 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { cmdAnalytics } from './commands/analytics/cmd-analytics.mts'
 import { cmdAuditLog } from './commands/audit-log/cmd-audit-log.mts'
-import { cmdCdxgen } from './commands/cdxgen/cmd-cdxgen.mts'
 import { cmdCI } from './commands/ci/cmd-ci.mts'
 import { cmdConfig } from './commands/config/cmd-config.mts'
-import { cmdScanCreate } from './commands/dependencies/cmd-dependencies.mts'
-import { cmdDiffScan } from './commands/diff-scan/cmd-diff-scan.mts'
 import { cmdFix } from './commands/fix/cmd-fix.mts'
-import { cmdInfo } from './commands/info/cmd-info.mts'
 import { cmdInstall } from './commands/install/cmd-install.mts'
 import { cmdJson } from './commands/json/cmd-json.mts'
 import { cmdLogin } from './commands/login/cmd-login.mts'
 import { cmdLogout } from './commands/logout/cmd-logout.mts'
+import { cmdManifestCdxgen } from './commands/manifest/cmd-manifest-cdxgen.mts'
 import { cmdManifest } from './commands/manifest/cmd-manifest.mts'
 import { cmdNpm } from './commands/npm/cmd-npm.mts'
 import { cmdNpx } from './commands/npx/cmd-npx.mts'
 import { cmdOops } from './commands/oops/cmd-oops.mts'
 import { cmdOptimize } from './commands/optimize/cmd-optimize.mts'
+import { cmdOrganizationDependencies } from './commands/organization/cmd-organization-dependencies.mts'
 import { cmdOrganizationPolicyLicense } from './commands/organization/cmd-organization-policy-license.mts'
-import { cmdOrganizationPolicyPolicy } from './commands/organization/cmd-organization-policy-security.mts'
+import { cmdOrganizationPolicySecurity } from './commands/organization/cmd-organization-policy-security.mts'
 import { cmdOrganization } from './commands/organization/cmd-organization.mts'
 import { cmdPackage } from './commands/package/cmd-package.mts'
 import { cmdRawNpm } from './commands/raw-npm/cmd-raw-npm.mts'
 import { cmdRawNpx } from './commands/raw-npx/cmd-raw-npx.mts'
-import { cmdReport } from './commands/report/cmd-report.mts'
-import { cmdRepos } from './commands/repos/cmd-repos.mts'
+import { cmdRepository } from './commands/repository/cmd-repository.mts'
 import { cmdScan } from './commands/scan/cmd-scan.mts'
 import { cmdThreatFeed } from './commands/threat-feed/cmd-threat-feed.mts'
 import { cmdUninstall } from './commands/uninstall/cmd-uninstall.mts'
@@ -62,10 +59,8 @@ void (async () => {
     await meowWithSubcommands(
       {
         ci: cmdCI,
-        cdxgen: cmdCdxgen,
         config: cmdConfig,
         fix: cmdFix,
-        info: cmdInfo,
         install: cmdInstall,
         json: cmdJson,
         login: cmdLogin,
@@ -78,14 +73,11 @@ void (async () => {
         package: cmdPackage,
         'raw-npm': cmdRawNpm,
         'raw-npx': cmdRawNpx,
-        report: cmdReport,
         wrapper: cmdWrapper,
         scan: cmdScan,
         'audit-log': cmdAuditLog,
-        repos: cmdRepos,
-        dependencies: cmdScanCreate,
+        repos: cmdRepository,
         analytics: cmdAnalytics,
-        'diff-scan': cmdDiffScan,
         'threat-feed': cmdThreatFeed,
         manifest: cmdManifest,
         uninstall: cmdUninstall,
@@ -97,13 +89,28 @@ void (async () => {
             hidden: true,
             argv: ['audit-log'],
           },
+          auditLog: {
+            description: cmdAuditLog.description,
+            hidden: true,
+            argv: ['audit-log'],
+          },
           auditLogs: {
             description: cmdAuditLog.description,
             hidden: true,
             argv: ['audit-log'],
           },
+          ['audit-logs']: {
+            description: cmdAuditLog.description,
+            hidden: true,
+            argv: ['audit-log'],
+          },
+          cdxgen: {
+            description: cmdManifestCdxgen.description,
+            hidden: true,
+            argv: ['manifest', 'cdxgen'],
+          },
           deps: {
-            description: cmdScanCreate.description,
+            description: cmdOrganizationDependencies.description,
             hidden: true,
             argv: ['dependencies'],
           },
@@ -148,22 +155,22 @@ void (async () => {
             argv: ['package'],
           },
           repo: {
-            description: cmdRepos.description,
+            description: cmdRepository.description,
             hidden: true,
             argv: ['repos'],
           },
           repository: {
-            description: cmdRepos.description,
+            description: cmdRepository.description,
             hidden: true,
             argv: ['repos'],
           },
           repositories: {
-            description: cmdRepos.description,
+            description: cmdRepository.description,
             hidden: true,
             argv: ['repos'],
           },
           security: {
-            description: cmdOrganizationPolicyPolicy.description,
+            description: cmdOrganizationPolicySecurity.description,
             hidden: true,
             argv: ['organization', 'policy', 'security'],
           },
diff --git a/src/commands/analytics/cmd-analytics.mts b/src/commands/analytics/cmd-analytics.mts
index c6ca83e3b..f73bcf19c 100644
--- a/src/commands/analytics/cmd-analytics.mts
+++ b/src/commands/analytics/cmd-analytics.mts
@@ -4,7 +4,6 @@ import { handleAnalytics } from './handle-analytics.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 import { getFlagListOutput } from '../../utils/output-formatting.mts'
@@ -23,58 +22,32 @@ const config: CliCommandConfig = {
     ...outputFlags,
     file: {
       type: 'string',
-      shortFlag: 'f',
-      description:
-        'Filepath to save output when given. Only valid with --json/--markdown.',
-    },
-    repo: {
-      type: 'string',
-      shortFlag: 'r',
-      default: '',
-      description: 'Name of the repository. Only valid when scope=repo',
-    },
-    scope: {
-      type: 'string',
-      shortFlag: 's',
-      default: 'org',
-      description:
-        "Scope of the analytics data - either 'org' or 'repo', default: org",
-    },
-    time: {
-      type: 'number',
-      shortFlag: 't',
-      default: 30,
-      description: 'Time filter - either 7, 30 or 90, default: 30',
+      description: 'Path to store result, only valid with --json/--markdown',
     },
   },
   help: (command, { flags }) =>
     `
     Usage
-      $ ${command} ${isTestingV1() ? '[ org | repo <reponame>] [time]' : '--scope=<scope> --time=<time filter>'}
+      $ ${command} [options] [ "org" | "repo" <reponame>] [TIME]
 
     API Token Requirements
       - Quota: 1 unit
       - Permissions: report:write
 
-    ${isTestingV1() ? '' : 'Default parameters are set to show the organization-level analytics over the'}
-    ${isTestingV1() ? '' : 'last 30 days.'}
-
-    ${isTestingV1() ? 'The scope is either org or repo level, defaults to org.' : ''}
+    The scope is either org or repo level, defaults to org.
 
-    ${isTestingV1() ? 'When scope is repo, a repo slug must be given as well.' : ''}
+    When scope is repo, a repo slug must be given as well.
 
-    ${isTestingV1() ? 'The time argument must be number 7, 30, or 90 and defaults to 30.' : ''}
+    The TIME argument must be number 7, 30, or 90 and defaults to 30.
 
     Options
       ${getFlagListOutput(flags, 6)}
 
     Examples
-      $ ${command} ${isTestingV1() ? 'org 7' : '--scope=org --time=7'}
-      $ ${command} ${isTestingV1() ? 'repo test-repo 30' : '--scope=org --time=30'}
-      $ ${command} ${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'),
+      $ ${command} org 7
+      $ ${command} repo test-repo 30
+      $ ${command} 90
+  `,
 }
 
 export const cmdAnalytics = {
@@ -98,7 +71,7 @@ async function run(
   const { file, json, markdown } = cli.flags
   const outputKind = getOutputKind(json, markdown)
 
-  // In v1 mode support:
+  // Supported inputs:
   // - []        (no args)
   // - ['org']
   // - ['org', '30']
@@ -107,62 +80,42 @@ async function run(
   // - ['30']
   // Validate final values in the next step
   let scope = 'org'
-  let time = isTestingV1() ? '30' : 30
+  let time = '30'
   let repoName = ''
-  if (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]
+  if (cli.input[0] === 'org') {
+    if (cli.input[1]) {
+      time = cli.input[1]
     }
-  } else {
-    if (cli.flags['scope']) {
-      scope = String(cli.flags['scope'] || '')
+  } else if (cli.input[0] === 'repo') {
+    scope = 'repo'
+    if (cli.input[1]) {
+      repoName = cli.input[1]
     }
-    if (scope === 'repo') {
-      repoName = String(cli.flags['repo'] || '')
-    }
-    if (cli.flags['time']) {
-      time = Number(cli.flags['time'] || 30)
+    if (cli.input[2]) {
+      time = cli.input[2]
     }
+  } else if (cli.input[0]) {
+    time = cli.input[0]
   }
 
   const hasApiToken = hasDefaultToken()
 
+  const noLegacy =
+    !cli.flags['scope'] && !cli.flags['repo'] && !cli.flags['time']
+
   const wasValidInput = checkCommandInput(
     outputKind,
-    {
-      // In v1 this can't go wrong anymore since the unknown value goes to time
-      nook: !isTestingV1(),
-      test: scope === 'org' || scope === 'repo',
-      message: 'Scope must be "repo" or "org"',
-      pass: 'ok',
-      fail: 'bad',
-    },
     {
       nook: true,
-      // Before v1 there were no args, only flags
-      test: isTestingV1() || cli.input.length === 0,
-      message: 'This command does not accept any arguments (use flags instead)',
+      test: noLegacy,
+      message: 'Legacy flags are no longer supported. See v1 migration guide.',
       pass: 'ok',
-      fail: `bad`,
+      fail: `received legacy flags`,
     },
     {
       nook: true,
       test: scope === 'org' || !!repoName,
-      message: isTestingV1()
-        ? 'When scope=repo, repo name should be the second argument'
-        : 'When scope=repo, repo name should be set through --repo',
+      message: 'When scope=repo, repo name should be the second argument',
       pass: 'ok',
       fail: 'missing',
     },
@@ -170,21 +123,16 @@ async function run(
       nook: true,
       test:
         scope === 'org' ||
-        !isTestingV1() ||
         (repoName !== '7' && repoName !== '30' && repoName !== '90'),
       message: 'When scope is repo, the second arg should be repo, not time',
       pass: 'ok',
       fail: 'missing',
     },
     {
-      test: isTestingV1()
-        ? time === '7' || time === '30' || time === '90'
-        : time === 7 || time === 30 || time === 90,
+      test: time === '7' || time === '30' || time === '90',
       message: 'The time filter must either be 7, 30 or 90',
       pass: 'ok',
-      fail: isTestingV1()
-        ? 'invalid range set, see --help for command arg details.'
-        : 'bad',
+      fail: 'invalid range set, see --help for command arg details.',
     },
     {
       nook: true,
@@ -222,8 +170,7 @@ async function run(
 
   return await handleAnalytics({
     scope,
-    time:
-      time === '90' || time === 90 ? 90 : time === '30' || time === 30 ? 30 : 7,
+    time: time === '90' ? 90 : time === '30' ? 30 : 7,
     repo: repoName,
     outputKind,
     filePath: String(file || ''),
diff --git a/src/commands/analytics/cmd-analytics.test.mts b/src/commands/analytics/cmd-analytics.test.mts
index 210dee6d8..700841b30 100644
--- a/src/commands/analytics/cmd-analytics.test.mts
+++ b/src/commands/analytics/cmd-analytics.test.mts
@@ -18,27 +18,27 @@ describe('socket analytics', async () => {
         "Look up analytics data
 
           Usage
-            $ socket analytics --scope=<scope> --time=<time filter>
+            $ socket analytics [options] [ "org" | "repo" <reponame>] [TIME]
 
           API Token Requirements
             - Quota: 1 unit
             - Permissions: report:write
 
-          Default parameters are set to show the organization-level analytics over the
-          last 30 days.
+          The scope is either org or repo level, defaults to org.
+
+          When scope is repo, a repo slug must be given as well.
+
+          The TIME argument must be number 7, 30, or 90 and defaults to 30.
 
           Options
-            --file            Filepath to save output when given. Only valid with --json/--markdown.
+            --file            Path to store result, only valid with --json/--markdown
             --json            Output result as json
             --markdown        Output result as markdown
-            --repo            Name of the repository. Only valid when scope=repo
-            --scope           Scope of the analytics data - either 'org' or 'repo', default: org
-            --time            Time filter - either 7, 30 or 90, default: 30
 
           Examples
-            $ socket analytics --scope=org --time=7
-            $ socket analytics --scope=org --time=30
-            $ socket analytics --scope=repo --repo=test-repo --time=30"
+            $ socket analytics org 7
+            $ socket analytics repo test-repo 30
+            $ socket analytics 90"
       `,
       )
       // Node 24 on Windows currently fails this test with added stderr:
@@ -64,7 +64,7 @@ describe('socket analytics', async () => {
 
   cmdit(
     ['analytics', '--dry-run', '--config', '{}'],
-    'should require args with just dry-run',
+    'should report missing token with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
@@ -74,7 +74,6 @@ describe('socket analytics', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - The time filter must either be 7, 30 or 90 (\\x1b[32mok\\x1b[39m)
@@ -98,94 +97,40 @@ describe('socket analytics', async () => {
       '--config',
       '{"apiToken":"anything"}',
     ],
-    'should require args with just dry-run',
+    'should reject legacy flags',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
-    },
-  )
-
-  cmdit(
-    ['analytics', '--help', '--config', '{"isTestingV1": true}'],
-    'should support --help in v1',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `
-        "Look up analytics data
-
-          Usage
-            $ socket analytics [ org | repo <reponame>] [time]
-
-          API Token Requirements
-            - Quota: 1 unit
-            - Permissions: report:write
-
-          The scope is either org or repo level, defaults to org.
-
-          When scope is repo, a repo slug must be given as well.
-
-          The time argument must be number 7, 30, or 90 and defaults to 30.
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          Options
-            --file            Filepath to save output when given. Only valid with --json/--markdown.
-            --json            Output result as json
-            --markdown        Output result as markdown
-            --repo            Name of the repository. Only valid when scope=repo
-            --scope           Scope of the analytics data - either 'org' or 'repo', default: org
-            --time            Time filter - either 7, 30 or 90, default: 30
+          - Legacy flags are no longer supported. See v1 migration guide. (\\x1b[31mreceived legacy flags\\x1b[39m)
 
-          Examples
-            $ socket analytics org 7
-            $ socket analytics repo test-repo 30
-            $ socket analytics 90"
-      `,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          - The time filter must either be 7, 30 or 90 (\\x1b[32mok\\x1b[39m)
+        \\x1b[22m"
       `)
 
-      expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain(
-        '`socket analytics`',
-      )
+      expect(code, 'dry-run should reject legacy flags with code 2').toBe(2)
     },
   )
 
   cmdit(
-    [
-      'analytics',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should run to dryrun without args in v1',
+    ['analytics', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should run to dryrun without args',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -193,25 +138,17 @@ describe('socket analytics', async () => {
   )
 
   cmdit(
-    [
-      'analytics',
-      'org',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should accept org arg in v1',
+    ['analytics', 'org', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should accept org arg',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -219,29 +156,19 @@ describe('socket analytics', async () => {
   )
 
   cmdit(
-    [
-      'analytics',
-      'repo',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should ask for repo name with repo arg in v1',
+    ['analytics', 'repo', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should ask for repo name with repo arg',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Scope must be "repo" or "org" (\\x1b[32mok\\x1b[39m)
-
           - When scope=repo, repo name should be the second argument (\\x1b[31mmissing\\x1b[39m)
 
           - The time filter must either be 7, 30 or 90 (\\x1b[32mok\\x1b[39m)
@@ -259,20 +186,18 @@ describe('socket analytics', async () => {
       'daname',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should accept repo with arg in v1',
+    'should accept repo with arg',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -280,25 +205,17 @@ describe('socket analytics', async () => {
   )
 
   cmdit(
-    [
-      'analytics',
-      '7',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should accept time 7 arg in v1',
+    ['analytics', '7', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should accept time 7 arg',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -306,25 +223,35 @@ describe('socket analytics', async () => {
   )
 
   cmdit(
-    [
-      'analytics',
-      '30',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should accept time 30 arg in v1',
+    ['analytics', '30', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should accept time 30 arg',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    },
+  )
+
+  cmdit(
+    ['analytics', '90', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should accept time 90 arg',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -334,26 +261,32 @@ describe('socket analytics', async () => {
   cmdit(
     [
       'analytics',
-      '90',
+      'org',
+      '--time',
+      '7',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should accept time 90 arg in v1',
+    'should report legacy flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
+
+          - Legacy flags are no longer supported. See v1 migration guide. (\\x1b[31mreceived legacy flags\\x1b[39m)
+
+          - The time filter must either be 7, 30 or 90 (\\x1b[32mok\\x1b[39m)
+        \\x1b[22m"
       `)
 
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
     },
   )
 
@@ -364,20 +297,18 @@ describe('socket analytics', async () => {
       '7',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should accept org and time arg in v1',
+    'should accept org and time arg',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -392,20 +323,18 @@ describe('socket analytics', async () => {
       '30',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should accept repo and time arg in v1',
+    'should accept repo and time arg',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/audit-log/cmd-audit-log.mts b/src/commands/audit-log/cmd-audit-log.mts
index d6450e484..5ba35a835 100644
--- a/src/commands/audit-log/cmd-audit-log.mts
+++ b/src/commands/audit-log/cmd-audit-log.mts
@@ -4,7 +4,6 @@ import { handleAuditLog } from './handle-audit-log.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -33,28 +32,19 @@ const config: CliCommandConfig = {
       description:
         'Force override the organization slug, overrides the default org from config',
     },
-    type: {
-      type: 'string',
-      shortFlag: 't',
-      default: '',
-      description: 'Type of log event',
+    page: {
+      type: 'number',
+      description: 'Result page to fetch',
     },
     perPage: {
       type: 'number',
-      shortFlag: 'pp',
       default: 30,
       description: 'Results per page - default is 30',
     },
-    page: {
-      type: 'number',
-      shortFlag: 'p',
-      default: 1,
-      description: 'Page number - default is 1',
-    },
   },
   help: (command, config) => `
     Usage
-      $ ${command} ${isTestingV1() ? '<repo>' : '<org slug>'}
+      $ ${command} [options] [FILTER]
 
     API Token Requirements
       - Quota: 1 unit
@@ -63,11 +53,24 @@ const config: CliCommandConfig = {
     This feature requires an Enterprise Plan. To learn more about getting access
     to this feature and many more, please visit ${SOCKET_WEBSITE_URL}/pricing
 
+    The type FILTER arg is an enum. Defaults to any. It should be one of these:
+      associateLabel, cancelInvitation, changeMemberRole, changePlanSubscriptionSeats,
+      createApiToken, createLabel, deleteLabel, deleteLabelSetting, deleteReport,
+      deleteRepository, disassociateLabel, joinOrganization, removeMember,
+      resetInvitationLink, resetOrganizationSettingToDefault, rotateApiToken,
+      sendInvitation, setLabelSettingToDefault, syncOrganization, transferOwnership,
+      updateAlertTriage, updateApiTokenCommitter, updateApiTokenMaxQuota,
+      updateApiTokenName', updateApiTokenScopes, updateApiTokenVisibility,
+      updateLabelSetting, updateOrganizationSetting, upgradeOrganizationPlan
+
+    The page arg should be a positive integer, offset 1. Defaults to 1.
+
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} ${isTestingV1() ? '' : 'FakeOrg'}
+      $ ${command}
+      $ ${command} deleteReport --page 2 --perPage 10
   `,
 }
 
@@ -97,28 +100,34 @@ async function run(
     org: orgFlag,
     page,
     perPage,
-    type,
   } = cli.flags
   const outputKind = getOutputKind(json, markdown)
-  const logType = String(type || '')
+  let [typeFilter = ''] = cli.input
+  typeFilter = String(typeFilter)
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
   const hasApiToken = hasDefaultToken()
 
+  const noLegacy = !cli.flags['type']
+
   const wasValidInput = checkCommandInput(
     outputKind,
+    {
+      nook: true,
+      test: noLegacy,
+      message: 'Legacy flags are no longer supported. See v1 migration guide.',
+      pass: 'ok',
+      fail: `received legacy flags`,
+    },
     {
       nook: true,
       test: !!orgSlug,
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail: 'missing',
     },
@@ -138,6 +147,13 @@ async function run(
       pass: 'ok',
       fail: 'bad',
     },
+    {
+      nook: true,
+      test: /^[a-zA-Z]*$/.test(typeFilter),
+      message: 'The filter must be an a-zA-Z string, it is an enum',
+      pass: 'ok',
+      fail: 'it was given but not a-zA-Z',
+    },
   )
   if (!wasValidInput) {
     return
@@ -153,6 +169,6 @@ async function run(
     outputKind,
     page: Number(page || 0),
     perPage: Number(perPage || 0),
-    logType: logType.charAt(0).toUpperCase() + logType.slice(1),
+    logType: typeFilter.charAt(0).toUpperCase() + typeFilter.slice(1),
   })
 }
diff --git a/src/commands/audit-log/cmd-audit-log.test.mts b/src/commands/audit-log/cmd-audit-log.test.mts
index c6bdf874e..a5442bffc 100644
--- a/src/commands/audit-log/cmd-audit-log.test.mts
+++ b/src/commands/audit-log/cmd-audit-log.test.mts
@@ -1,12 +1,8 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
 import { cmdit, invokeNpm } from '../../../test/utils.mts'
 
-const { SOCKET_WEBSITE_URL } = constants
-
 describe('socket audit-log', async () => {
   // Lazily access constants.binCliPath.
   const { binCliPath } = constants
@@ -21,7 +17,7 @@ describe('socket audit-log', async () => {
         "Look up the audit log for an organization
 
           Usage
-            $ socket audit-log <org slug>
+            $ socket audit-log [options] [FILTER]
 
           API Token Requirements
             - Quota: 1 unit
@@ -30,17 +26,29 @@ describe('socket audit-log', async () => {
           This feature requires an Enterprise Plan. To learn more about getting access
           to this feature and many more, please visit https://socket.dev/pricing
 
+          The type FILTER arg is an enum. Defaults to any. It should be one of these:
+            associateLabel, cancelInvitation, changeMemberRole, changePlanSubscriptionSeats,
+            createApiToken, createLabel, deleteLabel, deleteLabelSetting, deleteReport,
+            deleteRepository, disassociateLabel, joinOrganization, removeMember,
+            resetInvitationLink, resetOrganizationSettingToDefault, rotateApiToken,
+            sendInvitation, setLabelSettingToDefault, syncOrganization, transferOwnership,
+            updateAlertTriage, updateApiTokenCommitter, updateApiTokenMaxQuota,
+            updateApiTokenName', updateApiTokenScopes, updateApiTokenVisibility,
+            updateLabelSetting, updateOrganizationSetting, upgradeOrganizationPlan
+
+          The page arg should be a positive integer, offset 1. Defaults to 1.
+
           Options
             --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
             --org             Force override the organization slug, overrides the default org from config
-            --page            Page number - default is 1
+            --page            Result page to fetch
             --perPage         Results per page - default is 30
-            --type            Type of log event
 
           Examples
-            $ socket audit-log FakeOrg"
+            $ socket audit-log
+            $ socket audit-log deleteReport --page 2 --perPage 10"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -59,8 +67,8 @@ describe('socket audit-log', async () => {
   )
 
   cmdit(
-    ['audit-log', '--dry-run', '--config', '{}'],
-    'should require args with just dry-run',
+    ['audit-log', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should report missing org name',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
@@ -70,12 +78,12 @@ describe('socket audit-log', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
-
-          - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
         \\x1b[22m"
       `)
 
@@ -86,52 +94,25 @@ describe('socket audit-log', async () => {
   cmdit(
     [
       'audit-log',
-      'fakeorg',
+      '--type',
+      'xyz',
       '--dry-run',
       '--config',
-      '{"apiToken":"anything"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
-    },
-  )
-
-  cmdit(
-    [
-      'audit-log',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should report missing org name in v1',
+    'should report legacy flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
-        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
-        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
+          - Legacy flags are no longer supported. See v1 migration guide. (\\x1b[31mreceived legacy flags\\x1b[39m)
         \\x1b[22m"
       `)
 
@@ -144,20 +125,18 @@ describe('socket audit-log', async () => {
       'audit-log',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should accept default org in v1',
+    'should accept default org',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -171,7 +150,7 @@ describe('socket audit-log', async () => {
       'forcedorg',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
     'should accept --org flag in v1',
     async cmd => {
@@ -180,11 +159,9 @@ describe('socket audit-log', async () => {
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/audit-log/output-audit-log.mts b/src/commands/audit-log/output-audit-log.mts
index 99de0a6ea..6e6497d09 100644
--- a/src/commands/audit-log/output-audit-log.mts
+++ b/src/commands/audit-log/output-audit-log.mts
@@ -1,18 +1,24 @@
-import { debugFn, isDebug } from '@socketsecurity/registry/lib/debug'
+import { createRequire } from 'node:module'
+
+import { debugFn } from '@socketsecurity/registry/lib/debug'
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 import constants from '../../constants.mts'
 import { failMsgWithBadge } from '../../utils/fail-msg-with-badge.mts'
 import { mdTable } from '../../utils/markdown.mts'
+import { msAtHome } from '../../utils/ms-at-home.mts'
 import { serializeResultJson } from '../../utils/serialize-result-json.mts'
 
 import type { CResult, OutputKind } from '../../types.mts'
 import type { SocketSdkReturnType } from '@socketsecurity/sdk'
+import type { Widgets } from 'blessed'
+
+const require = createRequire(import.meta.url)
 
 const { REDACTED } = constants
 
 export async function outputAuditLog(
-  auditLogs: CResult<SocketSdkReturnType<'getAuditLogEvents'>['data']>,
+  result: CResult<SocketSdkReturnType<'getAuditLogEvents'>['data']>,
   {
     logType,
     orgSlug,
@@ -27,31 +33,59 @@ export async function outputAuditLog(
     logType: string
   },
 ): Promise<void> {
-  if (!auditLogs.ok) {
-    process.exitCode = auditLogs.code ?? 1
+  if (!result.ok) {
+    process.exitCode = result.code ?? 1
   }
 
   if (outputKind === 'json') {
     logger.log(
-      await outputAsJson(auditLogs, {
+      await outputAsJson(result, {
         logType,
         orgSlug,
         page,
         perPage,
       }),
     )
-  } else if (outputKind !== 'markdown' && !auditLogs.ok) {
-    logger.fail(failMsgWithBadge(auditLogs.message, auditLogs.cause))
-  } else {
+  }
+
+  if (!result.ok) {
+    logger.fail(failMsgWithBadge(result.message, result.cause))
+    return
+  }
+
+  if (outputKind === 'markdown') {
     logger.log(
-      await outputAsMarkdown(auditLogs, {
+      await outputAsMarkdown(result.data, {
         logType,
         orgSlug,
         page,
         perPage,
       }),
     )
+    return
   }
+
+  await outputWithBlessed(result.data, orgSlug)
+}
+
+function formatResult(
+  selectedRow?: SocketSdkReturnType<'getAuditLogEvents'>['data']['results'][number],
+  keepQuotes = false,
+): string {
+  if (!selectedRow) {
+    return '(none)'
+  }
+  // Format the object with spacing but keep the payload compact because
+  // that can contain just about anything and spread many lines.
+  const obj = { ...selectedRow, payload: 'REPLACEME' }
+  const json = JSON.stringify(obj, null, 2).replace(
+    /"payload": "REPLACEME"/,
+    `"payload": ${JSON.stringify(selectedRow.payload ?? {})}`,
+  )
+  if (keepQuotes) {
+    return json
+  }
+  return json.replace(/^\s*"([^"]+)?"/gm, '  $1')
 }
 
 export async function outputAsJson(
@@ -107,7 +141,7 @@ export async function outputAsJson(
 }
 
 export async function outputAsMarkdown(
-  auditLogs: CResult<SocketSdkReturnType<'getAuditLogEvents'>['data']>,
+  auditLogs: SocketSdkReturnType<'getAuditLogEvents'>['data'],
   {
     logType,
     orgSlug,
@@ -120,35 +154,8 @@ export async function outputAsMarkdown(
     logType: string
   },
 ): Promise<string> {
-  if (!auditLogs.ok) {
-    return `
-# Socket Audit Logs
-
-There was a problem fetching the audit logs:
-
-> ${auditLogs.message}
-${
-  auditLogs.cause
-    ? '>\n' +
-      (
-        auditLogs.cause
-          .split('\n')
-          .map(s => `> ${s}\n`)
-          .join('') ?? ''
-      )
-    : ''
-}
-Parameters:
-
-- org: ${orgSlug}
-- type filter: ${logType || '(none)'}
-- page: ${page}
-- per page: ${perPage}
-`
-  }
-
   try {
-    const table = mdTable<any>(auditLogs.data.results, [
+    const table = mdTable<any>(auditLogs.results, [
       'event_id',
       'created_at',
       'type',
@@ -164,7 +171,7 @@ These are the Socket.dev audit logs as per requested query.
 - org: ${orgSlug}
 - type filter: ${logType || '(none)'}
 - page: ${page}
-- next page: ${auditLogs.data.nextPage}
+- next page: ${auditLogs.nextPage}
 - per page: ${perPage}
 - generated: ${constants.ENV.VITEST ? REDACTED : new Date().toISOString()}
 
@@ -175,9 +182,134 @@ ${table}
     logger.fail(
       'There was a problem converting the logs to Markdown, please try the `--json` flag',
     )
-    if (isDebug()) {
-      debugFn('catch: unexpected\n', e)
-    }
-    return ''
+    debugFn('catch: unexpected\n', e)
+    return 'Failed to generate the markdown report'
   }
 }
+
+async function outputWithBlessed(
+  data: SocketSdkReturnType<'getAuditLogEvents'>['data'],
+  orgSlug: string,
+) {
+  const filteredLogs = data.results
+  const formattedOutput = filteredLogs.map(logs => [
+    logs.event_id ?? '',
+    msAtHome(logs.created_at ?? ''),
+    logs.type ?? '',
+    logs.user_email ?? '',
+    logs.ip_address ?? '',
+    logs.user_agent ?? '',
+  ])
+  const headers = [
+    ' Event id',
+    ' Created at',
+    ' Event type',
+    ' User email',
+    ' IP address',
+    ' User agent',
+  ]
+
+  // Note: this temporarily takes over the terminal (just like `man` does).
+  const ScreenWidget = require('blessed/lib/widgets/screen.js')
+  // Lazily access constants.blessedOptions.
+  const screen: Widgets.Screen = new ScreenWidget({
+    ...constants.blessedOptions,
+  })
+  // Register these keys first so you can always exit, even when it gets stuck
+  // If we don't do this and the code crashes, the user must hard-kill the
+  // 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.js')
+  const tipsBoxHeight = 1 // 1 row for tips box
+  const detailsBoxHeight = 20 // bottom N rows for details box. 20 gives 4 lines for condensed payload before it scrolls out of view
+
+  const maxWidths = headers.map(s => s.length + 1)
+  formattedOutput.forEach(row => {
+    row.forEach((str, i) => {
+      maxWidths[i] = Math.max(str.length, maxWidths[i] ?? str.length)
+    })
+  })
+
+  const table: any = new TableWidget({
+    keys: 'true',
+    fg: 'white',
+    selectedFg: 'white',
+    selectedBg: 'magenta',
+    interactive: 'true',
+    label: `Audit Logs for ${orgSlug}`,
+    width: '100%',
+    top: 0,
+    bottom: detailsBoxHeight + tipsBoxHeight,
+    border: {
+      type: 'line',
+      fg: 'cyan',
+    },
+    columnWidth: maxWidths, //[10, 30, 40, 25, 15, 200],
+    // Note: spacing works as long as you don't reserve more than total width
+    columnSpacing: 4,
+    truncate: '_',
+  })
+
+  const BoxWidget = require('blessed/lib/widgets/box.js')
+  const tipsBox: Widgets.BoxElement = new BoxWidget({
+    bottom: detailsBoxHeight, // sits just above the details box
+    height: tipsBoxHeight,
+    width: '100%',
+    style: {
+      fg: 'yellow',
+      bg: 'black',
+    },
+    tags: true,
+    content: `↑/↓: Move    Enter: Select    q/ESC: Quit`,
+  })
+  const detailsBox: Widgets.BoxElement = new BoxWidget({
+    bottom: 0,
+    height: detailsBoxHeight,
+    width: '100%',
+    border: {
+      type: 'line',
+      fg: 'cyan',
+    },
+    label: 'Details',
+    content: formatResult(filteredLogs[0], true),
+    style: {
+      fg: 'white',
+    },
+  })
+
+  table.setData({
+    headers: headers,
+    data: formattedOutput,
+  })
+
+  // allow control the table with the keyboard
+  table.focus()
+
+  // Stacking order: table (top), tipsBox (middle), detailsBox (bottom)
+  screen.append(table)
+  screen.append(tipsBox)
+  screen.append(detailsBox)
+
+  // Update details box when selection changes
+  table.rows.on('select item', () => {
+    const selectedIndex = table.rows.selected
+    if (selectedIndex !== undefined && selectedIndex >= 0) {
+      const selectedRow = filteredLogs[selectedIndex]
+      detailsBox.setContent(formatResult(selectedRow))
+      screen.render()
+    }
+  })
+
+  screen.render()
+
+  screen.key(['return'], () => {
+    const selectedIndex = table.rows.selected
+    screen.destroy()
+    const selectedRow = formattedOutput[selectedIndex]
+      ? formatResult(filteredLogs[selectedIndex], true)
+      : '(none)'
+    logger.log(`Last selection:\n${selectedRow.trim()}`)
+  })
+}
diff --git a/src/commands/audit-log/output-audit-log.test.mts b/src/commands/audit-log/output-audit-log.test.mts
index 95f861d23..dcdd4ff91 100644
--- a/src/commands/audit-log/output-audit-log.test.mts
+++ b/src/commands/audit-log/output-audit-log.test.mts
@@ -110,15 +110,12 @@ describe('output-audit-log', () => {
 
   describe('markdown', () => {
     it('should return markdown report', async () => {
-      const r = await outputAsMarkdown(
-        { ok: true, data: JSON.parse(JSON.stringify(FIXTURE)) },
-        {
-          logType: '',
-          orgSlug: 'noorgslug',
-          page: 1,
-          perPage: 10,
-        },
-      )
+      const r = await outputAsMarkdown(JSON.parse(JSON.stringify(FIXTURE)), {
+        logType: '',
+        orgSlug: 'noorgslug',
+        page: 1,
+        perPage: 10,
+      })
       expect(r).toMatchInlineSnapshot(`
         "
         # Socket Audit Logs
@@ -148,7 +145,7 @@ describe('output-audit-log', () => {
 
     it('should return error report on error', async () => {
       const r = await outputAsMarkdown(
-        { ok: false, message: '(test) failed to get report', data: undefined },
+        {}, // this will fail
         {
           logType: '',
           orgSlug: 'noorgslug',
@@ -156,22 +153,9 @@ describe('output-audit-log', () => {
           perPage: 10,
         },
       )
-      expect(r).toMatchInlineSnapshot(`
-        "
-        # Socket Audit Logs
-
-        There was a problem fetching the audit logs:
-
-        > (test) failed to get report
-
-        Parameters:
-
-        - org: noorgslug
-        - type filter: (none)
-        - page: 1
-        - per page: 10
-        "
-      `)
+      expect(r).toMatchInlineSnapshot(
+        `"Failed to generate the markdown report"`,
+      )
     })
   })
 })
diff --git a/src/commands/cdxgen/cmd-cdxgen.mts b/src/commands/cdxgen/cmd-cdxgen.mts
deleted file mode 100644
index c1ec927a7..000000000
--- a/src/commands/cdxgen/cmd-cdxgen.mts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { logger } from '@socketsecurity/registry/lib/logger'
-
-import { handleCdxgen } from './handle-cdxgen.mts'
-import { commonFlags } from '../../flags.mts'
-
-import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
-
-const config: CliCommandConfig = {
-  commandName: 'cdxgen',
-  description: 'Create an SBOM with CycloneDX generator (cdxgen)',
-  hidden: true,
-  flags: {
-    ...commonFlags,
-  },
-  help: (parentName, _config) => `
-    Usage
-      $ ${parentName}
-  `,
-}
-
-export const cmdCdxgen = {
-  description: config.description,
-  hidden: config.hidden,
-  run,
-}
-
-async function run(
-  argv: string[] | readonly string[],
-  importMeta: ImportMeta,
-  { parentName }: { parentName: string },
-): Promise<void> {
-  logger.warn(
-    'Warning: The `socket cdxgen` command moved to `socket manifest cdxgen` and will be removed as a toplevel command in the next major bump.',
-  )
-
-  await handleCdxgen(argv, importMeta, { parentName })
-}
diff --git a/src/commands/cdxgen/cmd-cdxgen.test.mts b/src/commands/cdxgen/cmd-cdxgen.test.mts
deleted file mode 100644
index 3004b5e1a..000000000
--- a/src/commands/cdxgen/cmd-cdxgen.test.mts
+++ /dev/null
@@ -1,88 +0,0 @@
-import path from 'node:path'
-
-import { describe, expect } from 'vitest'
-
-import constants from '../../../src/constants.mts'
-import { cmdit, invokeNpm } from '../../../test/utils.mts'
-
-describe('socket cdxgen', async () => {
-  // Lazily access constants.binCliPath.
-  const { binCliPath } = constants
-
-  cmdit(['cdxgen', '--help'], 'should support --help', async cmd => {
-    const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd, {
-      // Need to pass it on as env because --config will break cdxgen
-      SOCKET_CLI_CONFIG: '{}',
-    })
-    expect(stdout).toMatchInlineSnapshot(
-      `
-        "cdxgen [command]
-
-        Commands:
-          cdxgen completion  Generate bash/zsh completion
-
-        Options:
-          -o, --output                 Output file. Default bom.json  [default: "bom.json"]
-          -t, --type                   Project type. Please refer to https://cyclonedx.github.io/cdxgen/#/PROJECT_TYPES for supported languages/platforms.  [array]
-              --exclude-type           Project types to exclude. Please refer to https://cyclonedx.github.io/cdxgen/#/PROJECT_TYPES for supported languages/platforms.
-          -r, --recurse                Recurse mode suitable for mono-repos. Defaults to true. Pass --no-recurse to disable.  [boolean] [default: true]
-          -p, --print                  Print the SBOM as a table with tree.  [boolean]
-          -c, --resolve-class          Resolve class names for packages. jars only for now.  [boolean]
-              --deep                   Perform deep searches for components. Useful while scanning C/C++ apps, live OS and oci images.  [boolean]
-              --server-url             Dependency track url. Eg: https://deptrack.cyclonedx.io
-              --skip-dt-tls-check      Skip TLS certificate check when calling Dependency-Track.  [boolean] [default: false]
-              --api-key                Dependency track api key
-              --project-group          Dependency track project group
-              --project-name           Dependency track project name. Default use the directory name
-              --project-version        Dependency track project version  [string] [default: ""]
-              --project-id             Dependency track project id. Either provide the id or the project name and version together  [string]
-              --parent-project-id      Dependency track parent project id  [string]
-              --required-only          Include only the packages with required scope on the SBOM. Would set compositions.aggregate to incomplete unless --no-auto-compositions is passed.  [boolean]
-              --fail-on-error          Fail if any dependency extractor fails.  [boolean]
-              --no-babel               Do not use babel to perform usage analysis for JavaScript/TypeScript projects.  [boolean]
-              --generate-key-and-sign  Generate an RSA public/private key pair and then sign the generated SBOM using JSON Web Signatures.  [boolean]
-              --server                 Run cdxgen as a server  [boolean]
-              --server-host            Listen address  [default: "127.0.0.1"]
-              --server-port            Listen port  [default: "9090"]
-              --install-deps           Install dependencies automatically for some projects. Defaults to true but disabled for containers and oci scans. Use --no-install-deps to disable this feature.  [boolean] [default: true]
-              --validate               Validate the generated SBOM using json schema. Defaults to true. Pass --no-validate to disable.  [boolean] [default: true]
-              --evidence               Generate SBOM with evidence for supported languages.  [boolean] [default: false]
-              --spec-version           CycloneDX Specification version to use. Defaults to 1.6  [number] [choices: 1.4, 1.5, 1.6] [default: 1.6]
-              --filter                 Filter components containing this word in purl or component.properties.value. Multiple values allowed.  [array]
-              --only                   Include components only containing this word in purl. Useful to generate BOM with first party components alone. Multiple values allowed.  [array]
-              --author                 The person(s) who created the BOM. Set this value if you're intending the modify the BOM and claim authorship.  [array] [default: "OWASP Foundation"]
-              --profile                BOM profile to use for generation. Default generic.  [choices: "appsec", "research", "operational", "threat-modeling", "license-compliance", "generic", "machine-learning", "ml", "deep-learning", "ml-deep", "ml-tiny"] [default: "generic"]
-              --exclude                Additional glob pattern(s) to ignore  [array]
-              --include-formulation    Generate formulation section with git metadata and build tools. Defaults to false.  [boolean] [default: false]
-              --include-crypto         Include crypto libraries as components.  [boolean] [default: false]
-              --standard               The list of standards which may consist of regulations, industry or organizational-specific standards, maturity models, best practices, or any other requirements which can be evaluated against or attested to.  [array] [choices: "asvs-5.0", "asvs-4.0.3", "bsimm-v13", "masvs-2.0.0", "nist_ssdf-1.1", "pcissc-secure-slc-1.1", "scvs-1.0.0", "ssaf-DRAFT-2023-11"]
-              --json-pretty            Pretty-print the generated BOM json.  [boolean] [default: false]
-              --min-confidence         Minimum confidence needed for the identity of a component from 0 - 1, where 1 is 100% confidence.  [number] [default: 0]
-              --technique              Analysis technique to use  [array] [choices: "auto", "source-code-analysis", "binary-analysis", "manifest-analysis", "hash-comparison", "instrumentation", "filename"]
-              --auto-compositions      Automatically set compositions when the BOM was filtered. Defaults to true  [boolean] [default: true]
-          -h, --help                   Show help  [boolean]
-          -v, --version                Show version number  [boolean]
-
-        Examples:
-          cdxgen -t java .                       Generate a Java SBOM for the current directory
-          cdxgen -t java -t js .                 Generate a SBOM for Java and JavaScript in the current directory
-          cdxgen -t java --profile ml .          Generate a Java SBOM for machine learning purposes.
-          cdxgen -t python --profile research .  Generate a Python SBOM for appsec research.
-          cdxgen --server                        Run cdxgen as a server
-
-        for documentation, visit https://cyclonedx.github.io/cdxgen"
-      `,
-    )
-    expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-      "
-         \\x1b[33m\\u203c\\x1b[39m Warning: The \`socket cdxgen\` command moved to \`socket manifest cdxgen\` and will be removed as a toplevel command in the next major bump.
-         _____         _       _        /---------------
-        |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-        |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-        |_____|___|___|_,_|___|_|.dev   | Command: \`socket cdxgen\`, cwd: <redacted>"
-    `)
-
-    expect(code, 'explicit help should exit with code 0').toBe(0)
-    expect(stderr, 'banner includes base command').toContain('`socket cdxgen`')
-  })
-})
diff --git a/src/commands/cdxgen/handle-cdxgen.mts b/src/commands/cdxgen/handle-cdxgen.mts
deleted file mode 100644
index b46186ff3..000000000
--- a/src/commands/cdxgen/handle-cdxgen.mts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { cmdManifestCdxgen } from '../manifest/cmd-manifest-cdxgen.mts'
-
-export async function handleCdxgen(
-  argv: string[] | readonly string[],
-  importMeta: ImportMeta,
-  { parentName }: { parentName: string },
-): Promise<void> {
-  await cmdManifestCdxgen.run(argv, importMeta, { parentName })
-}
diff --git a/src/commands/ci/cmd-ci.mts b/src/commands/ci/cmd-ci.mts
index d2b20e6e9..e3799838d 100644
--- a/src/commands/ci/cmd-ci.mts
+++ b/src/commands/ci/cmd-ci.mts
@@ -24,9 +24,9 @@ const config: CliCommandConfig = {
         'Auto generate manifest files where detected? See autoManifest flag in `socket scan create`',
     },
   },
-  help: (parentName, _config) => `
+  help: (command, _config) => `
     Usage
-      $ ${parentName}
+      $ ${command} [options]
 
     Options
       ${getFlagListOutput(config.flags, 6)}
@@ -41,6 +41,10 @@ const config: CliCommandConfig = {
     but is not enabled by default since the CI is less likely to be set up with
     all the necessary dev tooling. Enable it if you want the scan to include
     locally generated manifests like for gradle and sbt.
+
+    Examples
+      $ ${command}
+      $ ${command} --autoManifest
   `,
 }
 
diff --git a/src/commands/ci/cmd-ci.test.mts b/src/commands/ci/cmd-ci.test.mts
index 67b6c095c..70ac5da75 100644
--- a/src/commands/ci/cmd-ci.test.mts
+++ b/src/commands/ci/cmd-ci.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket ci', async () => {
         "Create a new scan and report whether it passes your security policy
 
           Usage
-            $ socket ci
+            $ socket ci [options]
 
           Options
             --autoManifest    Auto generate manifest files where detected? See autoManifest flag in \`socket scan create\`
@@ -33,7 +31,11 @@ describe('socket ci', async () => {
           The --autoManifest flag does the same as the one from \`socket scan create\`
           but is not enabled by default since the CI is less likely to be set up with
           all the necessary dev tooling. Enable it if you want the scan to include
-          locally generated manifests like for gradle and sbt."
+          locally generated manifests like for gradle and sbt.
+
+          Examples
+            $ socket ci
+            $ socket ci --autoManifest"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/cli.test.mts b/src/commands/cli.test.mts
index dc7fae096..507f9153a 100755
--- a/src/commands/cli.test.mts
+++ b/src/commands/cli.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import { cmdit, invokeNpm } from '../../test/utils.mts'
@@ -18,32 +16,51 @@ describe('socket root command', async () => {
         Usage
           $ socket <command>
 
-        Commands
-          analytics         Look up analytics data
-          audit-log         Look up the audit log for an organization
-          dependencies      Search for any dependency that is being used in your organization
-          fix               Update dependencies with "fixable" Socket alerts
-          login             Socket API login
-          logout            Socket API logout
-          manifest          Generate a dependency manifest for given file or dir
-          npm               npm wrapper functionality
-          npx               npx wrapper functionality
-          optimize          Optimize dependencies with @socketregistry overrides
-          organization      Account details
-          package           Commands relating to looking up published packages
-          raw-npm           Temporarily disable the Socket npm wrapper
-          raw-npx           Temporarily disable the Socket npx wrapper
-          repos             Repositories related commands
-          scan              Scan related commands
-          threat-feed       [beta] View the threat feed
-          wrapper           Enable or disable the Socket npm/npx wrapper
+
+          All commands have their own --help page
+
+        Main commands
+
+          socket login              Setup the CLI with an API Token and defaults
+          socket scan create        Create a new Scan and report
+          socket npm/eslint@1.0.0   Request the security score of a particular package
+          socket ci                 Shorthand for CI; socket scan create --report --no-interactive
+
+        Socket API
+
+          analytics                 Look up analytics data
+          audit-log                 Look up the audit log for an organization
+          organization              Manage organization account details
+          package                   Look up published package details
+          repository                Manage registered repositories
+          scan                      Manage Socket scans
+          threat-feed               [beta] View the threat feed
+
+        Local tools
+
+          fix                       Update dependencies with "fixable" Socket alerts
+          manifest                  Generate a dependency manifest for certain languages
+          npm                       npm wrapper functionality
+          npx                       npx wrapper functionality
+          optimize                  Optimize dependencies with @socketregistry overrides
+          raw-npm                   Temporarily disable the Socket npm wrapper
+          raw-npx                   Temporarily disable the Socket npx wrapper
+
+        CLI configuration
+
+          config                    Manage the CLI configuration directly
+          install                   Manually install CLI tab completion on your system
+          login                     Socket API login and CLI setup
+          logout                    Socket API logout
+          uninstall                 Remove the CLI tab completion from your system
+          wrapper                   Enable or disable the Socket npm/npx wrapper
 
         Options       (Note: all CLI commands have these flags even when not displayed in their help)
 
-          --config          Allows you to temp overrides the internal CLI config
-          --dryRun          Do input validation for a sub-command and then exit
-          --help            Give you detailed help information about any sub-command
-          --version         Show version of CLI
+          --config                 Allows you to temp overrides the internal CLI config
+          --dryRun                 Do input validation for a sub-command and then exit
+          --help                   Give you detailed help information about any sub-command
+          --version                Show version of CLI
 
         Examples
           $ socket --help
@@ -63,86 +80,6 @@ describe('socket root command', async () => {
     expect(stderr, 'banner includes base command').toContain('`socket`')
   })
 
-  cmdit(
-    ['--help', '--config', '{"isTestingV1": true}'],
-    'should support v1 --help',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `
-        "CLI for Socket.dev
-
-          Usage
-            $ socket <command>
-
-
-            All commands have their own --help page
-
-          Main commands
-
-            socket login              Setup the CLI with an API Token and defaults
-            socket scan create        Create a new Scan and report
-            socket npm/eslint@1.0.0   Request the security score of a particular package
-            socket ci                 Shorthand for CI; socket scan create --report --no-interactive
-
-          Socket API
-
-            analytics                 Look up analytics data
-            audit-log                 Look up the audit log for an organization
-            organization              Manage organization account details
-            package                   Look up published package details
-            repository                Manage registered repositories
-            scan                      Manage Socket scans
-            threat-feed               [beta] View the threat feed
-
-          Local tools
-
-            fix                       Update dependencies with "fixable" Socket alerts
-            manifest                  Generate a dependency manifest for certain languages
-            npm                       npm wrapper functionality
-            npx                       npx wrapper functionality
-            optimize                  Optimize dependencies with @socketregistry overrides
-            raw-npm                   Temporarily disable the Socket npm wrapper
-            raw-npx                   Temporarily disable the Socket npx wrapper
-
-          CLI configuration
-
-            config                    Manage the CLI configuration directly
-            install                   Manually install CLI tab completion on your system
-            login                     Socket API login and CLI setup
-            logout                    Socket API logout
-            uninstall                 Remove the CLI tab completion from your system
-            wrapper                   Enable or disable the Socket npm/npx wrapper
-
-          Options       (Note: all CLI commands have these flags even when not displayed in their help)
-
-            --config                 Allows you to temp overrides the internal CLI config
-            --dryRun                 Do input validation for a sub-command and then exit
-            --help                   Give you detailed help information about any sub-command
-            --version                Show version of CLI
-
-          Examples
-            $ socket --help
-            $ socket scan create --json
-            $ socket package score npm left-pad --markdown"
-      `,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           \\x1b[31m\\xd7\\x1b[39m Found commands in the list that were not marked as public or not defined at all: 'config', 'install', and 'uninstall'
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
-      `)
-
-      expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain('`socket`')
-    },
-  )
-
   cmdit(
     ['mootools', '--dry-run', '--config', '{"apiToken":"anything"}'],
     'should require args with just dry-run',
diff --git a/src/commands/config/cmd-config-auto.mts b/src/commands/config/cmd-config-auto.mts
index 746fa55fa..7693ebe19 100644
--- a/src/commands/config/cmd-config-auto.mts
+++ b/src/commands/config/cmd-config-auto.mts
@@ -24,12 +24,18 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command} [options] KEY
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
-    Attempt to automatically discover the correct value for a certain config key.
+    Attempt to automatically discover the correct value for given config KEY.
+
+    Keys:
+
+${Array.from(supportedConfigKeys.entries())
+  .map(([key, desc]) => `     - ${key} -- ${desc}`)
+  .join('\n')}
 
     For certain keys it will request the value from server, for others it will
     reset the value to the default. For some keys this has no effect.
@@ -41,7 +47,7 @@ ${Array.from(supportedConfigKeys.entries())
   .join('\n')}
 
     Examples
-      $ ${command} auto defaultOrg
+      $ ${command} defaultOrg
   `,
 }
 
diff --git a/src/commands/config/cmd-config-auto.test.mts b/src/commands/config/cmd-config-auto.test.mts
new file mode 100644
index 000000000..41109aa18
--- /dev/null
+++ b/src/commands/config/cmd-config-auto.test.mts
@@ -0,0 +1,92 @@
+import { describe, expect } from 'vitest'
+
+import constants from '../../../src/constants.mts'
+import { cmdit, invokeNpm } from '../../../test/utils.mts'
+
+describe('socket config auto', async () => {
+  // Lazily access constants.binCliPath.
+  const { binCliPath } = constants
+
+  cmdit(
+    ['config', 'auto', '--help', '--config', '{}'],
+    'should support --help',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(
+        `
+        "Automatically discover and set the correct value config item
+
+          Usage
+            $ socket config auto [options] KEY
+
+          Options
+            --json            Output result as json
+            --markdown        Output result as markdown
+
+          Attempt to automatically discover the correct value for given config KEY.
+
+          Keys:
+
+           - apiBaseUrl -- Base URL of the API endpoint
+           - apiProxy -- A proxy through which to access the API
+           - apiToken -- The API token required to access most API endpoints
+           - defaultOrg -- The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.
+           - enforcedOrgs -- Orgs in this list have their security policies enforced on this machine
+           - org -- Alias for defaultOrg
+
+          For certain keys it will request the value from server, for others it will
+          reset the value to the default. For some keys this has no effect.
+
+          Keys:
+
+           - apiBaseUrl -- Base URL of the API endpoint
+           - apiProxy -- A proxy through which to access the API
+           - apiToken -- The API token required to access most API endpoints
+           - defaultOrg -- The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.
+           - enforcedOrgs -- Orgs in this list have their security policies enforced on this machine
+           - org -- Alias for defaultOrg
+
+          Examples
+            $ socket config auto defaultOrg"
+      `,
+      )
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket config auto\`, cwd: <redacted>"
+      `)
+
+      expect(code, 'explicit help should exit with code 0').toBe(0)
+      expect(stderr, 'banner includes base command').toContain(
+        '`socket config auto`',
+      )
+    },
+  )
+
+  cmdit(
+    [
+      'config',
+      'auto',
+      'defaultOrg',
+      '--dry-run',
+      '--config',
+      '{"apiToken":"anything"}',
+    ],
+    'should require args with just dry-run',
+    async cmd => {
+      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
+      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
+      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket config auto\`, cwd: <redacted>"
+      `)
+
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
+    },
+  )
+})
diff --git a/src/commands/config/cmd-config-get.mts b/src/commands/config/cmd-config-get.mts
index 76540a64a..8565d99bd 100644
--- a/src/commands/config/cmd-config-get.mts
+++ b/src/commands/config/cmd-config-get.mts
@@ -24,19 +24,22 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command} [options] KEY
+
+    Retrieve the value for given KEY at this time. If you have overridden the
+    config then the value will come from that override.
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
-    Keys:
+    KEY is an enum. Valid keys:
 
 ${Array.from(supportedConfigKeys.entries())
   .map(([key, desc]) => `     - ${key} -- ${desc}`)
   .join('\n')}
 
     Examples
-      $ ${command} FakeOrg --repoName=test-repo
+      $ ${command} defaultOrg
   `,
 }
 
diff --git a/src/commands/config/cmd-config-get.test.mts b/src/commands/config/cmd-config-get.test.mts
index ac272a28c..96cee960b 100644
--- a/src/commands/config/cmd-config-get.test.mts
+++ b/src/commands/config/cmd-config-get.test.mts
@@ -18,23 +18,26 @@ describe('socket config get', async () => {
         "Get the value of a local CLI config item
 
           Usage
-            $ socket config get <org slug>
+            $ socket config get [options] KEY
+
+          Retrieve the value for given KEY at this time. If you have overridden the
+          config then the value will come from that override.
 
           Options
             --json            Output result as json
             --markdown        Output result as markdown
 
-          Keys:
+          KEY is an enum. Valid keys:
 
            - apiBaseUrl -- Base URL of the API endpoint
            - apiProxy -- A proxy through which to access the API
            - apiToken -- The API token required to access most API endpoints
            - defaultOrg -- The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.
            - enforcedOrgs -- Orgs in this list have their security policies enforced on this machine
-           - isTestingV1 -- For development of testing the next major bump
+           - org -- Alias for defaultOrg
 
           Examples
-            $ socket config get FakeOrg --repoName=test-repo"
+            $ socket config get defaultOrg"
       `,
       )
       // Node 24 on Windows currently fails this test with added stderr:
@@ -70,7 +73,6 @@ describe('socket config get', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket config get\`, cwd: <redacted>
-
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Config key should be the first arg (\\x1b[31mmissing\\x1b[39m)
diff --git a/src/commands/config/cmd-config-list.mts b/src/commands/config/cmd-config-list.mts
index de6be4f70..bffd17d4f 100644
--- a/src/commands/config/cmd-config-list.mts
+++ b/src/commands/config/cmd-config-list.mts
@@ -4,7 +4,6 @@ import { outputConfigList } from './output-config-list.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { supportedConfigKeys } from '../../utils/config.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 import { getFlagListOutput } from '../../utils/output-formatting.mts'
@@ -28,19 +27,13 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command} [options]
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
-    Keys:
-
-${Array.from(supportedConfigKeys.entries())
-  .map(([key, desc]) => `     - ${key} -- ${desc}`)
-  .join('\n')}
-
     Examples
-      $ ${command} FakeOrg --repoName=test-repo
+      $ ${command}
   `,
 }
 
diff --git a/src/commands/config/cmd-config-list.test.mts b/src/commands/config/cmd-config-list.test.mts
index bc0ee6132..f61c32d5f 100644
--- a/src/commands/config/cmd-config-list.test.mts
+++ b/src/commands/config/cmd-config-list.test.mts
@@ -19,24 +19,15 @@ describe('socket config get', async () => {
         "Show all local CLI config items and their values
 
           Usage
-            $ socket config list <org slug>
+            $ socket config list [options]
 
           Options
             --full            Show full tokens in plaintext (unsafe)
             --json            Output result as json
             --markdown        Output result as markdown
 
-          Keys:
-
-           - apiBaseUrl -- Base URL of the API endpoint
-           - apiProxy -- A proxy through which to access the API
-           - apiToken -- The API token required to access most API endpoints
-           - defaultOrg -- The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.
-           - enforcedOrgs -- Orgs in this list have their security policies enforced on this machine
-           - isTestingV1 -- For development of testing the next major bump
-
           Examples
-            $ socket config list FakeOrg --repoName=test-repo"
+            $ socket config list"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/config/cmd-config-set.mts b/src/commands/config/cmd-config-set.mts
index f1d0f2b2f..10f253dca 100644
--- a/src/commands/config/cmd-config-set.mts
+++ b/src/commands/config/cmd-config-set.mts
@@ -24,7 +24,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <key> <value>
+      $ ${command} [options] <KEY> <VALUE>
 
     Options
       ${getFlagListOutput(config.flags, 6)}
@@ -32,7 +32,11 @@ const config: CliCommandConfig = {
     This is a crude way of updating the local configuration for this CLI tool.
 
     Note that updating a value here is nothing more than updating a key/value
-    store entry. No validation is happening. The server may reject your config.
+    store entry. No validation is happening. The server may reject your values
+    in some cases. Use at your own risk.
+
+    Note: use \`socket config unset\` to restore to defaults. Setting a key
+    to \`undefined\` will not allow default values to be set on it.
 
     Keys:
 
diff --git a/src/commands/config/cmd-config-set.test.mts b/src/commands/config/cmd-config-set.test.mts
index 26624cdb0..407a20a93 100644
--- a/src/commands/config/cmd-config-set.test.mts
+++ b/src/commands/config/cmd-config-set.test.mts
@@ -19,7 +19,7 @@ describe('socket config get', async () => {
         "Update the value of a local CLI config item
 
           Usage
-            $ socket config set <key> <value>
+            $ socket config set [options] <KEY> <VALUE>
 
           Options
             --json            Output result as json
@@ -28,7 +28,11 @@ describe('socket config get', async () => {
           This is a crude way of updating the local configuration for this CLI tool.
 
           Note that updating a value here is nothing more than updating a key/value
-          store entry. No validation is happening. The server may reject your config.
+          store entry. No validation is happening. The server may reject your values
+          in some cases. Use at your own risk.
+
+          Note: use \`socket config unset\` to restore to defaults. Setting a key
+          to \`undefined\` will not allow default values to be set on it.
 
           Keys:
 
@@ -37,7 +41,7 @@ describe('socket config get', async () => {
            - apiToken -- The API token required to access most API endpoints
            - defaultOrg -- The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.
            - enforcedOrgs -- Orgs in this list have their security policies enforced on this machine
-           - isTestingV1 -- For development of testing the next major bump
+           - org -- Alias for defaultOrg
 
           Examples
             $ socket config set apiProxy https://example.com"
@@ -70,7 +74,6 @@ describe('socket config get', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket config set\`, cwd: <redacted>
-
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Config key should be the first arg (\\x1b[31mmissing\\x1b[39m)
diff --git a/src/commands/config/cmd-config-unset.mts b/src/commands/config/cmd-config-unset.mts
index aae777031..e7505cac7 100644
--- a/src/commands/config/cmd-config-unset.mts
+++ b/src/commands/config/cmd-config-unset.mts
@@ -24,11 +24,14 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <org slug>
+      $ ${command} [options] <KEY> <VALUE>
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
+    Removes a value from a config key, allowing the default value to be used
+    for it instead.
+
     Keys:
 
 ${Array.from(supportedConfigKeys.entries())
@@ -36,7 +39,7 @@ ${Array.from(supportedConfigKeys.entries())
   .join('\n')}
 
     Examples
-      $ ${command} FakeOrg --repoName=test-repo
+      $ ${command} defaultOrg
   `,
 }
 
diff --git a/src/commands/config/cmd-config-unset.test.mts b/src/commands/config/cmd-config-unset.test.mts
index 59193437a..274336318 100644
--- a/src/commands/config/cmd-config-unset.test.mts
+++ b/src/commands/config/cmd-config-unset.test.mts
@@ -19,12 +19,15 @@ describe('socket config unset', async () => {
         "Clear the value of a local CLI config item
 
           Usage
-            $ socket config unset <org slug>
+            $ socket config unset [options] <KEY> <VALUE>
 
           Options
             --json            Output result as json
             --markdown        Output result as markdown
 
+          Removes a value from a config key, allowing the default value to be used
+          for it instead.
+
           Keys:
 
            - apiBaseUrl -- Base URL of the API endpoint
@@ -32,10 +35,10 @@ describe('socket config unset', async () => {
            - apiToken -- The API token required to access most API endpoints
            - defaultOrg -- The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.
            - enforcedOrgs -- Orgs in this list have their security policies enforced on this machine
-           - isTestingV1 -- For development of testing the next major bump
+           - org -- Alias for defaultOrg
 
           Examples
-            $ socket config unset FakeOrg --repoName=test-repo"
+            $ socket config unset defaultOrg"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -65,7 +68,6 @@ describe('socket config unset', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket config unset\`, cwd: <redacted>
-
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Config key should be the first arg (\\x1b[31mmissing\\x1b[39m)
diff --git a/src/commands/config/cmd-config.mts b/src/commands/config/cmd-config.mts
index e0b81650d..98133e3d3 100644
--- a/src/commands/config/cmd-config.mts
+++ b/src/commands/config/cmd-config.mts
@@ -11,7 +11,7 @@ const description = 'Commands related to the local CLI configuration'
 
 export const cmdConfig: CliSubcommand = {
   description,
-  hidden: true, // [beta]; isTestingV1
+  hidden: false,
   async run(argv, importMeta, { parentName }) {
     await meowWithSubcommands(
       {
diff --git a/src/commands/config/cmd-config.test.mts b/src/commands/config/cmd-config.test.mts
index da41b7954..5c4942052 100644
--- a/src/commands/config/cmd-config.test.mts
+++ b/src/commands/config/cmd-config.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -86,7 +84,6 @@ describe('socket config', async () => {
             |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
             |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
             |_____|___|___|_,_|___|_|.dev   | Command: \`socket\`, cwd: <redacted>
-
           \\x1b[31m\\xd7\\x1b[39m Could not parse Config as JSON"
         `)
 
@@ -107,7 +104,6 @@ describe('socket config', async () => {
             |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
             |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
             |_____|___|___|_,_|___|_|.dev   | Command: \`socket\`, cwd: <redacted>
-
           \\x1b[31m\\xd7\\x1b[39m Could not parse Config as JSON"
         `)
 
diff --git a/src/commands/diff-scan/cmd-diff-scan-get.mts b/src/commands/diff-scan/cmd-diff-scan-get.mts
deleted file mode 100644
index 8e8f4937a..000000000
--- a/src/commands/diff-scan/cmd-diff-scan-get.mts
+++ /dev/null
@@ -1,167 +0,0 @@
-import { logger } from '@socketsecurity/registry/lib/logger'
-
-import { handleDiffScan } from './handle-diff-scan.mts'
-import constants from '../../constants.mts'
-import { commonFlags } from '../../flags.mts'
-import { checkCommandInput } from '../../utils/check-input.mts'
-import { getConfigValueOrUndef, isTestingV1 } from '../../utils/config.mts'
-import { getOutputKind } from '../../utils/get-output-kind.mts'
-import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
-import { getFlagListOutput } from '../../utils/output-formatting.mts'
-import { hasDefaultToken } from '../../utils/sdk.mts'
-
-import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
-
-const { DRY_RUN_BAILING_NOW } = constants
-
-const config: CliCommandConfig = {
-  commandName: 'get',
-  description: 'Get a diff scan for an organization',
-  hidden: false,
-  flags: {
-    ...commonFlags,
-    after: {
-      type: 'string',
-      shortFlag: 'a',
-      default: '',
-      description: 'The scan ID of the head scan',
-    },
-    before: {
-      type: 'string',
-      shortFlag: 'b',
-      default: '',
-      description: 'The scan ID of the base scan',
-    },
-    depth: {
-      type: 'number',
-      default: 2,
-      description:
-        'Max depth of JSON to display before truncating, use zero for no limit (without --json/--file)',
-    },
-    json: {
-      type: 'boolean',
-      shortFlag: 'j',
-      default: false,
-      description:
-        'Output result as json. This can be big. Use --file to store it to disk without truncation.',
-    },
-    file: {
-      type: 'string',
-      shortFlag: 'f',
-      default: '',
-      description:
-        'Path to a local file where the output should be saved. Use `-` to force stdout.',
-    },
-  },
-  help: (command, config) =>
-    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>
-
-    API Token Requirements
-      - Quota: 1 unit
-      - Permissions: full-scans:list
-
-    This command displays the package changes between two scans. The full output
-    can be pretty large depending on the size of your repo and time range. It is
-    best stored to disk to be further analyzed by other tools.
-
-    Options
-      ${getFlagListOutput(config.flags, 6)}
-
-    Examples
-      $ ${command} FakeCorp --before=aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 --after=aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
-  `,
-}
-
-export const cmdDiffScanGet = {
-  description: config.description,
-  hidden: config.hidden,
-  run,
-}
-
-async function run(
-  argv: string[] | readonly string[],
-  importMeta: ImportMeta,
-  { parentName }: { parentName: string },
-): Promise<void> {
-  const cli = meowOrExit({
-    argv,
-    config,
-    importMeta,
-    parentName,
-  })
-
-  const { after, before, depth, file, json, markdown } = cli.flags
-  const outputKind = getOutputKind(json, markdown)
-
-  const defaultOrgSlugResult = getConfigValueOrUndef('defaultOrg')
-  const orgSlug = defaultOrgSlugResult || cli.input[0] || ''
-
-  const hasApiToken = hasDefaultToken()
-
-  const wasValidInput = checkCommandInput(
-    outputKind,
-    {
-      test: !!(before && after),
-      message:
-        'Specify a before and after scan ID.\nThe args are expecting a full `aaa0aa0a-aaaa-0000-0a0a-0000000a00a0` scan ID.',
-      pass: 'ok',
-      fail:
-        !before && !after
-          ? 'missing before and after'
-          : !before
-            ? 'missing before'
-            : 'missing after',
-    },
-    {
-      test: !!orgSlug,
-      nook: true,
-      message: 'Org name as the first argument',
-      pass: 'ok',
-      fail: 'missing',
-    },
-    {
-      nook: true,
-      test: !json || !markdown,
-      message:
-        'The `--json` and `--markdown` flags can not be used at the same time',
-      pass: 'ok',
-      fail: 'bad',
-    },
-    {
-      nook: true,
-      test: hasApiToken,
-      message:
-        'You need to be logged in to use this command. See `socket login`.',
-      pass: 'ok',
-      fail: 'missing API token',
-    },
-  )
-  if (!wasValidInput) {
-    return
-  }
-
-  logger.fail(
-    'Warning: this command is deprecated in favor of `socket scan diff` and will be removed in the next major bump.',
-  )
-
-  if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAILING_NOW)
-    return
-  }
-
-  await handleDiffScan({
-    before: String(before || ''),
-    after: String(after || ''),
-    depth: Number(depth),
-    orgSlug,
-    outputKind,
-    file: String(file || ''),
-  })
-}
diff --git a/src/commands/diff-scan/cmd-diff-scan-get.test.mts b/src/commands/diff-scan/cmd-diff-scan-get.test.mts
deleted file mode 100644
index 1a7155c8e..000000000
--- a/src/commands/diff-scan/cmd-diff-scan-get.test.mts
+++ /dev/null
@@ -1,119 +0,0 @@
-import path from 'node:path'
-
-import { describe, expect } from 'vitest'
-
-import constants from '../../../src/constants.mts'
-import { cmdit, invokeNpm } from '../../../test/utils.mts'
-
-describe('socket diff-scan get', async () => {
-  // Lazily access constants.binCliPath.
-  const { binCliPath } = constants
-
-  cmdit(
-    ['diff-scan', 'get', '--help', '--config', '{}'],
-    'should support --help',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `
-        "Get a diff scan for an organization
-
-          Note: This command is deprecated, to be dropped in the next major bump.
-                Please see \`socket scan diff\`
-
-          Usage
-            $ socket diff-scan get <org slug> --before=<before> --after=<after>
-
-          API Token Requirements
-            - Quota: 1 unit
-            - Permissions: full-scans:list
-
-          This command displays the package changes between two scans. The full output
-          can be pretty large depending on the size of your repo and time range. It is
-          best stored to disk to be further analyzed by other tools.
-
-          Options
-            --after           The scan ID of the head scan
-            --before          The scan ID of the base scan
-            --depth           Max depth of JSON to display before truncating, use zero for no limit (without --json/--file)
-            --file            Path to a local file where the output should be saved. Use \`-\` to force stdout.
-            --json            Output result as json. This can be big. Use --file to store it to disk without truncation.
-
-          Examples
-            $ socket diff-scan get FakeCorp --before=aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 --after=aaa1aa1a-aaaa-1111-1a1a-1111111a11a1"
-      `,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket diff-scan get\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain(
-        '`socket diff-scan get`',
-      )
-    },
-  )
-
-  cmdit(
-    ['diff-scan', 'get', '--dry-run', '--config', '{}'],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`""`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket diff-scan get\`, cwd: <redacted>
-
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
-
-          - Specify a before and after scan ID. (\\x1b[31mmissing before and after\\x1b[39m)
-            The args are expecting a full \`aaa0aa0a-aaaa-0000-0a0a-0000000a00a0\` scan ID.
-
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
-
-          - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
-        \\x1b[22m"
-      `)
-
-      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
-    },
-  )
-
-  cmdit(
-    [
-      'diff-scan',
-      'get',
-      'fakeorg',
-      '--dry-run',
-      '--config',
-      '{"apiToken":"anything"}',
-      '--before',
-      'x',
-      '--after',
-      'y',
-    ],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket diff-scan get\`, cwd: <redacted>
-
-        \\x1b[31m\\xd7\\x1b[39m Warning: this command is deprecated in favor of \`socket scan diff\` and will be removed in the next major bump."
-      `)
-
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
-    },
-  )
-})
diff --git a/src/commands/diff-scan/cmd-diff-scan.mts b/src/commands/diff-scan/cmd-diff-scan.mts
deleted file mode 100644
index bcba828c4..000000000
--- a/src/commands/diff-scan/cmd-diff-scan.mts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { cmdDiffScanGet } from './cmd-diff-scan-get.mts'
-import { meowWithSubcommands } from '../../utils/meow-with-subcommands.mts'
-
-import type { CliSubcommand } from '../../utils/meow-with-subcommands.mts'
-
-const description = 'Diff scans related commands'
-
-export const cmdDiffScan: CliSubcommand = {
-  description,
-  // Hidden because it was broken all this time (nobody could be using it)
-  // and we're not sure if it's useful to anyone in its current state.
-  // Until we do, we'll hide this to keep the help tidier.
-  // And later, we may simply move this under `scan`, anyways.
-  hidden: true,
-  async run(argv, importMeta, { parentName }) {
-    await meowWithSubcommands(
-      {
-        get: cmdDiffScanGet,
-      },
-      {
-        argv,
-        description,
-        importMeta,
-        name: parentName + ' diff-scan',
-      },
-    )
-  },
-}
diff --git a/src/commands/diff-scan/cmd-diff-scan.test.mts b/src/commands/diff-scan/cmd-diff-scan.test.mts
deleted file mode 100644
index 28d338c17..000000000
--- a/src/commands/diff-scan/cmd-diff-scan.test.mts
+++ /dev/null
@@ -1,68 +0,0 @@
-import path from 'node:path'
-
-import { describe, expect } from 'vitest'
-
-import constants from '../../../src/constants.mts'
-import { cmdit, invokeNpm } from '../../../test/utils.mts'
-
-describe('socket diff-scan', async () => {
-  // Lazily access constants.binCliPath.
-  const { binCliPath } = constants
-
-  cmdit(
-    ['diff-scan', '--help', '--config', '{}'],
-    'should support --help',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `
-        "Diff scans related commands
-
-          Usage
-            $ socket diff-scan <command>
-
-          Commands
-            get               Get a diff scan for an organization
-
-          Options
-            (none)
-
-          Examples
-            $ socket diff-scan --help"
-      `,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket diff-scan\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain(
-        '`socket diff-scan`',
-      )
-    },
-  )
-
-  cmdit(
-    ['diff-scan', '--dry-run', '--config', '{"apiToken":"anything"}'],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `"[DryRun]: No-op, call a sub-command; ok"`,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket diff-scan\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
-    },
-  )
-})
diff --git a/src/commands/diff-scan/fetch-diff-scan.mts b/src/commands/diff-scan/fetch-diff-scan.mts
deleted file mode 100644
index e8102ff7f..000000000
--- a/src/commands/diff-scan/fetch-diff-scan.mts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { queryApiSafeJson } from '../../utils/api.mts'
-
-import type { CResult } from '../../types.mts'
-import type { SocketSdkReturnType } from '@socketsecurity/sdk'
-
-export async function fetchDiffScan({
-  after,
-  before,
-  orgSlug,
-}: {
-  after: string
-  before: string
-  orgSlug: string
-}): Promise<CResult<SocketSdkReturnType<'GetOrgDiffScan'>['data']>> {
-  return await queryApiSafeJson<SocketSdkReturnType<'GetOrgDiffScan'>['data']>(
-    `orgs/${orgSlug}/full-scans/diff?before=${encodeURIComponent(before)}&after=${encodeURIComponent(after)}`,
-    'a scan diff',
-  )
-}
diff --git a/src/commands/diff-scan/handle-diff-scan.mts b/src/commands/diff-scan/handle-diff-scan.mts
deleted file mode 100644
index fb1709d8f..000000000
--- a/src/commands/diff-scan/handle-diff-scan.mts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { fetchDiffScan } from './fetch-diff-scan.mts'
-import { outputDiffScan } from './output-diff-scan.mts'
-
-import type { OutputKind } from '../../types.mts'
-
-export async function handleDiffScan({
-  after,
-  before,
-  depth,
-  file,
-  orgSlug,
-  outputKind,
-}: {
-  after: string
-  before: string
-  depth: number
-  file: string
-  orgSlug: string
-  outputKind: OutputKind
-}): Promise<void> {
-  const data = await fetchDiffScan({
-    after,
-    before,
-    orgSlug,
-  })
-
-  await outputDiffScan(data, {
-    depth,
-    file,
-    outputKind,
-  })
-}
diff --git a/src/commands/diff-scan/output-diff-scan.mts b/src/commands/diff-scan/output-diff-scan.mts
deleted file mode 100644
index f1ac6d12b..000000000
--- a/src/commands/diff-scan/output-diff-scan.mts
+++ /dev/null
@@ -1,87 +0,0 @@
-import fs from 'node:fs'
-import util from 'node:util'
-
-import colors from 'yoctocolors-cjs'
-
-import { logger } from '@socketsecurity/registry/lib/logger'
-
-import { failMsgWithBadge } from '../../utils/fail-msg-with-badge.mts'
-import { serializeResultJson } from '../../utils/serialize-result-json.mts'
-
-import type { CResult, OutputKind } from '../../types.mts'
-import type { SocketSdkReturnType } from '@socketsecurity/sdk'
-
-export async function outputDiffScan(
-  result: CResult<SocketSdkReturnType<'GetOrgDiffScan'>['data']>,
-  {
-    depth,
-    file,
-    outputKind,
-  }: {
-    depth: number
-    file: string
-    outputKind: OutputKind
-  },
-): Promise<void> {
-  if (!result.ok) {
-    process.exitCode = result.code ?? 1
-  }
-
-  if (!result.ok) {
-    if (outputKind === 'json') {
-      logger.log(serializeResultJson(result))
-      return
-    }
-    logger.fail(failMsgWithBadge(result.message, result.cause))
-    return
-  }
-
-  const dashboardUrl = result.data.diff_report_url
-  const dashboardMessage = dashboardUrl
-    ? `\n View this diff scan in the Socket dashboard: ${colors.cyan(dashboardUrl)}`
-    : ''
-
-  // When forcing json, or dumping to file, serialize to string such that it
-  // won't get truncated. The only way to dump the full raw JSON to stdout is
-  // to use `--json --file -` (the dash is a standard notation for stdout)
-  if (outputKind === 'json' || file) {
-    const json = serializeResultJson(result)
-
-    if (file && file !== '-') {
-      logger.info(`Writing json to \`${file}\``)
-      fs.writeFile(file, JSON.stringify(result, null, 2), err => {
-        if (err) {
-          logger.fail(`Writing to \`${file}\` failed...`)
-          logger.error(err)
-        } else {
-          logger.success(`Data successfully written to \`${file}\``)
-        }
-        logger.info(dashboardMessage)
-      })
-    } else {
-      // Note: only the .log will go to stdout
-      logger.success(`\n Diff scan result: \n`)
-      logger.log(json)
-      logger.info(dashboardMessage)
-    }
-
-    return
-  }
-
-  // In this case neither the --json nor the --file flag was passed
-  // Dump the JSON to CLI and let NodeJS deal with truncation
-
-  logger.success('Diff scan result:')
-  logger.log(
-    util.inspect(result, {
-      showHidden: false,
-      depth: depth > 0 ? depth : null,
-      colors: true,
-      maxArrayLength: null,
-    }),
-  )
-  logger.info(
-    `\n 📝 To display the detailed report in the terminal, use the --json flag \n`,
-  )
-  logger.log(dashboardMessage)
-}
diff --git a/src/commands/info/cmd-info.mts b/src/commands/info/cmd-info.mts
deleted file mode 100644
index 65a98a8fa..000000000
--- a/src/commands/info/cmd-info.mts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { logger } from '@socketsecurity/registry/lib/logger'
-
-import { handlePackageInfo } from './handle-package-info.mts'
-import constants from '../../constants.mts'
-import { commonFlags, outputFlags, validationFlags } from '../../flags.mts'
-import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
-import { getOutputKind } from '../../utils/get-output-kind.mts'
-import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
-import { getFlagListOutput } from '../../utils/output-formatting.mts'
-
-import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
-
-const { DRY_RUN_BAILING_NOW } = constants
-
-const config: CliCommandConfig = {
-  commandName: 'info',
-  description: 'Look up info regarding a package',
-  hidden: true, // Deprecated
-  flags: {
-    ...commonFlags,
-    ...outputFlags,
-    ...validationFlags,
-  },
-  help: (command, config) =>
-    isTestingV1()
-      ? 'This command will be removed in v1'
-      : `
-    Usage
-      $ ${command} <name>
-
-    Note: this command will be deprecated in favor of \`socket package score\` soon
-
-    Options
-      ${getFlagListOutput(config.flags, 6)}
-
-    Examples
-      $ ${command} webtorrent
-      $ ${command} webtorrent@1.9.1
-  `,
-}
-
-export const cmdInfo = {
-  description: config.description,
-  hidden: config.hidden,
-  run,
-}
-
-async function run(
-  argv: string[] | readonly string[],
-  importMeta: ImportMeta,
-  { parentName }: { parentName: string },
-): Promise<void> {
-  const cli = meowOrExit({
-    argv,
-    config,
-    importMeta,
-    parentName,
-  })
-
-  const { all, json, markdown, strict } = cli.flags
-  const outputKind = getOutputKind(json, markdown)
-
-  const [rawPkgName = ''] = cli.input
-
-  const wasValidInput = checkCommandInput(
-    outputKind,
-    {
-      test: !!rawPkgName,
-      message: 'Expecting a package name',
-      pass: 'ok',
-      fail: 'missing',
-    },
-    {
-      nook: true,
-      test: cli.input.length === 1,
-      message: 'Can only accept one package at a time',
-      pass: 'ok',
-      fail: 'got ' + cli.input.length,
-    },
-    {
-      nook: true,
-      test: !json || !markdown,
-      message:
-        'The `--json` and `--markdown` flags can not be used at the same time',
-      pass: 'ok',
-      fail: 'bad',
-    },
-  )
-  if (!wasValidInput) {
-    return
-  }
-
-  const versionSeparator = rawPkgName.lastIndexOf('@')
-  const pkgName =
-    versionSeparator < 1 ? rawPkgName : rawPkgName.slice(0, versionSeparator)
-  const pkgVersion =
-    versionSeparator < 1 ? 'latest' : rawPkgName.slice(versionSeparator + 1)
-
-  if (cli.flags['dryRun']) {
-    logger.log(DRY_RUN_BAILING_NOW)
-    return
-  }
-
-  await handlePackageInfo({
-    commandName: `${parentName} ${config.commandName}`,
-    includeAllIssues: Boolean(all),
-    outputKind,
-    pkgName,
-    pkgVersion,
-    strict: Boolean(strict),
-  })
-}
diff --git a/src/commands/info/cmd-info.test.mts b/src/commands/info/cmd-info.test.mts
deleted file mode 100644
index 3b4eab1ab..000000000
--- a/src/commands/info/cmd-info.test.mts
+++ /dev/null
@@ -1,92 +0,0 @@
-import path from 'node:path'
-
-import { describe, expect } from 'vitest'
-
-import constants from '../../../src/constants.mts'
-import { cmdit, invokeNpm } from '../../../test/utils.mts'
-
-describe('socket info', async () => {
-  // Lazily access constants.binCliPath.
-  const { binCliPath } = constants
-
-  cmdit(
-    ['info', '--help', '--config', '{}'],
-    'should support --help',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `
-        "Look up info regarding a package
-
-          Usage
-            $ socket info <name>
-
-          Note: this command will be deprecated in favor of \`socket package score\` soon
-
-          Options
-            --all             Include all issues
-            --json            Output result as json
-            --markdown        Output result as markdown
-            --strict          Exits with an error code if any matching issues are found
-
-          Examples
-            $ socket info webtorrent
-            $ socket info webtorrent@1.9.1"
-      `,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket info\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain('`socket info`')
-    },
-  )
-
-  cmdit(
-    ['info', '--dry-run', '--config', '{}'],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`""`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket info\`, cwd: <redacted>
-
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
-
-          - Expecting a package name (\\x1b[31mmissing\\x1b[39m)
-
-          - Can only accept one package at a time (\\x1b[31mgot 0\\x1b[39m)
-        \\x1b[22m"
-      `)
-
-      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
-    },
-  )
-
-  cmdit(
-    ['info', 'mootools', '--dry-run', '--config', '{"apiToken":"anything"}'],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket info\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
-    },
-  )
-})
diff --git a/src/commands/info/fetch-package-info.mts b/src/commands/info/fetch-package-info.mts
deleted file mode 100644
index 476c96d70..000000000
--- a/src/commands/info/fetch-package-info.mts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { getSeverityCount } from '../../utils/alert/severity.mts'
-import {
-  handleApiCall,
-  handleUnsuccessfulApiResponse,
-} from '../../utils/api.mts'
-import { getPublicToken, setupSdk } from '../../utils/sdk.mts'
-
-import type { PackageData } from './handle-package-info.mts'
-
-export async function fetchPackageInfo(
-  pkgName: string,
-  pkgVersion: string,
-  includeAllIssues: boolean,
-): Promise<void | PackageData> {
-  const sockSdkResult = await setupSdk(getPublicToken())
-  if (!sockSdkResult.ok) {
-    throw new Error('Was unable to setup sdk. Run `socket login` first.')
-  }
-  const sockSdk = sockSdkResult.data
-
-  const result = await handleApiCall(
-    sockSdk.getIssuesByNPMPackage(pkgName, pkgVersion),
-    'package issues',
-  )
-  const scoreResult = await handleApiCall(
-    sockSdk.getScoreByNPMPackage(pkgName, pkgVersion),
-    'package score',
-  )
-
-  if (!result.ok) {
-    handleUnsuccessfulApiResponse(
-      'getIssuesByNPMPackage',
-      result.message,
-      result.cause ?? '',
-      (result.data as any)?.code ?? 0,
-    )
-  }
-
-  if (!scoreResult.ok) {
-    handleUnsuccessfulApiResponse(
-      'getScoreByNPMPackage',
-      scoreResult.message,
-      scoreResult.cause ?? '',
-      (scoreResult.data as any)?.code ?? 0,
-    )
-  }
-
-  const severityCount = getSeverityCount(
-    result.data,
-    includeAllIssues ? undefined : 'high',
-  )
-
-  return {
-    data: result.data,
-    severityCount,
-    score: scoreResult.data,
-  }
-}
diff --git a/src/commands/info/handle-package-info.mts b/src/commands/info/handle-package-info.mts
deleted file mode 100644
index ea35b457a..000000000
--- a/src/commands/info/handle-package-info.mts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { hasKeys } from '@socketsecurity/registry/lib/objects'
-
-import { fetchPackageInfo } from './fetch-package-info.mts'
-import { outputPackageInfo } from './output-package-info.mts'
-
-import type { OutputKind } from '../../types.mts'
-import type { SocketSdkAlert } from '../../utils/alert/severity.mts'
-import type { SocketSdkReturnType } from '@socketsecurity/sdk'
-
-export interface PackageData {
-  data: SocketSdkReturnType<'getIssuesByNPMPackage'>['data']
-  severityCount: Record<SocketSdkAlert['severity'], number>
-  score: SocketSdkReturnType<'getScoreByNPMPackage'>['data']
-}
-
-export async function handlePackageInfo({
-  commandName,
-  includeAllIssues,
-  outputKind,
-  pkgName,
-  pkgVersion,
-  strict,
-}: {
-  commandName: string
-  includeAllIssues: boolean
-  outputKind: OutputKind
-  pkgName: string
-  pkgVersion: string
-  strict: boolean
-}) {
-  const packageData = await fetchPackageInfo(
-    pkgName,
-    pkgVersion,
-    includeAllIssues,
-  )
-
-  if (packageData) {
-    outputPackageInfo(packageData, {
-      commandName,
-      includeAllIssues,
-      outputKind,
-      pkgName,
-      pkgVersion,
-    })
-
-    if (strict && hasKeys(packageData.severityCount)) {
-      // Let NodeJS exit gracefully but with exit(1)
-      process.exitCode = 1
-    }
-  }
-}
diff --git a/src/commands/info/output-package-info.mts b/src/commands/info/output-package-info.mts
deleted file mode 100644
index 40027cf6a..000000000
--- a/src/commands/info/output-package-info.mts
+++ /dev/null
@@ -1,147 +0,0 @@
-import colors from 'yoctocolors-cjs'
-
-import constants from '@socketsecurity/registry/lib/constants'
-import { logger } from '@socketsecurity/registry/lib/logger'
-import { hasKeys } from '@socketsecurity/registry/lib/objects'
-
-import {
-  ALERT_SEVERITY,
-  formatSeverityCount,
-} from '../../utils/alert/severity.mts'
-import { ColorOrMarkdown } from '../../utils/color-or-markdown.mts'
-import {
-  getSocketDevAlertUrl,
-  getSocketDevPackageOverviewUrl,
-} from '../../utils/socket-url.mts'
-
-import type { PackageData } from './handle-package-info.mts'
-import type { OutputKind } from '../../types.mts'
-import type { SocketSdkReturnType } from '@socketsecurity/sdk'
-
-const { NPM } = constants
-
-function formatScore(score: number): string {
-  if (score > 80) {
-    return colors.green(`${score}`)
-  } else if (score < 80 && score > 60) {
-    return colors.yellow(`${score}`)
-  }
-  return colors.red(`${score}`)
-}
-
-function outputPackageIssuesDetails(
-  packageData: SocketSdkReturnType<'getIssuesByNPMPackage'>['data'],
-  outputMarkdown: boolean,
-) {
-  const issueDetails = packageData.filter(
-    d =>
-      d.value?.severity === ALERT_SEVERITY.critical ||
-      d.value?.severity === ALERT_SEVERITY.high,
-  )
-  const uniqueIssueDetails = issueDetails.reduce((acc, issue) => {
-    const { type } = issue
-    if (type) {
-      const details = acc.get(type)
-      if (details) {
-        details.count += 1
-      } else {
-        acc.set(type, {
-          label: issue.value?.label ?? '',
-          count: 1,
-        })
-      }
-    }
-    return acc
-  }, new Map<string, { count: number; label: string }>())
-  const format = new ColorOrMarkdown(outputMarkdown)
-  for (const [type, details] of uniqueIssueDetails.entries()) {
-    const issueWithLink = format.hyperlink(
-      details.label,
-      getSocketDevAlertUrl(type),
-      { fallbackToUrl: true },
-    )
-    if (details.count === 1) {
-      logger.log(`- ${issueWithLink}`)
-    } else {
-      logger.log(`- ${issueWithLink}: ${details.count}`)
-    }
-  }
-}
-
-export function outputPackageInfo(
-  { data, score, severityCount }: PackageData,
-  {
-    commandName,
-    outputKind,
-    pkgName,
-    pkgVersion,
-  }: {
-    commandName: string
-    outputKind: OutputKind
-    pkgName: string
-    pkgVersion: string
-    includeAllIssues?: boolean | undefined
-  },
-): void {
-  if (outputKind === 'json') {
-    logger.log(JSON.stringify(data, undefined, 2))
-    return
-  }
-  if (outputKind === 'markdown') {
-    logger.log(
-      `
-# Package report for ${pkgName}
-
-Package report card:
-    `.trim(),
-    )
-  } else {
-    logger.log(`Package report card for ${pkgName}:`)
-  }
-  const scoreResult = {
-    'Supply Chain Risk': Math.floor(score.supplyChainRisk.score * 100),
-    Maintenance: Math.floor(score.maintenance.score * 100),
-    Quality: Math.floor(score.quality.score * 100),
-    Vulnerabilities: Math.floor(score.vulnerability.score * 100),
-    License: Math.floor(score.license.score * 100),
-  }
-  logger.log('\n')
-  Object.entries(scoreResult).map(score =>
-    logger.log(`- ${score[0]}: ${formatScore(score[1])}`),
-  )
-  logger.log('\n')
-  if (hasKeys(severityCount)) {
-    if (outputKind === 'markdown') {
-      logger.log('# Issues\n')
-    }
-    logger.log(
-      `Package has these issues: ${formatSeverityCount(severityCount)}\n`,
-    )
-    outputPackageIssuesDetails(data, outputKind === 'markdown')
-  } else {
-    logger.log('Package has no issues')
-  }
-
-  const format = new ColorOrMarkdown(outputKind === 'markdown')
-  const url = getSocketDevPackageOverviewUrl(NPM, pkgName, pkgVersion)
-
-  logger.log('\n')
-  if (pkgVersion === 'latest') {
-    logger.log(
-      `Detailed info on socket.dev: ${format.hyperlink(`${pkgName}`, url, { fallbackToUrl: true })}`,
-    )
-  } else {
-    logger.log(
-      `Detailed info on socket.dev: ${format.hyperlink(`${pkgName} v${pkgVersion}`, url, { fallbackToUrl: true })}`,
-    )
-  }
-  if (outputKind !== 'markdown') {
-    logger.log(
-      colors.dim(
-        `\nOr rerun ${colors.italic(commandName)} using the ${colors.italic('--json')} flag to get full JSON output`,
-      ),
-    )
-  } else {
-    logger.log('')
-  }
-}
diff --git a/src/commands/install/cmd-install-completion.mts b/src/commands/install/cmd-install-completion.mts
index e2418657e..aa5064e0a 100644
--- a/src/commands/install/cmd-install-completion.mts
+++ b/src/commands/install/cmd-install-completion.mts
@@ -13,13 +13,13 @@ const { DRY_RUN_BAILING_NOW } = constants
 const config: CliCommandConfig = {
   commandName: 'completion',
   description: 'Install bash completion for Socket CLI',
-  hidden: true, // beta; isTestingV1
+  hidden: false,
   flags: {
     ...commonFlags,
   },
   help: (command, config) => `
     Usage
-      $ ${command} [name=socket]
+      $ ${command} [options] [NAME=socket]
 
     Installs bash completion for the Socket CLI. This will:
     1. Source the completion script in your current shell
diff --git a/src/commands/install/cmd-install-completion.test.mts b/src/commands/install/cmd-install-completion.test.mts
index acc97a5ab..727a16172 100644
--- a/src/commands/install/cmd-install-completion.test.mts
+++ b/src/commands/install/cmd-install-completion.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket install completion', async () => {
         "Install bash completion for Socket CLI
 
           Usage
-            $ socket install completion [name=socket]
+            $ socket install completion [options] [NAME=socket]
 
           Installs bash completion for the Socket CLI. This will:
           1. Source the completion script in your current shell
diff --git a/src/commands/install/cmd-install.mts b/src/commands/install/cmd-install.mts
index 6d071143e..47986e4e1 100644
--- a/src/commands/install/cmd-install.mts
+++ b/src/commands/install/cmd-install.mts
@@ -7,7 +7,7 @@ const description = 'Setup the Socket CLI command in your environment'
 
 export const cmdInstall: CliSubcommand = {
   description,
-  hidden: true, // beta; isTestingV1
+  hidden: false,
   async run(argv, importMeta, { parentName }) {
     await meowWithSubcommands(
       {
diff --git a/src/commands/install/cmd-install.test.mts b/src/commands/install/cmd-install.test.mts
index e4d6d38f9..cd9128559 100644
--- a/src/commands/install/cmd-install.test.mts
+++ b/src/commands/install/cmd-install.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -22,7 +20,7 @@ describe('socket install', async () => {
             $ socket install <command>
 
           Commands
-            (none)
+            completion        Install bash completion for Socket CLI
 
           Options
             (none)
diff --git a/src/commands/json/cmd-json.mts b/src/commands/json/cmd-json.mts
index 6fcaec026..dd5413327 100644
--- a/src/commands/json/cmd-json.mts
+++ b/src/commands/json/cmd-json.mts
@@ -10,16 +10,19 @@ const config: CliCommandConfig = {
   commandName: 'json',
   description:
     'Display the `socket.json` that would be applied for target folder',
-  hidden: true, // This is a power tool. No need to clutter the toplevel.
+  hidden: true,
   flags: {
     ...commonFlags,
   },
-  help: parentName => `
+  help: command => `
     Usage
-      $ ${parentName} [CWD=.]
+      $ ${command} [options] [CWD=.]
 
     Display the \`socket.json\` file that would apply when running relevant commands
     in the target directory.
+
+    Examples
+      $ ${command}
   `,
 }
 
diff --git a/src/commands/json/cmd-json.test.mts b/src/commands/json/cmd-json.test.mts
index 3af21d3c7..a0e677b38 100644
--- a/src/commands/json/cmd-json.test.mts
+++ b/src/commands/json/cmd-json.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,10 +17,13 @@ describe('socket json', async () => {
         "Display the \`socket.json\` that would be applied for target folder
 
           Usage
-            $ socket json [CWD=.]
+            $ socket json [options] [CWD=.]
 
           Display the \`socket.json\` file that would apply when running relevant commands
-          in the target directory."
+          in the target directory.
+
+          Examples
+            $ socket json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -50,7 +51,6 @@ describe('socket json', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket json\`, cwd: <redacted>
-
         \\x1b[34mi\\x1b[39m Target cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m Not found: <redacted>"
       `)
@@ -71,7 +71,6 @@ describe('socket json', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket json\`, cwd: <redacted>
-
         \\x1b[34mi\\x1b[39m Target cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m Not found: <redacted>"
       `)
@@ -98,7 +97,6 @@ describe('socket json', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket json\`, cwd: <redacted>
-
         \\x1b[34mi\\x1b[39m Target cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m Not found: <redacted>"
       `)
@@ -138,7 +136,6 @@ describe('socket json', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket json\`, cwd: <redacted>
-
         \\x1b[34mi\\x1b[39m Target cwd: <redacted>
         \\x1b[32m\\u221a\\x1b[39m This is the contents of <redacted>:"
       `)
diff --git a/src/commands/login/attempt-login.mts b/src/commands/login/attempt-login.mts
index 012dd6db3..8a06157de 100644
--- a/src/commands/login/attempt-login.mts
+++ b/src/commands/login/attempt-login.mts
@@ -9,7 +9,7 @@ import { handleApiCall } from '../../utils/api.mts'
 import {
   getConfigValueOrUndef,
   isReadOnlyConfig,
-  isTestingV1,
+  updateConfigValue,
 } from '../../utils/config.mts'
 import { failMsgWithBadge } from '../../utils/fail-msg-with-badge.mts'
 import { setupSdk } from '../../utils/sdk.mts'
@@ -28,13 +28,19 @@ export async function attemptLogin(
 ) {
   apiBaseUrl ??= getConfigValueOrUndef('apiBaseUrl') ?? undefined
   apiProxy ??= getConfigValueOrUndef('apiProxy') ?? undefined
-  const apiToken =
-    (await password({
-      message: `Enter your ${terminalLink(
-        'Socket.dev API key',
-        'https://docs.socket.dev/docs/api-keys',
-      )} (leave blank for a public key)`,
-    })) || SOCKET_PUBLIC_API_TOKEN
+  const apiTokenInput = await password({
+    message: `Enter your ${terminalLink(
+      'Socket.dev API key',
+      'https://docs.socket.dev/docs/api-keys',
+    )} (leave blank for a public key)`,
+  })
+
+  if (apiTokenInput === undefined) {
+    logger.fail('Canceled by user')
+    return { ok: false, message: 'Canceled', cause: 'Canceled by user' }
+  }
+
+  const apiToken = apiTokenInput || SOCKET_PUBLIC_API_TOKEN
 
   const sdk = await setupSdk(apiToken, apiBaseUrl, apiProxy)
   if (!sdk.ok) {
@@ -54,9 +60,10 @@ export async function attemptLogin(
     return
   }
 
-  logger.success('API key verified')
-
   const orgs: SocketSdkReturnType<'getOrganizations'>['data'] = result.data
+  const orgSlugs = Object.values(orgs.organizations).map(obj => obj.slug)
+
+  logger.success(`API key verified: ${orgSlugs}`)
 
   const enforcedChoices: OrgChoices = Object.values(orgs.organizations)
     .filter(org => org?.plan === 'enterprise')
@@ -67,7 +74,7 @@ export async function attemptLogin(
 
   let enforcedOrgs: string[] = []
   if (enforcedChoices.length > 1) {
-    const id = (await select({
+    const id = await select({
       message:
         "Which organization's policies should Socket enforce system-wide?",
       choices: enforcedChoices.concat({
@@ -75,17 +82,24 @@ export async function attemptLogin(
         value: '',
         description: 'Pick "None" if this is a personal device',
       }),
-    })) as string | null
+    })
+    if (id === undefined) {
+      logger.fail('Canceled by user')
+      return { ok: false, message: 'Canceled', cause: 'Canceled by user' }
+    }
     if (id) {
       enforcedOrgs = [id]
     }
   } else if (enforcedChoices.length) {
-    if (
-      await confirm({
-        message: `Should Socket enforce ${(enforcedChoices[0] as OrgChoice)?.name}'s security policies system-wide?`,
-        default: true,
-      })
-    ) {
+    const shouldEnforce = await confirm({
+      message: `Should Socket enforce ${(enforcedChoices[0] as OrgChoice)?.name}'s security policies system-wide?`,
+      default: true,
+    })
+    if (shouldEnforce === undefined) {
+      logger.fail('Canceled by user')
+      return { ok: false, message: 'Canceled', cause: 'Canceled by user' }
+    }
+    if (shouldEnforce) {
       const existing = enforcedChoices[0] as OrgChoice
       if (existing) {
         enforcedOrgs = [existing.value]
@@ -93,26 +107,28 @@ export async function attemptLogin(
     }
   }
 
-  if (
-    isTestingV1() &&
-    (await select({
-      message: 'Would you like to install bash tab completion?',
-      choices: [
-        {
-          name: 'Yes',
-          value: true,
-          description:
-            'Sets up tab completion for "socket" in your bash env. If you\'re unsure, this is probably what you want.',
-        },
-        {
-          name: 'No',
-          value: false,
-          description:
-            'Will skip tab completion setup. Does not change how Socket works.',
-        },
-      ],
-    }))
-  ) {
+  const wantToComplete = await select({
+    message: 'Would you like to install bash tab completion?',
+    choices: [
+      {
+        name: 'Yes',
+        value: true,
+        description:
+          'Sets up tab completion for "socket" in your bash env. If you\'re unsure, this is probably what you want.',
+      },
+      {
+        name: 'No',
+        value: false,
+        description:
+          'Will skip tab completion setup. Does not change how Socket works.',
+      },
+    ],
+  })
+  if (wantToComplete === undefined) {
+    logger.fail('Canceled by user')
+    return { ok: false, message: 'Canceled', cause: 'Canceled by user' }
+  }
+  if (wantToComplete) {
     logger.log('Setting up tab completion...')
     const result = await setupTabCompletion('socket')
     if (result.ok) {
@@ -126,6 +142,8 @@ export async function attemptLogin(
     }
   }
 
+  updateConfigValue('defaultOrg', orgSlugs[0])
+
   const previousPersistedToken = getConfigValueOrUndef('apiToken')
   try {
     applyLogin(apiToken, enforcedOrgs, apiBaseUrl, apiProxy)
diff --git a/src/commands/login/cmd-login.mts b/src/commands/login/cmd-login.mts
index c82db8fbb..c533e436d 100644
--- a/src/commands/login/cmd-login.mts
+++ b/src/commands/login/cmd-login.mts
@@ -29,7 +29,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}
+      $ ${command} [options]
 
     API Token Requirements
       - Quota: 1 unit
diff --git a/src/commands/login/cmd-login.test.mts b/src/commands/login/cmd-login.test.mts
index d48e8ff66..7bd3eb344 100644
--- a/src/commands/login/cmd-login.test.mts
+++ b/src/commands/login/cmd-login.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket login', async () => {
         "Socket API login
 
           Usage
-            $ socket login
+            $ socket login [options]
 
           API Token Requirements
             - Quota: 1 unit
diff --git a/src/commands/logout/cmd-logout.mts b/src/commands/logout/cmd-logout.mts
index 21211f904..1f37f01d0 100644
--- a/src/commands/logout/cmd-logout.mts
+++ b/src/commands/logout/cmd-logout.mts
@@ -18,9 +18,12 @@ const config: CliCommandConfig = {
   },
   help: (command, _config) => `
     Usage
-      $ ${command}
+      $ ${command} [options]
 
     Logs out of the Socket API and clears all Socket credentials from disk
+
+    Examples
+      $ ${command}
   `,
 }
 
diff --git a/src/commands/logout/cmd-logout.test.mts b/src/commands/logout/cmd-logout.test.mts
index 6f0a6a44c..a8b463500 100644
--- a/src/commands/logout/cmd-logout.test.mts
+++ b/src/commands/logout/cmd-logout.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,9 +17,12 @@ describe('socket logout', async () => {
         "Socket API logout
 
           Usage
-            $ socket logout
+            $ socket logout [options]
+
+          Logs out of the Socket API and clears all Socket credentials from disk
 
-          Logs out of the Socket API and clears all Socket credentials from disk"
+          Examples
+            $ socket logout"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/manifest/cmd-manifest-auto.mts b/src/commands/manifest/cmd-manifest-auto.mts
index ddb2d0cd9..3fe6bb603 100644
--- a/src/commands/manifest/cmd-manifest-auto.mts
+++ b/src/commands/manifest/cmd-manifest-auto.mts
@@ -31,7 +31,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} [CWD=.]
+      $ ${command} [options] [CWD=.]
 
     Options
       ${getFlagListOutput(config.flags, 6)}
diff --git a/src/commands/manifest/cmd-manifest-auto.test.mts b/src/commands/manifest/cmd-manifest-auto.test.mts
index 13f0ae5f2..c41ac5ca3 100644
--- a/src/commands/manifest/cmd-manifest-auto.test.mts
+++ b/src/commands/manifest/cmd-manifest-auto.test.mts
@@ -17,7 +17,7 @@ describe('socket manifest auto', async () => {
         "Auto-detect build and attempt to generate manifest file
 
           Usage
-            $ socket manifest auto [CWD=.]
+            $ socket manifest auto [options] [CWD=.]
 
           Options
             --verbose         Enable debug output (only for auto itself; sub-steps need to have it pre-configured), may help when running into errors
diff --git a/src/commands/manifest/cmd-manifest-cdxgen.mts b/src/commands/manifest/cmd-manifest-cdxgen.mts
index bf5f5959a..5138a72d4 100644
--- a/src/commands/manifest/cmd-manifest-cdxgen.mts
+++ b/src/commands/manifest/cmd-manifest-cdxgen.mts
@@ -278,7 +278,7 @@ async function run(
       yargv.lifecycle = 'pre-build'
       yargv['install-deps'] = false
       logger.info(
-        `Socket set cdxgen --lifecycle to "${yargv.lifecycle}" to avoid arbitrary code execution on this scan.\n  Pass "--lifecycle build" to generate a BOM consisting of information obtained during the build process.\n  See cdxgen ${terminalLink(
+        `Setting cdxgen --lifecycle to "${yargv.lifecycle}" to avoid arbitrary code execution on this scan.\n  Pass "--lifecycle build" to generate a BOM consisting of information obtained during the build process.\n  See cdxgen ${terminalLink(
           'BOM lifecycles documentation',
           'https://cyclonedx.github.io/cdxgen/#/ADVANCED?id=bom-lifecycles',
         )} for more details.\n`,
diff --git a/src/commands/manifest/cmd-manifest-conda.test.mts b/src/commands/manifest/cmd-manifest-conda.test.mts
index 0bf1f746a..1434ebe7d 100644
--- a/src/commands/manifest/cmd-manifest-conda.test.mts
+++ b/src/commands/manifest/cmd-manifest-conda.test.mts
@@ -70,7 +70,6 @@ describe('socket manifest conda', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket manifest conda\`, cwd: <redacted>
-
         \\x1b[33m\\u203c\\x1b[39m Warning: This will approximate your Conda dependencies using PyPI. We do not yet officially support Conda. Use at your own risk."
       `)
 
@@ -98,7 +97,6 @@ describe('socket manifest conda', async () => {
             |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
             |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
             |_____|___|___|_,_|___|_|.dev   | Command: \`socket manifest conda\`, cwd: <redacted>
-
           \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
             - Can only accept one DIR (make sure to escape spaces!) (\\x1b[31mreceived 2\\x1b[39m)
@@ -157,7 +155,6 @@ describe('socket manifest conda', async () => {
             |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
             |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
             |_____|___|___|_,_|___|_|.dev   | Command: \`socket manifest conda\`, cwd: <redacted>
-
           \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
             - Can only accept one DIR (make sure to escape spaces!) (\\x1b[31mreceived 2\\x1b[39m)
diff --git a/src/commands/manifest/cmd-manifest-setup.mts b/src/commands/manifest/cmd-manifest-setup.mts
index cb1e7e50f..9d7ddb696 100644
--- a/src/commands/manifest/cmd-manifest-setup.mts
+++ b/src/commands/manifest/cmd-manifest-setup.mts
@@ -52,7 +52,6 @@ const config: CliCommandConfig = {
     your .gitignore all the same. Only this CLI will use it.
 
     Examples
-
       $ ${command}
       $ ${command} ./proj
   `,
diff --git a/src/commands/manifest/cmd-manifest-setup.test.mts b/src/commands/manifest/cmd-manifest-setup.test.mts
index 6f8e04c30..08de7e77a 100644
--- a/src/commands/manifest/cmd-manifest-setup.test.mts
+++ b/src/commands/manifest/cmd-manifest-setup.test.mts
@@ -42,7 +42,6 @@ describe('socket manifest setup', async () => {
           your .gitignore all the same. Only this CLI will use it.
 
           Examples
-
             $ socket manifest setup
             $ socket manifest setup ./proj"
       `,
diff --git a/src/commands/manifest/cmd-manifest.mts b/src/commands/manifest/cmd-manifest.mts
index febea13da..b15b8f038 100644
--- a/src/commands/manifest/cmd-manifest.mts
+++ b/src/commands/manifest/cmd-manifest.mts
@@ -20,7 +20,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <language> <target>
+      $ ${command} [options] <LANGUAGE> <TARGET>
 
     Options
       ${getFlagListOutput(config.flags, 6)}
@@ -42,7 +42,7 @@ const config: CliCommandConfig = {
 
     To have it auto-detect and attempt to run:
 
-      $ ${command} yolo
+      $ ${command} auto
   `,
 }
 
diff --git a/src/commands/npm/cmd-npm.mts b/src/commands/npm/cmd-npm.mts
index 62833a137..f6e7b14ba 100644
--- a/src/commands/npm/cmd-npm.mts
+++ b/src/commands/npm/cmd-npm.mts
@@ -21,7 +21,20 @@ const config: CliCommandConfig = {
   },
   help: (command, _config) => `
     Usage
+      $ ${command} ...
+
+    This runs npm but checks packages through Socket before installing anything.
+    See docs for more details.
+
+    Note: Everything after "npm" is sent straight to the npm command.
+          Only the \`--dryRun\` and \`--help\` flags are caught here.
+
+    Use \`socket wrapper on\` to automatically enable this such that you don't
+    have to write \`socket npm\` for that purpose.
+
+    Examples
       $ ${command}
+      $ ${command} install -g socket
   `,
 }
 
diff --git a/src/commands/npm/cmd-npm.test.mts b/src/commands/npm/cmd-npm.test.mts
index c10f91be0..411e4da80 100644
--- a/src/commands/npm/cmd-npm.test.mts
+++ b/src/commands/npm/cmd-npm.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,20 @@ describe('socket npm', async () => {
         "npm wrapper functionality
 
           Usage
-            $ socket npm"
+            $ socket npm ...
+
+          This runs npm but checks packages through Socket before installing anything.
+          See docs for more details.
+
+          Note: Everything after "npm" is sent straight to the npm command.
+                Only the \`--dryRun\` and \`--help\` flags are caught here.
+
+          Use \`socket wrapper on\` to automatically enable this such that you don't
+          have to write \`socket npm\` for that purpose.
+
+          Examples
+            $ socket npm
+            $ socket npm install -g socket"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/npx/cmd-npx.mts b/src/commands/npx/cmd-npx.mts
index ac19aa03a..1a5481ff6 100644
--- a/src/commands/npx/cmd-npx.mts
+++ b/src/commands/npx/cmd-npx.mts
@@ -21,7 +21,20 @@ const config: CliCommandConfig = {
   },
   help: (command, _config) => `
     Usage
+      $ ${command} ...
+
+    This runs npx but checks packages through Socket before running them.
+    See docs for more details.
+
+    Note: Everything after "npx" is sent straight to the npx command.
+          Only the \`--dryRun\` and \`--help\` flags are caught here.
+
+    Use \`socket wrapper on\` to automatically enable this such that you don't
+    have to write \`socket npx\` for that purpose.
+
+    Examples
       $ ${command}
+      $ ${command} prettier
   `,
 }
 
diff --git a/src/commands/npx/cmd-npx.test.mts b/src/commands/npx/cmd-npx.test.mts
index 8950705da..0fabe4fbe 100644
--- a/src/commands/npx/cmd-npx.test.mts
+++ b/src/commands/npx/cmd-npx.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,20 @@ describe('socket npx', async () => {
         "npx wrapper functionality
 
           Usage
-            $ socket npx"
+            $ socket npx ...
+
+          This runs npx but checks packages through Socket before running them.
+          See docs for more details.
+
+          Note: Everything after "npx" is sent straight to the npx command.
+                Only the \`--dryRun\` and \`--help\` flags are caught here.
+
+          Use \`socket wrapper on\` to automatically enable this such that you don't
+          have to write \`socket npx\` for that purpose.
+
+          Examples
+            $ socket npx
+            $ socket npx prettier"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/oops/cmd-oops.test.mts b/src/commands/oops/cmd-oops.test.mts
index 283e2926f..384d9062d 100644
--- a/src/commands/oops/cmd-oops.test.mts
+++ b/src/commands/oops/cmd-oops.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
diff --git a/src/commands/optimize/cmd-optimize.test.mts b/src/commands/optimize/cmd-optimize.test.mts
index d46cb2da9..af9b4b6fb 100644
--- a/src/commands/optimize/cmd-optimize.test.mts
+++ b/src/commands/optimize/cmd-optimize.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
diff --git a/src/commands/dependencies/cmd-dependencies.mts b/src/commands/organization/cmd-organization-dependencies.mts
similarity index 97%
rename from src/commands/dependencies/cmd-dependencies.mts
rename to src/commands/organization/cmd-organization-dependencies.mts
index 949288f59..d50e0828b 100644
--- a/src/commands/dependencies/cmd-dependencies.mts
+++ b/src/commands/organization/cmd-organization-dependencies.mts
@@ -22,13 +22,11 @@ const config: CliCommandConfig = {
     ...commonFlags,
     limit: {
       type: 'number',
-      shortFlag: 'l',
       default: 50,
       description: 'Maximum number of dependencies returned',
     },
     offset: {
       type: 'number',
-      shortFlag: 'o',
       default: 0,
       description: 'Page number',
     },
@@ -36,7 +34,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      ${command}
+      ${command} [options]
 
     API Token Requirements
       - Quota: 1 unit
@@ -46,11 +44,12 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
+      ${command}
       ${command} --limit 20 --offset 10
   `,
 }
 
-export const cmdScanCreate = {
+export const cmdOrganizationDependencies = {
   description: config.description,
   hidden: config.hidden,
   run,
diff --git a/src/commands/dependencies/cmd-dependencies.test.mts b/src/commands/organization/cmd-organization-dependencies.test.mts
similarity index 74%
rename from src/commands/dependencies/cmd-dependencies.test.mts
rename to src/commands/organization/cmd-organization-dependencies.test.mts
index 25e1dbc9a..911e2b23e 100644
--- a/src/commands/dependencies/cmd-dependencies.test.mts
+++ b/src/commands/organization/cmd-organization-dependencies.test.mts
@@ -1,16 +1,14 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
 import { cmdit, invokeNpm } from '../../../test/utils.mts'
 
-describe('socket dependencies', async () => {
+describe('socket organization dependencies', async () => {
   // Lazily access constants.binCliPath.
   const { binCliPath } = constants
 
   cmdit(
-    ['dependencies', '--help', '--config', '{}'],
+    ['organization', 'dependencies', '--help', '--config', '{}'],
     'should support --help',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -19,7 +17,7 @@ describe('socket dependencies', async () => {
         "Search for any dependency that is being used in your organization
 
           Usage
-            socket dependencies
+            socket organization dependencies [options]
 
           API Token Requirements
             - Quota: 1 unit
@@ -32,7 +30,8 @@ describe('socket dependencies', async () => {
             --offset          Page number
 
           Examples
-            socket dependencies --limit 20 --offset 10"
+            socket organization dependencies
+            socket organization dependencies --limit 20 --offset 10"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -40,18 +39,24 @@ describe('socket dependencies', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket dependencies\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization dependencies\`, cwd: <redacted>"
       `)
 
       expect(code, 'explicit help should exit with code 0').toBe(0)
       expect(stderr, 'banner includes base command').toContain(
-        '`socket dependencies`',
+        '`socket organization dependencies`',
       )
     },
   )
 
   cmdit(
-    ['dependencies', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    [
+      'organization',
+      'dependencies',
+      '--dry-run',
+      '--config',
+      '{"apiToken":"anything"}',
+    ],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -61,7 +66,7 @@ describe('socket dependencies', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket dependencies\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization dependencies\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/organization/cmd-organization-list.mts b/src/commands/organization/cmd-organization-list.mts
index bc2bc6845..744fa3ea0 100644
--- a/src/commands/organization/cmd-organization-list.mts
+++ b/src/commands/organization/cmd-organization-list.mts
@@ -23,7 +23,7 @@ const config: CliCommandConfig = {
   },
   help: (command, _config) => `
     Usage
-      $ ${command}
+      $ ${command} [options]
 
     API Token Requirements
       - Quota: 1 unit
@@ -31,6 +31,10 @@ const config: CliCommandConfig = {
 
     Options
       ${getFlagListOutput(config.flags, 6)}
+
+    Examples
+      $ ${command}
+      $ ${command} --json
   `,
 }
 
diff --git a/src/commands/organization/cmd-organization-list.test.mts b/src/commands/organization/cmd-organization-list.test.mts
index 08a4d3501..acb4cde5a 100644
--- a/src/commands/organization/cmd-organization-list.test.mts
+++ b/src/commands/organization/cmd-organization-list.test.mts
@@ -19,7 +19,7 @@ describe('socket organization list', async () => {
         "List organizations associated with the API key used
 
           Usage
-            $ socket organization list
+            $ socket organization list [options]
 
           API Token Requirements
             - Quota: 1 unit
@@ -27,7 +27,11 @@ describe('socket organization list', async () => {
 
           Options
             --json            Output result as json
-            --markdown        Output result as markdown"
+            --markdown        Output result as markdown
+
+          Examples
+            $ socket organization list
+            $ socket organization list --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/organization/cmd-organization-policy-license.mts b/src/commands/organization/cmd-organization-policy-license.mts
index fa21f6d7f..5b4f87821 100644
--- a/src/commands/organization/cmd-organization-policy-license.mts
+++ b/src/commands/organization/cmd-organization-policy-license.mts
@@ -4,7 +4,6 @@ import { handleLicensePolicy } from './handle-license-policy.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -15,11 +14,10 @@ import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
 const { DRY_RUN_BAILING_NOW } = constants
 
-// TODO: secret toplevel alias `socket license policy`?
 const config: CliCommandConfig = {
   commandName: 'license',
   description: 'Retrieve the license policy of an organization',
-  hidden: true,
+  hidden: false,
   flags: {
     ...commonFlags,
     ...outputFlags,
@@ -37,7 +35,7 @@ const config: CliCommandConfig = {
   },
   help: (command, _config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'}
+      $ ${command} [options]
 
     API Token Requirements
       - Quota: 1 unit
@@ -50,8 +48,8 @@ const config: CliCommandConfig = {
     the request will fail with an authentication error.
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' mycorp'}
-      $ ${command}${isTestingV1() ? '' : ' mycorp'} --json
+      $ ${command}
+      $ ${command} --json
   `,
 }
 
@@ -78,7 +76,6 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
@@ -87,15 +84,6 @@ async function run(
 
   const wasValidInput = checkCommandInput(
     outputKind,
-    {
-      nook: true,
-      test: !!orgSlug,
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
-      pass: 'ok',
-      fail: 'missing',
-    },
     {
       nook: true,
       test: !json || !markdown,
diff --git a/src/commands/organization/cmd-organization-policy-license.test.mts b/src/commands/organization/cmd-organization-policy-license.test.mts
index 2a4a219b9..f8a1881a6 100644
--- a/src/commands/organization/cmd-organization-policy-license.test.mts
+++ b/src/commands/organization/cmd-organization-policy-license.test.mts
@@ -19,7 +19,7 @@ describe('socket organization policy license', async () => {
         "Retrieve the license policy of an organization
 
           Usage
-            $ socket organization policy license <org slug>
+            $ socket organization policy license [options]
 
           API Token Requirements
             - Quota: 1 unit
@@ -35,8 +35,8 @@ describe('socket organization policy license', async () => {
           the request will fail with an authentication error.
 
           Examples
-            $ socket organization policy license mycorp
-            $ socket organization policy license mycorp --json"
+            $ socket organization policy license
+            $ socket organization policy license --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -66,11 +66,11 @@ describe('socket organization policy license', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
-
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
       `)
@@ -98,44 +98,13 @@ describe('socket organization policy license', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
-    },
-  )
-
-  cmdit(
-    [
-      'organization',
-      'policy',
-      'license',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should report missing org name in v1',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`""`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
         \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
         \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
-
-          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
-        \\x1b[22m"
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode"
       `)
 
-      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
+      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
     },
   )
 
@@ -146,20 +115,18 @@ describe('socket organization policy license', async () => {
       'license',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should accept default org in v1',
+    'should accept default org',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -175,20 +142,18 @@ describe('socket organization policy license', async () => {
       'forcedorg',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should accept --org flag in v1',
+    'should accept --org flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/organization/cmd-organization-policy-security.mts b/src/commands/organization/cmd-organization-policy-security.mts
index 97fe48396..4f5645d8c 100644
--- a/src/commands/organization/cmd-organization-policy-security.mts
+++ b/src/commands/organization/cmd-organization-policy-security.mts
@@ -4,7 +4,6 @@ import { handleSecurityPolicy } from './handle-security-policy.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -37,7 +36,7 @@ const config: CliCommandConfig = {
   },
   help: (command, _config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'}
+      $ ${command} [options]
 
     API Token Requirements
       - Quota: 1 unit
@@ -50,12 +49,12 @@ const config: CliCommandConfig = {
     the request will fail with an authentication error.
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' mycorp'}
-      $ ${command}${isTestingV1() ? '' : ' mycorp'} --json
+      $ ${command}
+      $ ${command} --json
   `,
 }
 
-export const cmdOrganizationPolicyPolicy = {
+export const cmdOrganizationPolicySecurity = {
   description: config.description,
   hidden: config.hidden,
   run,
@@ -78,7 +77,6 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
@@ -87,13 +85,6 @@ async function run(
 
   const wasValidInput = checkCommandInput(
     outputKind,
-    {
-      nook: true,
-      test: !!orgSlug,
-      message: 'Org name as the first argument',
-      pass: 'ok',
-      fail: 'missing',
-    },
     {
       nook: true,
       test: !json || !markdown,
diff --git a/src/commands/organization/cmd-organization-policy-security.test.mts b/src/commands/organization/cmd-organization-policy-security.test.mts
index b06a57d5c..92d6f1813 100644
--- a/src/commands/organization/cmd-organization-policy-security.test.mts
+++ b/src/commands/organization/cmd-organization-policy-security.test.mts
@@ -19,7 +19,7 @@ describe('socket organization policy security', async () => {
         "Retrieve the security policy of an organization
 
           Usage
-            $ socket organization policy security <org slug>
+            $ socket organization policy security [options]
 
           API Token Requirements
             - Quota: 1 unit
@@ -35,8 +35,8 @@ describe('socket organization policy security', async () => {
           the request will fail with an authentication error.
 
           Examples
-            $ socket organization policy security mycorp
-            $ socket organization policy security mycorp --json"
+            $ socket organization policy security
+            $ socket organization policy security --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -66,76 +66,16 @@ describe('socket organization policy security', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>
-
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
-
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
-
-          - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
-        \\x1b[22m"
-      `)
-
-      expect(code, 'dry-run should exit with code 2 if input bad').toBe(2)
-    },
-  )
-
-  cmdit(
-    [
-      'organization',
-      'policy',
-      'security',
-      'fakeorg',
-      '--dry-run',
-      '--config',
-      '{"apiToken":"anything"}',
-    ],
-    'should be ok with org name and id',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
-    },
-  )
-
-  cmdit(
-    [
-      'organization',
-      'policy',
-      'security',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should report missing org name in v1',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`""`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
         \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
         \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
         \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
       `)
 
-      expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
+      expect(code, 'dry-run should exit with code 2 if input bad').toBe(2)
     },
   )
 
@@ -155,11 +95,9 @@ describe('socket organization policy security', async () => {
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -184,11 +122,9 @@ describe('socket organization policy security', async () => {
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/organization/cmd-organization-policy.mts b/src/commands/organization/cmd-organization-policy.mts
index e54d1c0a4..da4660b86 100644
--- a/src/commands/organization/cmd-organization-policy.mts
+++ b/src/commands/organization/cmd-organization-policy.mts
@@ -1,5 +1,5 @@
 import { cmdOrganizationPolicyLicense } from './cmd-organization-policy-license.mts'
-import { cmdOrganizationPolicyPolicy } from './cmd-organization-policy-security.mts'
+import { cmdOrganizationPolicySecurity } from './cmd-organization-policy-security.mts'
 import { meowWithSubcommands } from '../../utils/meow-with-subcommands.mts'
 
 import type { CliSubcommand } from '../../utils/meow-with-subcommands.mts'
@@ -12,11 +12,11 @@ export const cmdOrganizationPolicy: CliSubcommand = {
   // and we're not sure if it's useful to anyone in its current state.
   // Until we do, we'll hide this to keep the help tidier.
   // And later, we may simply move this under `scan`, anyways.
-  hidden: true,
+  hidden: false,
   async run(argv, importMeta, { parentName }) {
     await meowWithSubcommands(
       {
-        security: cmdOrganizationPolicyPolicy,
+        security: cmdOrganizationPolicySecurity,
         license: cmdOrganizationPolicyLicense,
       },
       {
diff --git a/src/commands/organization/cmd-organization-policy.test.mts b/src/commands/organization/cmd-organization-policy.test.mts
index 667f5b27b..945b732a0 100644
--- a/src/commands/organization/cmd-organization-policy.test.mts
+++ b/src/commands/organization/cmd-organization-policy.test.mts
@@ -22,7 +22,7 @@ describe('socket organization list', async () => {
             $ socket organization policy <command>
 
           Commands
-            (none)
+            license           Retrieve the license policy of an organization
 
           Options
             (none)
diff --git a/src/commands/organization/cmd-organization-quota.mts b/src/commands/organization/cmd-organization-quota.mts
index afac04ebc..238a0815a 100644
--- a/src/commands/organization/cmd-organization-quota.mts
+++ b/src/commands/organization/cmd-organization-quota.mts
@@ -23,10 +23,14 @@ const config: CliCommandConfig = {
   },
   help: (command, _config) => `
     Usage
-      $ ${command}
+      $ ${command} [options]
 
     Options
       ${getFlagListOutput(config.flags, 6)}
+
+    Examples
+      $ ${command}
+      $ ${command} --json
   `,
 }
 
diff --git a/src/commands/organization/cmd-organization-quota.test.mts b/src/commands/organization/cmd-organization-quota.test.mts
index 52a5240fe..fd25445e5 100644
--- a/src/commands/organization/cmd-organization-quota.test.mts
+++ b/src/commands/organization/cmd-organization-quota.test.mts
@@ -19,11 +19,15 @@ describe('socket organization quota', async () => {
         "List organizations associated with the API key used
 
           Usage
-            $ socket organization quota
+            $ socket organization quota [options]
 
           Options
             --json            Output result as json
-            --markdown        Output result as markdown"
+            --markdown        Output result as markdown
+
+          Examples
+            $ socket organization quota
+            $ socket organization quota --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/organization/cmd-organization.mts b/src/commands/organization/cmd-organization.mts
index 49403207b..724a1ad69 100644
--- a/src/commands/organization/cmd-organization.mts
+++ b/src/commands/organization/cmd-organization.mts
@@ -1,6 +1,7 @@
+import { cmdOrganizationDependencies } from './cmd-organization-dependencies.mts'
 import { cmdOrganizationList } from './cmd-organization-list.mts'
 import { cmdOrganizationPolicyLicense } from './cmd-organization-policy-license.mts'
-import { cmdOrganizationPolicyPolicy } from './cmd-organization-policy-security.mts'
+import { cmdOrganizationPolicySecurity } from './cmd-organization-policy-security.mts'
 import { cmdOrganizationPolicy } from './cmd-organization-policy.mts'
 import { cmdOrganizationQuota } from './cmd-organization-quota.mts'
 import { meowWithSubcommands } from '../../utils/meow-with-subcommands.mts'
@@ -15,26 +16,31 @@ export const cmdOrganization: CliSubcommand = {
   async run(argv, importMeta, { parentName }) {
     await meowWithSubcommands(
       {
+        dependencies: cmdOrganizationDependencies,
         list: cmdOrganizationList,
         quota: cmdOrganizationQuota,
         policy: cmdOrganizationPolicy,
       },
       {
         aliases: {
+          deps: {
+            description: cmdOrganizationDependencies.description,
+            hidden: true,
+            argv: ['dependencies'],
+          },
           license: {
             description: cmdOrganizationPolicyLicense.description,
             hidden: true,
             argv: ['policy', 'license'],
           },
           security: {
-            description: cmdOrganizationPolicyPolicy.description,
+            description: cmdOrganizationPolicySecurity.description,
             hidden: true,
             argv: ['policy', 'security'],
           },
         },
         argv,
         description,
-        defaultSub: 'list', // Backwards compat
         importMeta,
         name: parentName + ' organization',
       },
diff --git a/src/commands/organization/cmd-organization.test.mts b/src/commands/organization/cmd-organization.test.mts
index ae9a6c207..82a8d6a9c 100644
--- a/src/commands/organization/cmd-organization.test.mts
+++ b/src/commands/organization/cmd-organization.test.mts
@@ -22,7 +22,9 @@ describe('socket organization', async () => {
             $ socket organization <command>
 
           Commands
+            dependencies      Search for any dependency that is being used in your organization
             list              List organizations associated with the API key used
+            policy            Organization policy details
 
           Options
             (none)
diff --git a/src/commands/dependencies/fetch-dependencies.mts b/src/commands/organization/fetch-dependencies.mts
similarity index 100%
rename from src/commands/dependencies/fetch-dependencies.mts
rename to src/commands/organization/fetch-dependencies.mts
diff --git a/src/commands/dependencies/handle-dependencies.mts b/src/commands/organization/handle-dependencies.mts
similarity index 100%
rename from src/commands/dependencies/handle-dependencies.mts
rename to src/commands/organization/handle-dependencies.mts
diff --git a/src/commands/dependencies/output-dependencies.mts b/src/commands/organization/output-dependencies.mts
similarity index 70%
rename from src/commands/dependencies/output-dependencies.mts
rename to src/commands/organization/output-dependencies.mts
index 8bc1954c2..441f67b27 100644
--- a/src/commands/dependencies/output-dependencies.mts
+++ b/src/commands/organization/output-dependencies.mts
@@ -35,26 +35,38 @@ export async function outputDependencies(
     return
   }
 
-  logger.log(
-    'Request details: Offset:',
-    offset,
-    ', limit:',
+  outputMarkdown(result.data, { limit, offset })
+}
+
+function outputMarkdown(
+  result: SocketSdkReturnType<'searchDependencies'>['data'],
+  {
     limit,
-    ', is there more data after this?',
-    result.data.end ? 'no' : 'yes',
-  )
+    offset,
+  }: {
+    limit: number
+    offset: number
+  },
+) {
+  logger.log('# Organization dependencies')
+  logger.log('')
+  logger.log('Request details:')
+  logger.log('- Offset:', offset)
+  logger.log('- Limit:', limit)
+  logger.log('- Is there more data after this?', result.end ? 'no' : 'yes')
+  logger.log('')
 
   const options = {
     columns: [
+      { field: 'type', name: colors.cyan('Ecosystem') },
       { field: 'namespace', name: colors.cyan('Namespace') },
       { field: 'name', name: colors.cyan('Name') },
       { field: 'version', name: colors.cyan('Version') },
       { field: 'repository', name: colors.cyan('Repository') },
       { field: 'branch', name: colors.cyan('Branch') },
-      { field: 'type', name: colors.cyan('Type') },
       { field: 'direct', name: colors.cyan('Direct') },
     ],
   }
 
-  logger.log(chalkTable(options, result.data.rows))
+  logger.log(chalkTable(options, result.rows))
 }
diff --git a/src/commands/package/cmd-package-score.mts b/src/commands/package/cmd-package-score.mts
index 90a99f802..047fa97fe 100644
--- a/src/commands/package/cmd-package-score.mts
+++ b/src/commands/package/cmd-package-score.mts
@@ -25,7 +25,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <<ecosystem> <name> | <purl>>
+      $ ${command} [options] <<ECOSYSTEM> <NAME> | <PURL>>
 
     API Token Requirements
       - Quota: 100 units
@@ -42,18 +42,22 @@ const config: CliCommandConfig = {
     See also the \`socket package shallow\` command, which returns the shallow
     score for any number of packages. That will not reflect the dependency scores.
 
-    Only a few ecosystems are supported like npm, golang, and maven.
+    Only a few ecosystems are supported like npm, pypi, nuget, gem, golang, and maven.
 
     A "purl" is a standard package name formatting: \`pkg:eco/name@version\`
     This command will automatically prepend "pkg:" when not present.
 
-    The version is optional but when given should be a direct match.
+    The version is optional but when given should be a direct match. The \`pkg:\`
+    prefix is optional.
+
+    Note: if a package cannot be found it may be too old or perhaps was removed
+          before we had the opportunity to process it.
 
     Examples
       $ ${command} npm babel-cli
-      $ ${command} npm babel-cli@1.9.1
-      $ ${command} npm/babel-cli@1.9.1
-      $ ${command} pkg:npm/babel-cli@1.9.1
+      $ ${command} npm eslint@1.0.0 --json
+      $ ${command} pkg:golang/github.com/steelpoor/tlsproxy@v0.0.0-20250304082521-29051ed19c60
+      $ ${command} nuget/needpluscommonlibrary@1.0.0 --markdown
   `,
 }
 
diff --git a/src/commands/package/cmd-package-score.test.mts b/src/commands/package/cmd-package-score.test.mts
index 5a552fb20..8082d9539 100644
--- a/src/commands/package/cmd-package-score.test.mts
+++ b/src/commands/package/cmd-package-score.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket package score', async () => {
         "Look up score for one package which reflects all of its transitive dependencies as well
 
           Usage
-            $ socket package score <<ecosystem> <name> | <purl>>
+            $ socket package score [options] <<ECOSYSTEM> <NAME> | <PURL>>
 
           API Token Requirements
             - Quota: 100 units
@@ -37,18 +35,22 @@ describe('socket package score', async () => {
           See also the \`socket package shallow\` command, which returns the shallow
           score for any number of packages. That will not reflect the dependency scores.
 
-          Only a few ecosystems are supported like npm, golang, and maven.
+          Only a few ecosystems are supported like npm, pypi, nuget, gem, golang, and maven.
 
           A "purl" is a standard package name formatting: \`pkg:eco/name@version\`
           This command will automatically prepend "pkg:" when not present.
 
-          The version is optional but when given should be a direct match.
+          The version is optional but when given should be a direct match. The \`pkg:\`
+          prefix is optional.
+
+          Note: if a package cannot be found it may be too old or perhaps was removed
+                before we had the opportunity to process it.
 
           Examples
             $ socket package score npm babel-cli
-            $ socket package score npm babel-cli@1.9.1
-            $ socket package score npm/babel-cli@1.9.1
-            $ socket package score pkg:npm/babel-cli@1.9.1"
+            $ socket package score npm eslint@1.0.0 --json
+            $ socket package score pkg:golang/github.com/steelpoor/tlsproxy@v0.0.0-20250304082521-29051ed19c60
+            $ socket package score nuget/needpluscommonlibrary@1.0.0 --markdown"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -79,7 +81,6 @@ describe('socket package score', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket package score\`, cwd: <redacted>
-
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - First parameter must be an ecosystem or the whole purl (\\x1b[31mbad\\x1b[39m)
diff --git a/src/commands/package/cmd-package-shallow.mts b/src/commands/package/cmd-package-shallow.mts
index 067167da2..796b5945f 100644
--- a/src/commands/package/cmd-package-shallow.mts
+++ b/src/commands/package/cmd-package-shallow.mts
@@ -24,7 +24,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} <<ecosystem> <name> [<name> ...] | <purl> [<purl> ...]>
+      $ ${command} [options] <<ECOSYSTEM> <PKGNAME> [<PKGNAME> ...] | <PURL> [<PURL> ...]>
 
     API Token Requirements
       - Quota: 100 units
@@ -37,13 +37,16 @@ const config: CliCommandConfig = {
     This means that any dependency scores are not reflected by the score. You can
     use the \`socket package score <pkg>\` command to get its full transitive score.
 
-    Only a few ecosystems are supported like npm, golang, and maven.
+    Only a few ecosystems are supported like npm, pypi, nuget, gem, golang, and maven.
 
     A "purl" is a standard package name formatting: \`pkg:eco/name@version\`
     This command will automatically prepend "pkg:" when not present.
 
     If the first arg is an ecosystem, remaining args that are not a purl are
-    assumed to be scoped to that ecosystem.
+    assumed to be scoped to that ecosystem. The \`pkg:\` prefix is optional.
+
+    Note: if a package cannot be found, it may be too old or perhaps was removed
+          before we had the opportunity to process it.
 
     Examples
       $ ${command} npm webtorrent
diff --git a/src/commands/package/cmd-package-shallow.test.mts b/src/commands/package/cmd-package-shallow.test.mts
index 41a55e3b7..2d9f0f17e 100644
--- a/src/commands/package/cmd-package-shallow.test.mts
+++ b/src/commands/package/cmd-package-shallow.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket package shallow', async () => {
         "Look up info regarding one or more packages but not their transitives
 
           Usage
-            $ socket package shallow <<ecosystem> <name> [<name> ...] | <purl> [<purl> ...]>
+            $ socket package shallow [options] <<ECOSYSTEM> <PKGNAME> [<PKGNAME> ...] | <PURL> [<PURL> ...]>
 
           API Token Requirements
             - Quota: 100 units
@@ -33,13 +31,16 @@ describe('socket package shallow', async () => {
           This means that any dependency scores are not reflected by the score. You can
           use the \`socket package score <pkg>\` command to get its full transitive score.
 
-          Only a few ecosystems are supported like npm, golang, and maven.
+          Only a few ecosystems are supported like npm, pypi, nuget, gem, golang, and maven.
 
           A "purl" is a standard package name formatting: \`pkg:eco/name@version\`
           This command will automatically prepend "pkg:" when not present.
 
           If the first arg is an ecosystem, remaining args that are not a purl are
-          assumed to be scoped to that ecosystem.
+          assumed to be scoped to that ecosystem. The \`pkg:\` prefix is optional.
+
+          Note: if a package cannot be found, it may be too old or perhaps was removed
+                before we had the opportunity to process it.
 
           Examples
             $ socket package shallow npm webtorrent
@@ -78,7 +79,6 @@ describe('socket package shallow', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket package shallow\`, cwd: <redacted>
-
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - First parameter should be an ecosystem or all args must be purls (\\x1b[31mbad\\x1b[39m)
diff --git a/src/commands/package/cmd-package.test.mts b/src/commands/package/cmd-package.test.mts
index b9ec3bf01..2857bef89 100644
--- a/src/commands/package/cmd-package.test.mts
+++ b/src/commands/package/cmd-package.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
diff --git a/src/commands/raw-npm/cmd-raw-npm.mts b/src/commands/raw-npm/cmd-raw-npm.mts
index 80741db42..39a45d1af 100644
--- a/src/commands/raw-npm/cmd-raw-npm.mts
+++ b/src/commands/raw-npm/cmd-raw-npm.mts
@@ -15,10 +15,17 @@ const config: CliCommandConfig = {
   flags: {},
   help: command => `
     Usage
-      $ ${command} <command>
+      $ ${command} ...
+
+    This does the opposite of \`socket npm\`: it will execute the real \`npm\`
+    command without Socket. This can be useful when you have the wrapper on
+    and want to install a certain package anyways. Use at your own risk.
+
+    Note: Everything after "raw-npm" is sent straight to the npm command.
+          Only the \`--dryRun\` and \`--help\` flags are caught here.
 
     Examples
-      $ ${command} install
+      $ ${command} install -g socket
   `,
 }
 
diff --git a/src/commands/raw-npm/cmd-raw-npm.test.mts b/src/commands/raw-npm/cmd-raw-npm.test.mts
index ce1a6bb80..450d89d79 100644
--- a/src/commands/raw-npm/cmd-raw-npm.test.mts
+++ b/src/commands/raw-npm/cmd-raw-npm.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,10 +17,17 @@ describe('socket raw-npm', async () => {
         "Temporarily disable the Socket npm wrapper
 
           Usage
-            $ socket raw-npm <command>
+            $ socket raw-npm ...
+
+          This does the opposite of \`socket npm\`: it will execute the real \`npm\`
+          command without Socket. This can be useful when you have the wrapper on
+          and want to install a certain package anyways. Use at your own risk.
+
+          Note: Everything after "raw-npm" is sent straight to the npm command.
+                Only the \`--dryRun\` and \`--help\` flags are caught here.
 
           Examples
-            $ socket raw-npm install"
+            $ socket raw-npm install -g socket"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/raw-npx/cmd-raw-npx.mts b/src/commands/raw-npx/cmd-raw-npx.mts
index 7b38f112a..0e8d7a1d0 100644
--- a/src/commands/raw-npx/cmd-raw-npx.mts
+++ b/src/commands/raw-npx/cmd-raw-npx.mts
@@ -15,10 +15,17 @@ const config: CliCommandConfig = {
   flags: {},
   help: command => `
     Usage
-      $ ${command} <command>
+      $ ${command} ...
+
+    This does the opposite of \`socket npx\`: it will execute the real \`npx\`
+    command without Socket. This can be useful when you have the wrapper on
+    and want to run a certain package anyways. Use at your own risk.
+
+    Note: Everything after "raw-npx" is sent straight to the npx command.
+          Only the \`--dryRun\` and \`--help\` flags are caught here.
 
     Examples
-      $ ${command} install
+      $ ${command} prettier
   `,
 }
 
diff --git a/src/commands/raw-npx/cmd-raw-npx.test.mts b/src/commands/raw-npx/cmd-raw-npx.test.mts
index bd79e9cdf..b4445fb64 100644
--- a/src/commands/raw-npx/cmd-raw-npx.test.mts
+++ b/src/commands/raw-npx/cmd-raw-npx.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,10 +17,17 @@ describe('socket raw-npx', async () => {
         "Temporarily disable the Socket npx wrapper
 
           Usage
-            $ socket raw-npx <command>
+            $ socket raw-npx ...
+
+          This does the opposite of \`socket npx\`: it will execute the real \`npx\`
+          command without Socket. This can be useful when you have the wrapper on
+          and want to run a certain package anyways. Use at your own risk.
+
+          Note: Everything after "raw-npx" is sent straight to the npx command.
+                Only the \`--dryRun\` and \`--help\` flags are caught here.
 
           Examples
-            $ socket raw-npx install"
+            $ socket raw-npx prettier"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
diff --git a/src/commands/report/cmd-report-create.mts b/src/commands/report/cmd-report-create.mts
deleted file mode 100644
index 9c2dc0f65..000000000
--- a/src/commands/report/cmd-report-create.mts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { logger } from '@socketsecurity/registry/lib/logger'
-
-import { commonFlags, outputFlags } from '../../flags.mts'
-import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
-
-import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
-
-const config: CliCommandConfig = {
-  commandName: 'create',
-  description: '[Deprecated] Create a project report',
-  hidden: false,
-  flags: {
-    ...commonFlags,
-    ...outputFlags,
-  },
-  help: () => `
-    This command is deprecated in favor of \`socket scan view\`.
-    It will be removed in the next major release of the CLI.
-  `,
-}
-
-export const cmdReportCreate = {
-  description: config.description,
-  hidden: config.hidden,
-  run,
-}
-
-async function run(
-  argv: string[] | readonly string[],
-  importMeta: ImportMeta,
-  { parentName }: { parentName: string },
-): Promise<void> {
-  meowOrExit({
-    argv,
-    config,
-    importMeta,
-    parentName,
-  })
-
-  logger.fail(
-    'This command has been sunset. Instead, please look at `socket scan create` to create scans and `socket scan report` to view a report of your scans.',
-  )
-
-  process.exitCode = 1
-}
diff --git a/src/commands/report/cmd-report-create.test.mts b/src/commands/report/cmd-report-create.test.mts
deleted file mode 100644
index 3696244f7..000000000
--- a/src/commands/report/cmd-report-create.test.mts
+++ /dev/null
@@ -1,59 +0,0 @@
-import path from 'node:path'
-
-import { describe, expect } from 'vitest'
-
-import constants from '../../../src/constants.mts'
-import { cmdit, invokeNpm } from '../../../test/utils.mts'
-
-describe('socket report create', async () => {
-  // Lazily access constants.binCliPath.
-  const { binCliPath } = constants
-
-  cmdit(
-    ['report', 'create', '--help', '--config', '{}'],
-    'should support --help',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `
-        "[Deprecated] Create a project report
-
-          This command is deprecated in favor of \`socket scan view\`.
-          It will be removed in the next major release of the CLI."
-      `,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket report create\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain(
-        '`socket report create`',
-      )
-    },
-  )
-
-  cmdit(
-    ['report', 'create', '--dry-run', '--config', '{"apiToken":"anything"}'],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`""`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket report create\`, cwd: <redacted>
-
-        \\x1b[31m\\xd7\\x1b[39m This command has been sunset. Instead, please look at \`socket scan create\` to create scans and \`socket scan report\` to view a report of your scans."
-      `)
-
-      expect(code).toBe(1)
-    },
-  )
-})
diff --git a/src/commands/report/cmd-report-view.mts b/src/commands/report/cmd-report-view.mts
deleted file mode 100644
index 215ee4a15..000000000
--- a/src/commands/report/cmd-report-view.mts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { logger } from '@socketsecurity/registry/lib/logger'
-
-import { commonFlags, outputFlags } from '../../flags.mts'
-import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
-
-import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
-
-const config: CliCommandConfig = {
-  commandName: 'view',
-  description: '[Deprecated] View a project report',
-  hidden: false,
-  flags: {
-    ...commonFlags,
-    ...outputFlags,
-  },
-  help: () => `
-    This command is deprecated in favor of \`socket scan view\`.
-    It will be removed in the next major release of the CLI.
-  `,
-}
-
-export const cmdReportView = {
-  description: config.description,
-  hidden: config.hidden,
-  run,
-}
-
-async function run(
-  argv: string[] | readonly string[],
-  importMeta: ImportMeta,
-  { parentName }: { parentName: string },
-): Promise<void> {
-  meowOrExit({
-    argv,
-    config,
-    importMeta,
-    parentName,
-  })
-
-  logger.fail(
-    'This command has been sunset. Instead, please look at `socket scan create` to create scans and `socket scan report` to view a report of your scans.',
-  )
-
-  process.exitCode = 1
-}
diff --git a/src/commands/report/cmd-report-view.test.mts b/src/commands/report/cmd-report-view.test.mts
deleted file mode 100644
index 3696244f7..000000000
--- a/src/commands/report/cmd-report-view.test.mts
+++ /dev/null
@@ -1,59 +0,0 @@
-import path from 'node:path'
-
-import { describe, expect } from 'vitest'
-
-import constants from '../../../src/constants.mts'
-import { cmdit, invokeNpm } from '../../../test/utils.mts'
-
-describe('socket report create', async () => {
-  // Lazily access constants.binCliPath.
-  const { binCliPath } = constants
-
-  cmdit(
-    ['report', 'create', '--help', '--config', '{}'],
-    'should support --help',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `
-        "[Deprecated] Create a project report
-
-          This command is deprecated in favor of \`socket scan view\`.
-          It will be removed in the next major release of the CLI."
-      `,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket report create\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain(
-        '`socket report create`',
-      )
-    },
-  )
-
-  cmdit(
-    ['report', 'create', '--dry-run', '--config', '{"apiToken":"anything"}'],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(`""`)
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket report create\`, cwd: <redacted>
-
-        \\x1b[31m\\xd7\\x1b[39m This command has been sunset. Instead, please look at \`socket scan create\` to create scans and \`socket scan report\` to view a report of your scans."
-      `)
-
-      expect(code).toBe(1)
-    },
-  )
-})
diff --git a/src/commands/report/cmd-report.mts b/src/commands/report/cmd-report.mts
deleted file mode 100644
index 1ca223cce..000000000
--- a/src/commands/report/cmd-report.mts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { cmdReportCreate } from './cmd-report-create.mts'
-import { cmdReportView } from './cmd-report-view.mts'
-import { meowWithSubcommands } from '../../utils/meow-with-subcommands.mts'
-
-import type { CliSubcommand } from '../../utils/meow-with-subcommands.mts'
-
-const description = '[Deprecated] Project report related commands'
-
-export const cmdReport: CliSubcommand = {
-  description,
-  hidden: true, // Deprecated in favor of `scan`
-  async run(argv, importMeta, { parentName }) {
-    await meowWithSubcommands(
-      {
-        create: cmdReportCreate,
-        view: cmdReportView,
-      },
-      {
-        argv,
-        description,
-        importMeta,
-        name: parentName + ' report',
-      },
-    )
-  },
-}
diff --git a/src/commands/report/cmd-report.test.mts b/src/commands/report/cmd-report.test.mts
deleted file mode 100644
index f63be3630..000000000
--- a/src/commands/report/cmd-report.test.mts
+++ /dev/null
@@ -1,69 +0,0 @@
-import path from 'node:path'
-
-import { describe, expect } from 'vitest'
-
-import constants from '../../../src/constants.mts'
-import { cmdit, invokeNpm } from '../../../test/utils.mts'
-
-describe('socket report', async () => {
-  // Lazily access constants.binCliPath.
-  const { binCliPath } = constants
-
-  cmdit(
-    ['report', '--help', '--config', '{}'],
-    'should support --help',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `
-        "[Deprecated] Project report related commands
-
-          Usage
-            $ socket report <command>
-
-          Commands
-            create            [Deprecated] Create a project report
-            view              [Deprecated] View a project report
-
-          Options
-            (none)
-
-          Examples
-            $ socket report --help"
-      `,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket report\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain(
-        '`socket report`',
-      )
-    },
-  )
-
-  cmdit(
-    ['report', '--dry-run', '--config', '{"apiToken":"anything"}'],
-    'should require args with just dry-run',
-    async cmd => {
-      const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
-      expect(stdout).toMatchInlineSnapshot(
-        `"[DryRun]: No-op, call a sub-command; ok"`,
-      )
-      expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-        "
-           _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket report\`, cwd: <redacted>"
-      `)
-
-      expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
-    },
-  )
-})
diff --git a/src/commands/repos/cmd-repos.mts b/src/commands/repos/cmd-repos.mts
deleted file mode 100644
index 0a0ec49dd..000000000
--- a/src/commands/repos/cmd-repos.mts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { cmdReposCreate } from './cmd-repos-create.mts'
-import { cmdReposDel } from './cmd-repos-del.mts'
-import { cmdReposList } from './cmd-repos-list.mts'
-import { cmdReposUpdate } from './cmd-repos-update.mts'
-import { cmdReposView } from './cmd-repos-view.mts'
-import { meowWithSubcommands } from '../../utils/meow-with-subcommands.mts'
-
-import type { CliSubcommand } from '../../utils/meow-with-subcommands.mts'
-
-const description = 'Repositories related commands'
-
-export const cmdRepos: CliSubcommand = {
-  description,
-  async run(argv, importMeta, { parentName }) {
-    await meowWithSubcommands(
-      {
-        create: cmdReposCreate,
-        view: cmdReposView,
-        list: cmdReposList,
-        del: cmdReposDel,
-        update: cmdReposUpdate,
-      },
-      {
-        argv,
-        description,
-        importMeta,
-        name: `${parentName} repos`,
-      },
-    )
-  },
-}
diff --git a/src/commands/repos/cmd-repos-create.mts b/src/commands/repository/cmd-repository-create.mts
similarity index 73%
rename from src/commands/repos/cmd-repos-create.mts
rename to src/commands/repository/cmd-repository-create.mts
index 13d96e88a..b46b8fc1b 100644
--- a/src/commands/repos/cmd-repos-create.mts
+++ b/src/commands/repository/cmd-repository-create.mts
@@ -4,7 +4,6 @@ import { handleCreateRepo } from './handle-create-repo.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -24,13 +23,11 @@ const config: CliCommandConfig = {
     ...outputFlags,
     defaultBranch: {
       type: 'string',
-      shortFlag: 'b',
       default: 'main',
-      description: 'Repository default branch',
+      description: 'Repository default branch. Defaults to "main"',
     },
     homepage: {
       type: 'string',
-      shortFlag: 'h',
       default: '',
       description: 'Repository url',
     },
@@ -47,40 +44,35 @@ const config: CliCommandConfig = {
     },
     repoDescription: {
       type: 'string',
-      shortFlag: 'd',
       default: '',
       description: 'Repository description',
     },
-    repoName: {
-      type: 'string',
-      shortFlag: 'n',
-      default: '',
-      description: 'Repository name',
-    },
     visibility: {
       type: 'string',
-      shortFlag: 'v',
       default: 'private',
       description: 'Repository visibility (Default Private)',
     },
   },
   help: (command, config) => `
     Usage
-      $ ${command} ${isTestingV1() ? '<repo>' : '<org slug> --repo-name=<name>'}
+      $ ${command} [options] <REPO>
 
     API Token Requirements
       - Quota: 1 unit
       - Permissions: repo:create
 
+    The REPO name should be a "slug". Follows the same naming convention as GitHub.
+
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} ${isTestingV1() ? 'test-repo' : 'FakeOrg --repoName=test-repo'}
+      $ ${command} test-repo
+      $ ${command} our-repo --homepage=socket.dev --default-branch=trunk
   `,
 }
 
-export const cmdReposCreate = {
+export const cmdRepositoryCreate = {
   description: config.description,
   hidden: config.hidden,
   run,
@@ -98,43 +90,39 @@ async function run(
     parentName,
   })
 
-  const {
-    dryRun,
-    interactive,
-    json,
-    markdown,
-    org: orgFlag,
-    repoName: repoNameFlag,
-  } = cli.flags
-  const outputKind = getOutputKind(json, markdown) // TODO: impl json/md further
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
+  const outputKind = getOutputKind(json, markdown)
+  const [repoName = ''] = cli.input
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
-  const repoName = (isTestingV1() ? cli.input[0] : repoNameFlag) || ''
-
   const hasApiToken = hasDefaultToken()
 
+  const noLegacy = !cli.flags['repoName']
+
   const wasValidInput = checkCommandInput(
     outputKind,
     {
       nook: true,
       test: !!orgSlug,
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail: 'missing',
     },
+    {
+      nook: true,
+      test: noLegacy,
+      message: 'Legacy flags are no longer supported. See v1 migration guide.',
+      pass: 'ok',
+      fail: `received legacy flags`,
+    },
     {
       test: !!repoName,
-      message: isTestingV1()
-        ? 'Repository name as first argument'
-        : 'Repository name using --repoName',
+      message: 'Repository name as first argument',
       pass: 'ok',
       fail: 'missing',
     },
@@ -146,13 +134,6 @@ async function run(
       pass: 'ok',
       fail: 'missing API token',
     },
-    {
-      nook: true,
-      test: !isTestingV1() || !repoNameFlag,
-      message: 'In v1 the first arg should be the repo, not the flag',
-      pass: 'ok',
-      fail: 'received --repo-name flag',
-    },
   )
   if (!wasValidInput) {
     return
diff --git a/src/commands/repos/cmd-repos-create.test.mts b/src/commands/repository/cmd-repository-create.test.mts
similarity index 77%
rename from src/commands/repos/cmd-repos-create.test.mts
rename to src/commands/repository/cmd-repository-create.test.mts
index 6d440caca..ea58f0612 100644
--- a/src/commands/repos/cmd-repos-create.test.mts
+++ b/src/commands/repository/cmd-repository-create.test.mts
@@ -1,16 +1,14 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
 import { cmdit, invokeNpm } from '../../../test/utils.mts'
 
-describe('socket repos create', async () => {
+describe('socket repository create', async () => {
   // Lazily access constants.binCliPath.
   const { binCliPath } = constants
 
   cmdit(
-    ['repos', 'create', '--help', '--config', '{}'],
+    ['repository', 'create', '--help', '--config', '{}'],
     'should support --help',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -19,25 +17,27 @@ describe('socket repos create', async () => {
         "Create a repository in an organization
 
           Usage
-            $ socket repos create <org slug> --repo-name=<name>
+            $ socket repository create [options] <REPO>
 
           API Token Requirements
             - Quota: 1 unit
             - Permissions: repo:create
 
+          The REPO name should be a "slug". Follows the same naming convention as GitHub.
+
           Options
-            --defaultBranch   Repository default branch
+            --defaultBranch   Repository default branch. Defaults to "main"
             --homepage        Repository url
             --interactive     Allow for interactive elements, asking for input. Use --no-interactive to prevent any input questions, defaulting them to cancel/no.
             --json            Output result as json
             --markdown        Output result as markdown
             --org             Force override the organization slug, overrides the default org from config
             --repoDescription Repository description
-            --repoName        Repository name
             --visibility      Repository visibility (Default Private)
 
           Examples
-            $ socket repos create FakeOrg --repoName=test-repo"
+            $ socket repository create test-repo
+            $ socket repository create our-repo --homepage=socket.dev --default-branch=trunk"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -45,18 +45,18 @@ describe('socket repos create', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos create\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>"
       `)
 
       expect(code, 'explicit help should exit with code 0').toBe(0)
       expect(stderr, 'banner includes base command').toContain(
-        '`socket repos create`',
+        '`socket repository create`',
       )
     },
   )
 
   cmdit(
-    ['repos', 'create', '--dry-run', '--config', '{}'],
+    ['repository', 'create', '--dry-run', '--config', '{}'],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -66,13 +66,15 @@ describe('socket repos create', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos create\`, cwd: <redacted>
-
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
-          - Repository name using --repoName (\\x1b[31mmissing\\x1b[39m)
+          - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
@@ -84,11 +86,12 @@ describe('socket repos create', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'create',
       'a',
-      '--repoName',
       'b',
+      '--org',
+      'fakeorg',
       '--dry-run',
       '--config',
       '{"apiToken":"anything"}',
@@ -102,7 +105,7 @@ describe('socket repos create', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos create\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -111,25 +114,23 @@ describe('socket repos create', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'create',
       'reponame',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should report missing org name in v1',
+    'should report missing org name',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos create\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>
         \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
         \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
         \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
@@ -147,24 +148,22 @@ describe('socket repos create', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'create',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should only report missing repo name with default org in v1',
+    'should only report missing repo name with default org',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos create\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
@@ -177,26 +176,24 @@ describe('socket repos create', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'create',
       '--org',
       'forcedorg',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should only report missing repo name with --org flag in v1',
+    'should only report missing repo name with --org flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos create\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
@@ -209,25 +206,23 @@ describe('socket repos create', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'create',
       'fakerepo',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should run to dryrun in v1',
+    'should run to dryrun',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos create\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/repos/cmd-repos-del.mts b/src/commands/repository/cmd-repository-del.mts
similarity index 79%
rename from src/commands/repos/cmd-repos-del.mts
rename to src/commands/repository/cmd-repository-del.mts
index f99cfc05b..353aeea5b 100644
--- a/src/commands/repos/cmd-repos-del.mts
+++ b/src/commands/repository/cmd-repository-del.mts
@@ -4,7 +4,6 @@ import { handleDeleteRepo } from './handle-delete-repo.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -36,7 +35,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} ${isTestingV1() ? '<repo>' : '<org slug> --repo-name=<name>'}
+      $ ${command} [options] <REPO>
 
     API Token Requirements
       - Quota: 1 unit
@@ -46,11 +45,11 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} ${isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
+      $ ${command} test-repo
   `,
 }
 
-export const cmdReposDel = {
+export const cmdRepositoryDel = {
   description: config.description,
   hidden: config.hidden,
   run,
@@ -70,35 +69,37 @@ async function run(
 
   const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
   const outputKind = getOutputKind(json, markdown)
+  const [repoName = ''] = cli.input
 
-  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+  const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
-  const repoName =
-    (defaultOrgSlug || isTestingV1() ? cli.input[0] : cli.input[1]) || ''
-
   const hasApiToken = hasDefaultToken()
 
+  const noLegacy = !cli.flags['repoName']
+
   const wasValidInput = checkCommandInput(
     outputKind,
+    {
+      nook: true,
+      test: noLegacy,
+      message: 'Legacy flags are no longer supported. See v1 migration guide.',
+      pass: 'ok',
+      fail: `received legacy flags`,
+    },
     {
       nook: true,
       test: !!orgSlug,
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail: 'missing',
     },
     {
       test: !!repoName,
-      message: isTestingV1()
-        ? 'Repository name as first argument'
-        : 'Repository name using --repoName',
+      message: 'Repository name as first argument',
       pass: 'ok',
       fail: 'missing',
     },
diff --git a/src/commands/repos/cmd-repos-del.test.mts b/src/commands/repository/cmd-repository-del.test.mts
similarity index 78%
rename from src/commands/repos/cmd-repos-del.test.mts
rename to src/commands/repository/cmd-repository-del.test.mts
index f4792e648..9e9d8736a 100644
--- a/src/commands/repos/cmd-repos-del.test.mts
+++ b/src/commands/repository/cmd-repository-del.test.mts
@@ -1,16 +1,14 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
 import { cmdit, invokeNpm } from '../../../test/utils.mts'
 
-describe('socket repos del', async () => {
+describe('socket repository del', async () => {
   // Lazily access constants.binCliPath.
   const { binCliPath } = constants
 
   cmdit(
-    ['repos', 'del', '--help', '--config', '{}'],
+    ['repository', 'del', '--help', '--config', '{}'],
     'should support --help',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -19,7 +17,7 @@ describe('socket repos del', async () => {
         "Delete a repository in an organization
 
           Usage
-            $ socket repos del <org slug> --repo-name=<name>
+            $ socket repository del [options] <REPO>
 
           API Token Requirements
             - Quota: 1 unit
@@ -32,7 +30,7 @@ describe('socket repos del', async () => {
             --org             Force override the organization slug, overrides the default org from config
 
           Examples
-            $ socket repos del FakeOrg test-repo"
+            $ socket repository del test-repo"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -40,18 +38,18 @@ describe('socket repos del', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos del\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>"
       `)
 
       expect(code, 'explicit help should exit with code 0').toBe(0)
       expect(stderr, 'banner includes base command').toContain(
-        '`socket repos del`',
+        '`socket repository del`',
       )
     },
   )
 
   cmdit(
-    ['repos', 'del', '--dry-run', '--config', '{}'],
+    ['repository', 'del', '--dry-run', '--config', '{}'],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -61,13 +59,15 @@ describe('socket repos del', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos del\`, cwd: <redacted>
-
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
-          - Repository name using --repoName (\\x1b[31mmissing\\x1b[39m)
+          - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
@@ -79,10 +79,12 @@ describe('socket repos del', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'del',
       'a',
       'b',
+      '--org',
+      'xyz',
       '--dry-run',
       '--config',
       '{"apiToken":"anything"}',
@@ -96,7 +98,7 @@ describe('socket repos del', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos del\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -105,25 +107,23 @@ describe('socket repos del', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'del',
       'reponame',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should report missing org name in v1',
+    'should report missing org name',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos del\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>
         \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
         \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
         \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
@@ -141,24 +141,22 @@ describe('socket repos del', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'del',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should only report missing repo name with default org in v1',
+    'should only report missing repo name with default org',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos del\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
@@ -171,26 +169,24 @@ describe('socket repos del', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'del',
       '--org',
       'forcedorg',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should only report missing repo name with --org flag in v1',
+    'should only report missing repo name with --org flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos del\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
@@ -203,25 +199,23 @@ describe('socket repos del', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'del',
       'fakerepo',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should run to dryrun in v1',
+    'should run to dryrun',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos del\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/repos/cmd-repos-list.mts b/src/commands/repository/cmd-repository-list.mts
similarity index 91%
rename from src/commands/repos/cmd-repos-list.mts
rename to src/commands/repository/cmd-repository-list.mts
index e64ea6190..c1ef97c4b 100644
--- a/src/commands/repos/cmd-repos-list.mts
+++ b/src/commands/repository/cmd-repository-list.mts
@@ -4,7 +4,6 @@ import { handleListRepos } from './handle-list-repos.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -65,7 +64,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} ${isTestingV1() ? '' : '<org slug>'}
+      $ ${command} [options]
 
     API Token Requirements
       - Quota: 1 unit
@@ -75,11 +74,12 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} ${isTestingV1() ? '' : '<org slug>'}
+      $ ${command}
+      $ ${command} --json
   `,
 }
 
-export const cmdReposList = {
+export const cmdRepositoryList = {
   description: config.description,
   hidden: config.hidden,
   run,
@@ -110,7 +110,6 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
@@ -122,9 +121,7 @@ async function run(
     {
       nook: true,
       test: !!orgSlug,
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail: 'missing',
     },
diff --git a/src/commands/repos/cmd-repos-list.test.mts b/src/commands/repository/cmd-repository-list.test.mts
similarity index 81%
rename from src/commands/repos/cmd-repos-list.test.mts
rename to src/commands/repository/cmd-repository-list.test.mts
index 0e3e9f7cc..6045a3d65 100644
--- a/src/commands/repos/cmd-repos-list.test.mts
+++ b/src/commands/repository/cmd-repository-list.test.mts
@@ -5,12 +5,12 @@ import { describe, expect } from 'vitest'
 import constants from '../../../src/constants.mts'
 import { cmdit, invokeNpm } from '../../../test/utils.mts'
 
-describe('socket repos list', async () => {
+describe('socket repository list', async () => {
   // Lazily access constants.binCliPath.
   const { binCliPath } = constants
 
   cmdit(
-    ['repos', 'list', '--help', '--config', '{}'],
+    ['repository', 'list', '--help', '--config', '{}'],
     'should support --help',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -19,7 +19,7 @@ describe('socket repos list', async () => {
         "List repositories in an organization
 
           Usage
-            $ socket repos list <org slug>
+            $ socket repository list [options]
 
           API Token Requirements
             - Quota: 1 unit
@@ -37,7 +37,8 @@ describe('socket repos list', async () => {
             --sort            Sorting option
 
           Examples
-            $ socket repos list <org slug>"
+            $ socket repository list
+            $ socket repository list --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -45,18 +46,18 @@ describe('socket repos list', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos list\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository list\`, cwd: <redacted>"
       `)
 
       expect(code, 'explicit help should exit with code 0').toBe(0)
       expect(stderr, 'banner includes base command').toContain(
-        '`socket repos list`',
+        '`socket repository list`',
       )
     },
   )
 
   cmdit(
-    ['repos', 'list', '--dry-run', '--config', '{}'],
+    ['repository', 'list', '--dry-run', '--config', '{}'],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -66,11 +67,13 @@ describe('socket repos list', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos list\`, cwd: <redacted>
-
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository list\`, cwd: <redacted>
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
@@ -81,7 +84,16 @@ describe('socket repos list', async () => {
   )
 
   cmdit(
-    ['repos', 'list', 'a', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    [
+      'repository',
+      'list',
+      'a',
+      '--org',
+      'fakeorg',
+      '--dry-run',
+      '--config',
+      '{"apiToken":"anything"}',
+    ],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -91,7 +103,7 @@ describe('socket repos list', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos list\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository list\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -99,25 +111,17 @@ describe('socket repos list', async () => {
   )
 
   cmdit(
-    [
-      'repos',
-      'list',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should report missing org name in v1',
+    ['repository', 'list', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should report missing org name',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos list\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository list\`, cwd: <redacted>
         \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
         \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
         \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
@@ -133,24 +137,22 @@ describe('socket repos list', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'list',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should accept default org in v1',
+    'should accept default org',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos list\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository list\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -159,26 +161,24 @@ describe('socket repos list', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'list',
       '--org',
       'forcedorg',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should accept --org flag in v1',
+    'should accept --org flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos list\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository list\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/repos/cmd-repos-update.mts b/src/commands/repository/cmd-repository-update.mts
similarity index 77%
rename from src/commands/repos/cmd-repos-update.mts
rename to src/commands/repository/cmd-repository-update.mts
index 9d7ccd165..63c030cc4 100644
--- a/src/commands/repos/cmd-repos-update.mts
+++ b/src/commands/repository/cmd-repository-update.mts
@@ -4,7 +4,6 @@ import { handleUpdateRepo } from './handle-update-repo.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -45,12 +44,6 @@ const config: CliCommandConfig = {
       description:
         'Force override the organization slug, overrides the default org from config',
     },
-    repoName: {
-      type: 'string',
-      shortFlag: 'n',
-      default: '',
-      description: 'Repository name',
-    },
     repoDescription: {
       type: 'string',
       shortFlag: 'd',
@@ -66,7 +59,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} ${isTestingV1() ? '<repo>' : '<org slug> --repo-name=<name>'}
+      $ ${command} [options] <REPO>
 
     API Token Requirements
       - Quota: 1 unit
@@ -76,11 +69,12 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} ${isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
+      $ ${command} test-repo
+      $ ${command} test-repo --homepage https://example.com
   `,
 }
 
-export const cmdReposUpdate = {
+export const cmdRepositoryUpdate = {
   description: config.description,
   hidden: config.hidden,
   run,
@@ -99,36 +93,38 @@ async function run(
   })
 
   const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
-  const outputKind = getOutputKind(json, markdown) // TODO: impl json/md further
+  const outputKind = getOutputKind(json, markdown)
+  const [repoName = ''] = cli.input
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
-  const repoNameFlag = cli.flags['repoName']
-  const repoName = (isTestingV1() ? cli.input[0] : repoNameFlag) || ''
-
   const hasApiToken = hasDefaultToken()
 
+  const noLegacy = !cli.flags['repoName']
+
   const wasValidInput = checkCommandInput(
     outputKind,
+    {
+      nook: true,
+      test: noLegacy,
+      message: 'Legacy flags are no longer supported. See v1 migration guide.',
+      pass: 'ok',
+      fail: `received legacy flags`,
+    },
     {
       nook: true,
       test: !!orgSlug,
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail: 'missing',
     },
     {
       test: !!repoName,
-      message: isTestingV1()
-        ? 'Repository name as first argument'
-        : 'Repository name using --repoName',
+      message: 'Repository name as first argument',
       pass: 'ok',
       fail: 'missing',
     },
@@ -140,13 +136,6 @@ async function run(
       pass: 'ok',
       fail: 'missing API token',
     },
-    {
-      nook: true,
-      test: !isTestingV1() || !repoNameFlag,
-      message: 'In v1 the first arg should be the repo, not the flag',
-      pass: 'ok',
-      fail: 'received --repo-name flag',
-    },
   )
   if (!wasValidInput) {
     return
diff --git a/src/commands/repos/cmd-repos-update.test.mts b/src/commands/repository/cmd-repository-update.test.mts
similarity index 77%
rename from src/commands/repos/cmd-repos-update.test.mts
rename to src/commands/repository/cmd-repository-update.test.mts
index 9f8c8cf04..e93e2f0cc 100644
--- a/src/commands/repos/cmd-repos-update.test.mts
+++ b/src/commands/repository/cmd-repository-update.test.mts
@@ -1,16 +1,14 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
 import { cmdit, invokeNpm } from '../../../test/utils.mts'
 
-describe('socket repos update', async () => {
+describe('socket repository update', async () => {
   // Lazily access constants.binCliPath.
   const { binCliPath } = constants
 
   cmdit(
-    ['repos', 'update', '--help', '--config', '{}'],
+    ['repository', 'update', '--help', '--config', '{}'],
     'should support --help',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -19,7 +17,7 @@ describe('socket repos update', async () => {
         "Update a repository in an organization
 
           Usage
-            $ socket repos update <org slug> --repo-name=<name>
+            $ socket repository update [options] <REPO>
 
           API Token Requirements
             - Quota: 1 unit
@@ -33,11 +31,11 @@ describe('socket repos update', async () => {
             --markdown        Output result as markdown
             --org             Force override the organization slug, overrides the default org from config
             --repoDescription Repository description
-            --repoName        Repository name
             --visibility      Repository visibility (Default Private)
 
           Examples
-            $ socket repos update FakeOrg test-repo"
+            $ socket repository update test-repo
+            $ socket repository update test-repo --homepage https://example.com"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -45,18 +43,18 @@ describe('socket repos update', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos update\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository update\`, cwd: <redacted>"
       `)
 
       expect(code, 'explicit help should exit with code 0').toBe(0)
       expect(stderr, 'banner includes base command').toContain(
-        '`socket repos update`',
+        '`socket repository update`',
       )
     },
   )
 
   cmdit(
-    ['repos', 'update', '--dry-run', '--config', '{}'],
+    ['repository', 'update', '--dry-run', '--config', '{}'],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -66,13 +64,15 @@ describe('socket repos update', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos update\`, cwd: <redacted>
-
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository update\`, cwd: <redacted>
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
-          - Repository name using --repoName (\\x1b[31mmissing\\x1b[39m)
+          - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
@@ -84,25 +84,23 @@ describe('socket repos update', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'update',
       'reponame',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should report missing org name in v1',
+    'should report missing org name',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos update\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository update\`, cwd: <redacted>
         \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
         \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
         \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
@@ -120,24 +118,22 @@ describe('socket repos update', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'update',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should only report missing repo name with default org in v1',
+    'should only report missing repo name with default org',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos update\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository update\`, cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
@@ -150,26 +146,24 @@ describe('socket repos update', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'update',
       '--org',
       'forcedorg',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should only report missing repo name with --org flag in v1',
+    'should only report missing repo name with --org flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos update\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository update\`, cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
@@ -182,25 +176,23 @@ describe('socket repos update', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'update',
       'fakerepo',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should run to dryrun in v1',
+    'should run to dryrun',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos update\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository update\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/repos/cmd-repos-view.mts b/src/commands/repository/cmd-repository-view.mts
similarity index 74%
rename from src/commands/repos/cmd-repos-view.mts
rename to src/commands/repository/cmd-repository-view.mts
index f8a96501a..d3711adbf 100644
--- a/src/commands/repos/cmd-repos-view.mts
+++ b/src/commands/repository/cmd-repository-view.mts
@@ -4,7 +4,6 @@ import { handleViewRepo } from './handle-view-repo.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -33,15 +32,10 @@ const config: CliCommandConfig = {
       description:
         'Force override the organization slug, overrides the default org from config',
     },
-    repoName: {
-      description: 'The repository to check',
-      default: '',
-      type: 'string',
-    },
   },
   help: (command, config) => `
     Usage
-      $ ${command} ${isTestingV1() ? '<repo>' : '<org slug> --repo-name=<name>'}
+      $ ${command} [options] <REPO>
 
     API Token Requirements
       - Quota: 1 unit
@@ -51,11 +45,12 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command} ${isTestingV1() ? 'test-repo' : 'FakeOrg test-repo'}
+      $ ${command} test-repo
+      $ ${command} test-repo --json
   `,
 }
 
-export const cmdReposView = {
+export const cmdRepositoryView = {
   description: config.description,
   hidden: config.hidden,
   run,
@@ -73,43 +68,39 @@ async function run(
     parentName,
   })
 
-  const {
-    dryRun,
-    interactive,
-    json,
-    markdown,
-    org: orgFlag,
-    repoName: repoNameFlag,
-  } = cli.flags
+  const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
   const outputKind = getOutputKind(json, markdown)
+  const [repoName = ''] = cli.input
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
-  const repoName = (isTestingV1() ? cli.input[0] : repoNameFlag) || ''
-
   const hasApiToken = hasDefaultToken()
 
+  const noLegacy = !cli.flags['repoName']
+
   const wasValidInput = checkCommandInput(
     outputKind,
+    {
+      nook: true,
+      test: noLegacy,
+      message: 'Legacy flags are no longer supported. See v1 migration guide.',
+      pass: 'ok',
+      fail: `received legacy flags`,
+    },
     {
       nook: true,
       test: !!orgSlug,
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail: 'missing',
     },
     {
       test: !!repoName,
-      message: isTestingV1()
-        ? 'Repository name as first argument'
-        : 'Repository name using --repoName',
+      message: 'Repository name as first argument',
       pass: 'ok',
       fail: 'missing',
     },
@@ -129,13 +120,6 @@ async function run(
       pass: 'ok',
       fail: 'missing API token',
     },
-    {
-      nook: true,
-      test: !isTestingV1() || !repoNameFlag,
-      message: 'In v1 the first arg should be the repo, not the flag',
-      pass: 'ok',
-      fail: 'received --repo-name flag',
-    },
   )
   if (!wasValidInput) {
     return
diff --git a/src/commands/repos/cmd-repos-view.test.mts b/src/commands/repository/cmd-repository-view.test.mts
similarity index 78%
rename from src/commands/repos/cmd-repos-view.test.mts
rename to src/commands/repository/cmd-repository-view.test.mts
index 867a0a782..a76c74384 100644
--- a/src/commands/repos/cmd-repos-view.test.mts
+++ b/src/commands/repository/cmd-repository-view.test.mts
@@ -1,16 +1,14 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
 import { cmdit, invokeNpm } from '../../../test/utils.mts'
 
-describe('socket repos view', async () => {
+describe('socket repository view', async () => {
   // Lazily access constants.binCliPath.
   const { binCliPath } = constants
 
   cmdit(
-    ['repos', 'view', '--help', '--config', '{}'],
+    ['repository', 'view', '--help', '--config', '{}'],
     'should support --help',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -19,7 +17,7 @@ describe('socket repos view', async () => {
         "View repositories in an organization
 
           Usage
-            $ socket repos view <org slug> --repo-name=<name>
+            $ socket repository view [options] <REPO>
 
           API Token Requirements
             - Quota: 1 unit
@@ -30,10 +28,10 @@ describe('socket repos view', async () => {
             --json            Output result as json
             --markdown        Output result as markdown
             --org             Force override the organization slug, overrides the default org from config
-            --repoName        The repository to check
 
           Examples
-            $ socket repos view FakeOrg test-repo"
+            $ socket repository view test-repo
+            $ socket repository view test-repo --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -41,18 +39,18 @@ describe('socket repos view', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos view\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>"
       `)
 
       expect(code, 'explicit help should exit with code 0').toBe(0)
       expect(stderr, 'banner includes base command').toContain(
-        '`socket repos view`',
+        '`socket repository view`',
       )
     },
   )
 
   cmdit(
-    ['repos', 'view', '--dry-run', '--config', '{}'],
+    ['repository', 'view', '--dry-run', '--config', '{}'],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -62,13 +60,15 @@ describe('socket repos view', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos view\`, cwd: <redacted>
-
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
-          - Repository name using --repoName (\\x1b[31mmissing\\x1b[39m)
+          - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
@@ -80,11 +80,12 @@ describe('socket repos view', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'view',
       'a',
-      '--repoName',
       'b',
+      '--org',
+      'fakeorg',
       '--dry-run',
       '--config',
       '{"apiToken":"anything"}',
@@ -98,7 +99,7 @@ describe('socket repos view', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos view\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -107,25 +108,23 @@ describe('socket repos view', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'view',
       'reponame',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should report missing org name in v1',
+    'should report missing org name',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos view\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>
         \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
         \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
         \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
@@ -143,24 +142,22 @@ describe('socket repos view', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'view',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should only report missing repo name with default org in v1',
+    'should only report missing repo name with default org',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos view\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
@@ -173,26 +170,24 @@ describe('socket repos view', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'view',
       '--org',
       'forcedorg',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should only report missing repo name with --org flag in v1',
+    'should only report missing repo name with --org flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos view\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Repository name as first argument (\\x1b[31mmissing\\x1b[39m)
@@ -205,25 +200,23 @@ describe('socket repos view', async () => {
 
   cmdit(
     [
-      'repos',
+      'repository',
       'view',
       'fakerepo',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should run to dryrun in v1',
+    'should run to dryrun',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos view\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/repository/cmd-repository.mts b/src/commands/repository/cmd-repository.mts
new file mode 100644
index 000000000..510e13dd4
--- /dev/null
+++ b/src/commands/repository/cmd-repository.mts
@@ -0,0 +1,31 @@
+import { cmdRepositoryCreate } from './cmd-repository-create.mts'
+import { cmdRepositoryDel } from './cmd-repository-del.mts'
+import { cmdRepositoryList } from './cmd-repository-list.mts'
+import { cmdRepositoryUpdate } from './cmd-repository-update.mts'
+import { cmdRepositoryView } from './cmd-repository-view.mts'
+import { meowWithSubcommands } from '../../utils/meow-with-subcommands.mts'
+
+import type { CliSubcommand } from '../../utils/meow-with-subcommands.mts'
+
+const description = 'Repository related commands'
+
+export const cmdRepository: CliSubcommand = {
+  description,
+  async run(argv, importMeta, { parentName }) {
+    await meowWithSubcommands(
+      {
+        create: cmdRepositoryCreate,
+        view: cmdRepositoryView,
+        list: cmdRepositoryList,
+        del: cmdRepositoryDel,
+        update: cmdRepositoryUpdate,
+      },
+      {
+        argv,
+        description,
+        importMeta,
+        name: `${parentName} repository`,
+      },
+    )
+  },
+}
diff --git a/src/commands/repos/cmd-repos.test.mts b/src/commands/repository/cmd-repository.test.mts
similarity index 81%
rename from src/commands/repos/cmd-repos.test.mts
rename to src/commands/repository/cmd-repository.test.mts
index e588d7d47..1a8e9db0d 100644
--- a/src/commands/repos/cmd-repos.test.mts
+++ b/src/commands/repository/cmd-repository.test.mts
@@ -1,25 +1,23 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
 import { cmdit, invokeNpm } from '../../../test/utils.mts'
 
-describe('socket repos', async () => {
+describe('socket repository', async () => {
   // Lazily access constants.binCliPath.
   const { binCliPath } = constants
 
   cmdit(
-    ['repos', '--help', '--config', '{}'],
+    ['repository', '--help', '--config', '{}'],
     'should support --help',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(
         `
-        "Repositories related commands
+        "Repository related commands
 
           Usage
-            $ socket repos <command>
+            $ socket repository <command>
 
           Commands
             create            Create a repository in an organization
@@ -32,7 +30,7 @@ describe('socket repos', async () => {
             (none)
 
           Examples
-            $ socket repos --help"
+            $ socket repository --help"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -40,16 +38,18 @@ describe('socket repos', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository\`, cwd: <redacted>"
       `)
 
       expect(code, 'explicit help should exit with code 0').toBe(0)
-      expect(stderr, 'banner includes base command').toContain('`socket repos`')
+      expect(stderr, 'banner includes base command').toContain(
+        '`socket repository`',
+      )
     },
   )
 
   cmdit(
-    ['repos', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    ['repository', '--dry-run', '--config', '{"apiToken":"anything"}'],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -61,7 +61,7 @@ describe('socket repos', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repos\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/repos/fetch-create-repo.mts b/src/commands/repository/fetch-create-repo.mts
similarity index 100%
rename from src/commands/repos/fetch-create-repo.mts
rename to src/commands/repository/fetch-create-repo.mts
diff --git a/src/commands/repos/fetch-delete-repo.mts b/src/commands/repository/fetch-delete-repo.mts
similarity index 100%
rename from src/commands/repos/fetch-delete-repo.mts
rename to src/commands/repository/fetch-delete-repo.mts
diff --git a/src/commands/repos/fetch-list-all-repos.mts b/src/commands/repository/fetch-list-all-repos.mts
similarity index 100%
rename from src/commands/repos/fetch-list-all-repos.mts
rename to src/commands/repository/fetch-list-all-repos.mts
diff --git a/src/commands/repos/fetch-list-repos.mts b/src/commands/repository/fetch-list-repos.mts
similarity index 100%
rename from src/commands/repos/fetch-list-repos.mts
rename to src/commands/repository/fetch-list-repos.mts
diff --git a/src/commands/repos/fetch-update-repo.mts b/src/commands/repository/fetch-update-repo.mts
similarity index 100%
rename from src/commands/repos/fetch-update-repo.mts
rename to src/commands/repository/fetch-update-repo.mts
diff --git a/src/commands/repos/fetch-view-repo.mts b/src/commands/repository/fetch-view-repo.mts
similarity index 100%
rename from src/commands/repos/fetch-view-repo.mts
rename to src/commands/repository/fetch-view-repo.mts
diff --git a/src/commands/repos/handle-create-repo.mts b/src/commands/repository/handle-create-repo.mts
similarity index 100%
rename from src/commands/repos/handle-create-repo.mts
rename to src/commands/repository/handle-create-repo.mts
diff --git a/src/commands/repos/handle-delete-repo.mts b/src/commands/repository/handle-delete-repo.mts
similarity index 100%
rename from src/commands/repos/handle-delete-repo.mts
rename to src/commands/repository/handle-delete-repo.mts
diff --git a/src/commands/repos/handle-list-repos.mts b/src/commands/repository/handle-list-repos.mts
similarity index 100%
rename from src/commands/repos/handle-list-repos.mts
rename to src/commands/repository/handle-list-repos.mts
diff --git a/src/commands/repos/handle-update-repo.mts b/src/commands/repository/handle-update-repo.mts
similarity index 100%
rename from src/commands/repos/handle-update-repo.mts
rename to src/commands/repository/handle-update-repo.mts
diff --git a/src/commands/repos/handle-view-repo.mts b/src/commands/repository/handle-view-repo.mts
similarity index 100%
rename from src/commands/repos/handle-view-repo.mts
rename to src/commands/repository/handle-view-repo.mts
diff --git a/src/commands/repos/output-create-repo.mts b/src/commands/repository/output-create-repo.mts
similarity index 100%
rename from src/commands/repos/output-create-repo.mts
rename to src/commands/repository/output-create-repo.mts
diff --git a/src/commands/repos/output-delete-repo.mts b/src/commands/repository/output-delete-repo.mts
similarity index 100%
rename from src/commands/repos/output-delete-repo.mts
rename to src/commands/repository/output-delete-repo.mts
diff --git a/src/commands/repos/output-list-repos.mts b/src/commands/repository/output-list-repos.mts
similarity index 100%
rename from src/commands/repos/output-list-repos.mts
rename to src/commands/repository/output-list-repos.mts
diff --git a/src/commands/repos/output-update-repo.mts b/src/commands/repository/output-update-repo.mts
similarity index 100%
rename from src/commands/repos/output-update-repo.mts
rename to src/commands/repository/output-update-repo.mts
diff --git a/src/commands/repos/output-view-repo.mts b/src/commands/repository/output-view-repo.mts
similarity index 100%
rename from src/commands/repos/output-view-repo.mts
rename to src/commands/repository/output-view-repo.mts
diff --git a/src/commands/scan/cmd-scan-create.mts b/src/commands/scan/cmd-scan-create.mts
index ba0902207..fd8ed78ec 100644
--- a/src/commands/scan/cmd-scan-create.mts
+++ b/src/commands/scan/cmd-scan-create.mts
@@ -8,7 +8,6 @@ import { suggestTarget } from './suggest_target.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -116,7 +115,7 @@ const config: CliCommandConfig = {
   // TODO: your project's "socket.yml" file's "projectIgnorePaths"
   help: (command, config) => `
     Usage
-      $ ${command} [options]${isTestingV1() ? '' : ' <org>'} [TARGET...]
+      $ ${command} [options] [TARGET...]
 
     API Token Requirements
       - Quota: 1 unit
@@ -156,8 +155,9 @@ const config: CliCommandConfig = {
     You can use \`socket scan setup\` to configure certain repo flag defaults.
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'}
-      $ ${command} --repo=test-repo --branch=main${isTestingV1() ? '' : ' FakeOrg'} ./package.json
+      $ ${command}
+      $ ${command} ./proj --json
+      $ ${command} --repo=test-repo --branch=main ./package.json
   `,
 }
 
@@ -225,20 +225,14 @@ async function run(
 
   const pendingHead = tmp ? false : pendingHeadFlag
 
-  let [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+  let [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     interactive,
     dryRun,
   )
-  if (!defaultOrgSlug) {
-    // Tmp. just for TS. will drop this later.
-    defaultOrgSlug = ''
-  }
 
   // Accept zero or more paths. Default to cwd() if none given.
-  let targets =
-    cli.input.slice(isTestingV1() || defaultOrgSlug ? 0 : 1) || process.cwd()
+  let targets = cli.input || [process.cwd()]
 
   const cwd =
     cwdOverride && cwdOverride !== 'process.cwd()'
@@ -325,30 +319,30 @@ async function run(
     )
     logger.info('```')
     logger.info(
-      `    socket scan create [other flags...] ${defaultOrgSlug ? '' : orgSlug} ${targets.join(' ')}`,
+      `    socket scan create [other flags...] ${orgSlug} ${targets.join(' ')}`,
     )
-    logger.info('```\n')
+    logger.info('```')
+    logger.error('')
+    logger.info(
+      'You can also run `socket scan setup` to persist these flag defaults to a socket.json file.',
+    )
+    logger.error('')
   }
 
   const wasValidInput = checkCommandInput(
     outputKind,
     {
-      nook: !isTestingV1() && !!defaultOrgSlug,
-      test: !!orgSlug && orgSlug !== '.',
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      nook: true,
+      test: !!orgSlug,
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
-      fail:
-        orgSlug === '.'
-          ? 'dot is an invalid org, most likely you forgot the org name here?'
-          : 'missing',
+      fail: 'missing',
     },
     {
       test: !!targets.length,
       message: 'At least one TARGET (e.g. `.` or `./package.json`)',
       pass: 'ok',
-      fail: 'missing (or perhaps you forgot the org slug?)',
+      fail: 'missing',
     },
     {
       nook: true,
diff --git a/src/commands/scan/cmd-scan-create.test.mts b/src/commands/scan/cmd-scan-create.test.mts
index 2d2feadc5..5b2099f6b 100644
--- a/src/commands/scan/cmd-scan-create.test.mts
+++ b/src/commands/scan/cmd-scan-create.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -18,7 +16,7 @@ describe('socket scan create', async () => {
         "Create a scan
 
           Usage
-            $ socket scan create [options] <org> [TARGET...]
+            $ socket scan create [options] [TARGET...]
 
           API Token Requirements
             - Quota: 1 unit
@@ -74,8 +72,9 @@ describe('socket scan create', async () => {
           You can use \`socket scan setup\` to configure certain repo flag defaults.
 
           Examples
-            $ socket scan create FakeOrg
-            $ socket scan create --repo=test-repo --branch=main FakeOrg ./package.json"
+            $ socket scan create
+            $ socket scan create ./proj --json
+            $ socket scan create --repo=test-repo --branch=main ./package.json"
       `)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
@@ -96,6 +95,7 @@ describe('socket scan create', async () => {
     [
       'scan',
       'create',
+      '--org',
       'fakeorg',
       'target',
       '--dry-run',
diff --git a/src/commands/scan/cmd-scan-del.mts b/src/commands/scan/cmd-scan-del.mts
index 4504f41d1..94be9ff13 100644
--- a/src/commands/scan/cmd-scan-del.mts
+++ b/src/commands/scan/cmd-scan-del.mts
@@ -4,7 +4,6 @@ import { handleDeleteScan } from './handle-delete-scan.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -36,7 +35,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <scan ID>
+      $ ${command} [options] <SCAN_ID>
 
     API Token Requirements
       - Quota: 1 unit
@@ -46,7 +45,8 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command} 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json
   `,
 }
 
@@ -70,31 +70,24 @@ async function run(
 
   const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
   const outputKind = getOutputKind(json, markdown)
+  const [scanId = ''] = cli.input
 
   const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
-  const scanId =
-    (isTestingV1() || defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
   const hasApiToken = hasDefaultToken()
 
   const wasValidInput = checkCommandInput(
     outputKind,
     {
       nook: !!defaultOrgSlug,
-      test: !!orgSlug && orgSlug !== '.',
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      test: !!orgSlug,
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
-      fail:
-        orgSlug === '.'
-          ? 'dot is an invalid org, most likely you forgot the org name here?'
-          : 'missing',
+      fail: 'missing',
     },
     {
       test: !!scanId,
diff --git a/src/commands/scan/cmd-scan-del.test.mts b/src/commands/scan/cmd-scan-del.test.mts
index 942ce88e3..ec4e23d6e 100644
--- a/src/commands/scan/cmd-scan-del.test.mts
+++ b/src/commands/scan/cmd-scan-del.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket scan del', async () => {
         "Delete a scan
 
           Usage
-            $ socket scan del <org slug> <scan ID>
+            $ socket scan del [options] <SCAN_ID>
 
           API Token Requirements
             - Quota: 1 unit
@@ -32,7 +30,8 @@ describe('socket scan del', async () => {
             --org             Force override the organization slug, overrides the default org from config
 
           Examples
-            $ socket scan del FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0"
+            $ socket scan del 000aaaa1-0000-0a0a-00a0-00a0000000a0
+            $ socket scan del 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -62,10 +61,12 @@ describe('socket scan del', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan del\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
           - Scan ID to delete (\\x1b[31mmissing\\x1b[39m)
 
@@ -81,6 +82,7 @@ describe('socket scan del', async () => {
     [
       'scan',
       'del',
+      '--org',
       'fakeorg',
       'scanidee',
       '--dry-run',
diff --git a/src/commands/scan/cmd-scan-diff.mts b/src/commands/scan/cmd-scan-diff.mts
index 6c075b155..adda1b85f 100644
--- a/src/commands/scan/cmd-scan-diff.mts
+++ b/src/commands/scan/cmd-scan-diff.mts
@@ -4,7 +4,6 @@ import { handleDiffScan } from './handle-diff-scan.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -53,7 +52,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <ID1> <ID2>
+      $ ${command} [options] <SCAN_ID1> <SCAN_ID2>
 
     API Token Requirements
       - Quota: 1 unit
@@ -63,15 +62,16 @@ const config: CliCommandConfig = {
     can be pretty large depending on the size of your repo and time range. It is
     best stored to disk (with --json) to be further analyzed by other tools.
 
-    Note: First Scan ID is assumed to be the older ID. This is only relevant for
-          the added/removed list (similar to diffing two files with git).
+    Note: While it will work in any order, the first Scan ID is assumed to be the
+          older ID, even if it is a newer Scan. This is only relevant for the
+          added/removed list (similar to diffing two files with git).
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json
+      $ ${command} aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
+      $ ${command} aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json
   `,
 }
 
@@ -103,16 +103,8 @@ async function run(
     org: orgFlag,
   } = cli.flags
   const outputKind = getOutputKind(json, markdown)
-
-  const [orgSlug] = await determineOrgSlug(
-    String(orgFlag || ''),
-    cli.input[0] || '',
-    !!interactive,
-    !!dryRun,
-  )
-
-  let id1 = cli.input[isTestingV1() || orgSlug ? 0 : 1] || ''
-  let id2 = cli.input[isTestingV1() || orgSlug ? 1 : 2] || ''
+  let [id1 = '', id2 = ''] = cli.input
+  // Support dropping in full socket urls to an sbom
   if (id1.startsWith(SOCKET_SBOM_URL_PREFIX)) {
     id1 = id1.slice(SOCKET_SBOM_URL_PREFIX_LENGTH)
   }
@@ -120,6 +112,12 @@ async function run(
     id2 = id2.slice(SOCKET_SBOM_URL_PREFIX_LENGTH)
   }
 
+  const [orgSlug] = await determineOrgSlug(
+    String(orgFlag || ''),
+    !!interactive,
+    !!dryRun,
+  )
+
   const hasApiToken = hasDefaultToken()
 
   const wasValidInput = checkCommandInput(
@@ -139,9 +137,7 @@ async function run(
     {
       test: !!orgSlug,
       nook: true,
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail: 'missing',
     },
diff --git a/src/commands/scan/cmd-scan-diff.test.mts b/src/commands/scan/cmd-scan-diff.test.mts
index 40c65d48c..817163158 100644
--- a/src/commands/scan/cmd-scan-diff.test.mts
+++ b/src/commands/scan/cmd-scan-diff.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket scan diff', async () => {
         "See what changed between two Scans
 
           Usage
-            $ socket scan diff <org slug> <ID1> <ID2>
+            $ socket scan diff [options] <SCAN_ID1> <SCAN_ID2>
 
           API Token Requirements
             - Quota: 1 unit
@@ -29,8 +27,9 @@ describe('socket scan diff', async () => {
           can be pretty large depending on the size of your repo and time range. It is
           best stored to disk (with --json) to be further analyzed by other tools.
 
-          Note: First Scan ID is assumed to be the older ID. This is only relevant for
-                the added/removed list (similar to diffing two files with git).
+          Note: While it will work in any order, the first Scan ID is assumed to be the
+                older ID, even if it is a newer Scan. This is only relevant for the
+                added/removed list (similar to diffing two files with git).
 
           Options
             --depth           Max depth of JSON to display before truncating, use zero for no limit (without --json/--file)
@@ -41,8 +40,8 @@ describe('socket scan diff', async () => {
             --org             Force override the organization slug, overrides the default org from config
 
           Examples
-            $ socket scan diff FakeOrg aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
-            $ socket scan diff FakeOrg aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json"
+            $ socket scan diff aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1
+            $ socket scan diff aaa0aa0a-aaaa-0000-0a0a-0000000a00a0 aaa1aa1a-aaaa-1111-1a1a-1111111a11a1 --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -72,13 +71,15 @@ describe('socket scan diff', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan diff\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
           - Specify two Scan IDs. (\\x1b[31mmissing both Scan IDs\\x1b[39m)
             A Scan ID looks like \`aaa0aa0a-aaaa-0000-0a0a-0000000a00a0\`.
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
@@ -92,6 +93,7 @@ describe('socket scan diff', async () => {
     [
       'scan',
       'diff',
+      '--org',
       'fakeorg',
       '--dry-run',
       '--config',
diff --git a/src/commands/scan/cmd-scan-github.mts b/src/commands/scan/cmd-scan-github.mts
index 27aed3cb1..cc0d607f2 100644
--- a/src/commands/scan/cmd-scan-github.mts
+++ b/src/commands/scan/cmd-scan-github.mts
@@ -7,7 +7,6 @@ import { suggestOrgSlug } from './suggest-org-slug.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -141,7 +140,6 @@ async function run(
 
   let [orgSlug, defaultOrgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     interactive,
     dryRun,
   )
@@ -203,18 +201,6 @@ async function run(
 
   const wasValidInput = checkCommandInput(
     outputKind,
-    {
-      nook: !isTestingV1() && !!defaultOrgSlug,
-      test: !!orgSlug && orgSlug !== '.',
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
-      pass: 'ok',
-      fail:
-        orgSlug === '.'
-          ? 'dot is an invalid org, most likely you forgot the org name here?'
-          : 'missing',
-    },
     {
       nook: true,
       test: !json || !markdown,
diff --git a/src/commands/scan/cmd-scan-github.test.mts b/src/commands/scan/cmd-scan-github.test.mts
index c67a9e5f6..f3dc071c9 100644
--- a/src/commands/scan/cmd-scan-github.test.mts
+++ b/src/commands/scan/cmd-scan-github.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -80,11 +78,11 @@ describe('socket scan github', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan github\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
-
           - This command requires an API token for access (\\x1b[31mmissing (try \`socket login\`)\\x1b[39m)
 
           - This command requires a GitHub API token for access (\\x1b[31mmissing\\x1b[39m)
@@ -117,7 +115,10 @@ describe('socket scan github', async () => {
            _____         _       _        /---------------
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan github\`, cwd: <redacted>"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan github\`, cwd: <redacted>
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/scan/cmd-scan-list.mts b/src/commands/scan/cmd-scan-list.mts
index 562fef562..cd2ca19b6 100644
--- a/src/commands/scan/cmd-scan-list.mts
+++ b/src/commands/scan/cmd-scan-list.mts
@@ -4,7 +4,6 @@ import { handleListScans } from './handle-list-scans.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -64,10 +63,6 @@ const config: CliCommandConfig = {
       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',
-    },
     sort: {
       type: 'string',
       shortFlag: 's',
@@ -84,17 +79,22 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'}
+      $ ${command} [options] [REPO [BRANCH]]
 
     API Token Requirements
       - Quota: 1 unit
       - Permissions: full-scans:list
 
+    Optionally filter by REPO. If you specify a repo, you can also specify a
+    branch to filter by. (Note: If you don't specify a repo then you must use
+    \`--branch\` to filter by branch across all repos).
+
     Options
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'}
+      $ ${command}
+      $ ${command} webtools badbranch --markdown
   `,
 }
 
@@ -117,38 +117,42 @@ async function run(
   })
 
   const {
-    branch,
+    branch: branchFlag,
     dryRun,
     interactive,
     json,
     markdown,
     org: orgFlag,
-    repo,
   } = cli.flags
   const outputKind = getOutputKind(json, markdown)
+  const [repo = '', branchArg = ''] = cli.input
+  const branch = String(branchFlag || branchArg || '')
 
-  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+  const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
   const hasApiToken = hasDefaultToken()
 
+  const noLegacy = !cli.flags['repo']
+
   const wasValidInput = checkCommandInput(
     outputKind,
     {
-      nook: !!defaultOrgSlug,
-      test: !!orgSlug && orgSlug !== '.',
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      nook: true,
+      test: noLegacy,
+      message: 'Legacy flags are no longer supported. See v1 migration guide.',
+      pass: 'ok',
+      fail: `received legacy flags`,
+    },
+    {
+      nook: true,
+      test: !!orgSlug,
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
-      fail:
-        orgSlug === '.'
-          ? 'dot is an invalid org, most likely you forgot the org name here?'
-          : 'missing',
+      fail: 'dot is an invalid org, most likely you forgot the org name here?',
     },
     {
       nook: true,
@@ -165,6 +169,14 @@ async function run(
       pass: 'ok',
       fail: 'missing API token',
     },
+    {
+      nook: true,
+      test: !branchFlag || !branchArg,
+      message:
+        'You should not set --branch and also give a second arg for branch name',
+      pass: 'ok',
+      fail: 'received flag and second arg',
+    },
   )
   if (!wasValidInput) {
     return
diff --git a/src/commands/scan/cmd-scan-list.test.mts b/src/commands/scan/cmd-scan-list.test.mts
index 67461cbef..0878acf7f 100644
--- a/src/commands/scan/cmd-scan-list.test.mts
+++ b/src/commands/scan/cmd-scan-list.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,12 +17,16 @@ describe('socket scan list', async () => {
         "List the scans for an organization
 
           Usage
-            $ socket scan list <org slug>
+            $ socket scan list [options] [REPO [BRANCH]]
 
           API Token Requirements
             - Quota: 1 unit
             - Permissions: full-scans:list
 
+          Optionally filter by REPO. If you specify a repo, you can also specify a
+          branch to filter by. (Note: If you don't specify a repo then you must use
+          \`--branch\` to filter by branch across all repos).
+
           Options
             --branch          Filter to show only scans with this branch name
             --direction       Direction option (\`desc\` or \`asc\`) - Default is \`desc\`
@@ -35,12 +37,12 @@ describe('socket scan list', async () => {
             --org             Force override the organization slug, overrides the default org from config
             --page            Page number - Default is 1
             --perPage         Results per page - Default is 30
-            --repo            Filter to show only scans with this repository name
             --sort            Sorting option (\`name\` or \`created_at\`) - default is \`created_at\`
             --untilTime       Until time - as a unix timestamp
 
           Examples
-            $ socket scan list FakeOrg"
+            $ socket scan list
+            $ socket scan list webtools badbranch --markdown"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -70,10 +72,12 @@ describe('socket scan list', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan list\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mdot is an invalid org, most likely you forgot the org name here?\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
@@ -87,6 +91,7 @@ describe('socket scan list', async () => {
     [
       'scan',
       'list',
+      '--org',
       'fakeorg',
       '--dry-run',
       '--config',
diff --git a/src/commands/scan/cmd-scan-metadata.mts b/src/commands/scan/cmd-scan-metadata.mts
index 3dbdb9fdb..67a8518b0 100644
--- a/src/commands/scan/cmd-scan-metadata.mts
+++ b/src/commands/scan/cmd-scan-metadata.mts
@@ -4,7 +4,6 @@ import { handleOrgScanMetadata } from './handle-scan-metadata.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -39,7 +38,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <scan ID>
+      $ ${command} [options] <SCAN_ID>
 
     API Token Requirements
       - Quota: 1 unit
@@ -49,7 +48,8 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command} 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json
   `,
 }
 
@@ -73,26 +73,22 @@ async function run(
 
   const { dryRun, interactive, json, markdown, org: orgFlag } = cli.flags
   const outputKind = getOutputKind(json, markdown)
+  const [scanId = ''] = cli.input
 
-  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+  const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
-  const scanId =
-    (isTestingV1() || defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
   const hasApiToken = hasDefaultToken()
 
   const wasValidInput = checkCommandInput(
     outputKind,
     {
-      nook: !!defaultOrgSlug,
-      test: !!orgSlug && orgSlug !== '.',
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      nook: true,
+      test: !!orgSlug,
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail:
         orgSlug === '.'
diff --git a/src/commands/scan/cmd-scan-metadata.test.mts b/src/commands/scan/cmd-scan-metadata.test.mts
index 406c0cccb..dc833d004 100644
--- a/src/commands/scan/cmd-scan-metadata.test.mts
+++ b/src/commands/scan/cmd-scan-metadata.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket scan metadata', async () => {
         "Get a scan's metadata
 
           Usage
-            $ socket scan metadata <org slug> <scan ID>
+            $ socket scan metadata [options] <SCAN_ID>
 
           API Token Requirements
             - Quota: 1 unit
@@ -32,7 +30,8 @@ describe('socket scan metadata', async () => {
             --org             Force override the organization slug, overrides the default org from config
 
           Examples
-            $ socket scan metadata FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0"
+            $ socket scan metadata 000aaaa1-0000-0a0a-00a0-00a0000000a0
+            $ socket scan metadata 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -62,10 +61,12 @@ describe('socket scan metadata', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan metadata\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
           - Scan ID to inspect as argument (\\x1b[31mmissing\\x1b[39m)
 
@@ -81,6 +82,7 @@ describe('socket scan metadata', async () => {
     [
       'scan',
       'metadata',
+      '--org',
       'fakeorg',
       'scanidee',
       '--dry-run',
diff --git a/src/commands/scan/cmd-scan-reach.mts b/src/commands/scan/cmd-scan-reach.mts
index b23ac60f5..ba6c52849 100644
--- a/src/commands/scan/cmd-scan-reach.mts
+++ b/src/commands/scan/cmd-scan-reach.mts
@@ -24,7 +24,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command} [CWD=.]
+      $ ${command} [options] [CWD=.]
 
     Options
       ${getFlagListOutput(config.flags, 6)}
diff --git a/src/commands/scan/cmd-scan-reach.test.mts b/src/commands/scan/cmd-scan-reach.test.mts
index e2ee97357..4de4cb7a9 100644
--- a/src/commands/scan/cmd-scan-reach.test.mts
+++ b/src/commands/scan/cmd-scan-reach.test.mts
@@ -17,7 +17,7 @@ describe('socket scan reach', async () => {
         "Compute tier 1 reachability
 
           Usage
-            $ socket scan reach [CWD=.]
+            $ socket scan reach [options] [CWD=.]
 
           Options
             --json            Output result as json
diff --git a/src/commands/scan/cmd-scan-report.mts b/src/commands/scan/cmd-scan-report.mts
index 64fb87173..a06504e01 100644
--- a/src/commands/scan/cmd-scan-report.mts
+++ b/src/commands/scan/cmd-scan-report.mts
@@ -4,7 +4,6 @@ import { handleScanReport } from './handle-scan-report.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -60,7 +59,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <scan ID> [path to output file]
+      $ ${command} [options] <SCAN_ID> [OUTPUT_PATH]
 
     API Token Requirements
       - Quota: 2 units
@@ -69,18 +68,34 @@ const config: CliCommandConfig = {
     Options
       ${getFlagListOutput(config.flags, 6)}
 
+    When no output path is given the contents is sent to stdout.
+
     By default the result is a nested object that looks like this:
-      \`{[ecosystem]: {[pkgName]: {[version]: {[file]: {[type:loc]: policy}}}}\`
-    You can fold this up to given level: 'pkg', 'version', 'file', and 'none'.
+      \`{
+        [ecosystem]: {
+          [pkgName]: {
+            [version]: {
+              [file]: {
+                [line:col]: alert
+      }}}}\`
+    So one alert for each occurrence in every file, version, etc, a huge response.
+
+    You can --fold these up to given level: 'pkg', 'version', 'file', and 'none'.
+    For example: \`socket scan report --fold=version\` will dedupe alerts to only
+    show one alert of a particular kind, no matter how often it was foud in a
+    file or in how many files it was found. At most one per version that has it.
 
     By default only the warn and error policy level alerts are reported. You can
     override this and request more ('defer' < 'ignore' < 'monitor' < 'warn' < 'error')
 
-    Short responses: JSON: \`{healthy:bool}\`, markdown: \`healthy = bool\`, text: \`OK/ERR\`
+    Short responses look like this:
+      --json:     \`{healthy:bool}\`
+      --markdown: \`healthy = bool\`
+      neither:    \`OK/ERR\`
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json --fold=version
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --license --markdown --short
+      $ ${command} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json --fold=version
+      $ ${command} 000aaaa1-0000-0a0a-00a0-00a0000000a0 --license --markdown --short
   `,
 }
 
@@ -103,42 +118,34 @@ async function run(
   })
 
   const {
+    dryRun,
     fold = 'none',
+    interactive,
     json,
     license,
     markdown,
+    org: orgFlag,
     reportLevel = 'warn',
   } = cli.flags
   const outputKind = getOutputKind(json, markdown)
+  const [scanId = '', file = ''] = cli.input
 
-  const { dryRun, interactive, org: orgFlag } = cli.flags
-
-  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+  const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
-  const scanId =
-    (isTestingV1() || defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
-  const file =
-    (isTestingV1() || defaultOrgSlug ? cli.input[1] : cli.input[2]) || '-'
   const hasApiToken = hasDefaultToken()
 
   const wasValidInput = checkCommandInput(
     outputKind,
     {
-      nook: !!defaultOrgSlug,
-      test: !!orgSlug && orgSlug !== '.',
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      nook: true,
+      test: !!orgSlug,
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
-      fail:
-        orgSlug === '.'
-          ? 'dot is an invalid org, most likely you forgot the org name here?'
-          : 'missing',
+      fail: 'dot is an invalid org, most likely you forgot the org name here?',
     },
     {
       test: !!scanId,
@@ -173,7 +180,7 @@ async function run(
 
   await handleScanReport({
     orgSlug,
-    scanId: scanId,
+    scanId,
     includeLicensePolicy: !!license,
     outputKind,
     filePath: file,
diff --git a/src/commands/scan/cmd-scan-report.test.mts b/src/commands/scan/cmd-scan-report.test.mts
index 34ca6ea7d..b3f1d52c7 100644
--- a/src/commands/scan/cmd-scan-report.test.mts
+++ b/src/commands/scan/cmd-scan-report.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket scan report', async () => {
         "Check whether a scan result passes the organizational policies (security, license)
 
           Usage
-            $ socket scan report <org slug> <scan ID> [path to output file]
+            $ socket scan report [options] <SCAN_ID> [OUTPUT_PATH]
 
           API Token Requirements
             - Quota: 2 units
@@ -35,18 +33,34 @@ describe('socket scan report', async () => {
             --reportLevel     Which policy level alerts should be reported
             --short           Report only the healthy status
 
+          When no output path is given the contents is sent to stdout.
+
           By default the result is a nested object that looks like this:
-            \`{[ecosystem]: {[pkgName]: {[version]: {[file]: {[type:loc]: policy}}}}\`
-          You can fold this up to given level: 'pkg', 'version', 'file', and 'none'.
+            \`{
+              [ecosystem]: {
+                [pkgName]: {
+                  [version]: {
+                    [file]: {
+                      [line:col]: alert
+            }}}}\`
+          So one alert for each occurrence in every file, version, etc, a huge response.
+
+          You can --fold these up to given level: 'pkg', 'version', 'file', and 'none'.
+          For example: \`socket scan report --fold=version\` will dedupe alerts to only
+          show one alert of a particular kind, no matter how often it was foud in a
+          file or in how many files it was found. At most one per version that has it.
 
           By default only the warn and error policy level alerts are reported. You can
           override this and request more ('defer' < 'ignore' < 'monitor' < 'warn' < 'error')
 
-          Short responses: JSON: \`{healthy:bool}\`, markdown: \`healthy = bool\`, text: \`OK/ERR\`
+          Short responses look like this:
+            --json:     \`{healthy:bool}\`
+            --markdown: \`healthy = bool\`
+            neither:    \`OK/ERR\`
 
           Examples
-            $ socket scan report FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json --fold=version
-            $ socket scan report FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 --license --markdown --short"
+            $ socket scan report 000aaaa1-0000-0a0a-00a0-00a0000000a0 --json --fold=version
+            $ socket scan report 000aaaa1-0000-0a0a-00a0-00a0000000a0 --license --markdown --short"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -76,10 +90,12 @@ describe('socket scan report', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan report\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mdot is an invalid org, most likely you forgot the org name here?\\x1b[39m)
 
           - Scan ID to report on (\\x1b[31mmissing\\x1b[39m)
 
@@ -98,6 +114,8 @@ describe('socket scan report', async () => {
       'org',
       'report-id',
       '--dry-run',
+      '--org',
+      'foorg',
       '--config',
       '{"apiToken":"anything"}',
     ],
diff --git a/src/commands/scan/cmd-scan-setup.test.mts b/src/commands/scan/cmd-scan-setup.test.mts
index 54c29c656..2fa8b8e32 100644
--- a/src/commands/scan/cmd-scan-setup.test.mts
+++ b/src/commands/scan/cmd-scan-setup.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
diff --git a/src/commands/scan/cmd-scan-view.mts b/src/commands/scan/cmd-scan-view.mts
index 5f970af82..1cb4aad1e 100644
--- a/src/commands/scan/cmd-scan-view.mts
+++ b/src/commands/scan/cmd-scan-view.mts
@@ -5,7 +5,6 @@ import { streamScan } from './stream-scan.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -46,7 +45,7 @@ const config: CliCommandConfig = {
   },
   help: (command, config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'} <scan ID> [path to output file]
+      $ ${command} [options] <SCAN_ID> [OUTPUT_FILE]
 
     API Token Requirements
       - Quota: 1 unit
@@ -58,7 +57,8 @@ const config: CliCommandConfig = {
       ${getFlagListOutput(config.flags, 6)}
 
     Examples
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt
+      $ ${command} 000aaaa1-0000-0a0a-00a0-00a0000000a0
+      $ ${command} 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt
   `,
 }
 
@@ -89,33 +89,24 @@ async function run(
     stream,
   } = cli.flags
   const outputKind = getOutputKind(json, markdown)
+  const [scanId = '', file = ''] = cli.input
 
-  const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
+  const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
 
-  const scanId =
-    (isTestingV1() || defaultOrgSlug ? cli.input[0] : cli.input[1]) || ''
-  const file =
-    (isTestingV1() || defaultOrgSlug ? cli.input[1] : cli.input[2]) || '-'
   const hasApiToken = hasDefaultToken()
 
   const wasValidInput = checkCommandInput(
     outputKind,
     {
-      nook: !!defaultOrgSlug,
-      test: !!orgSlug && orgSlug !== '.',
-      message: isTestingV1()
-        ? 'Org name by default setting, --org, or auto-discovered'
-        : 'Org name must be the first argument',
+      nook: true,
+      test: !!orgSlug,
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
-      fail:
-        orgSlug === '.'
-          ? 'dot is an invalid org, most likely you forgot the org name here?'
-          : 'missing',
+      fail: 'dot is an invalid org, most likely you forgot the org name here?',
     },
     {
       test: !!scanId,
diff --git a/src/commands/scan/cmd-scan-view.test.mts b/src/commands/scan/cmd-scan-view.test.mts
index 2ba793ba1..4e31a8b37 100644
--- a/src/commands/scan/cmd-scan-view.test.mts
+++ b/src/commands/scan/cmd-scan-view.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket scan view', async () => {
         "View the raw results of a scan
 
           Usage
-            $ socket scan view <org slug> <scan ID> [path to output file]
+            $ socket scan view [options] <SCAN_ID> [OUTPUT_FILE]
 
           API Token Requirements
             - Quota: 1 unit
@@ -35,7 +33,8 @@ describe('socket scan view', async () => {
             --stream          Only valid with --json. Streams the response as "ndjson" (chunks of valid json blobs).
 
           Examples
-            $ socket scan view FakeOrg 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt"
+            $ socket scan view 000aaaa1-0000-0a0a-00a0-00a0000000a0
+            $ socket scan view 000aaaa1-0000-0a0a-00a0-00a0000000a0 ./stream.txt"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -65,10 +64,12 @@ describe('socket scan view', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan view\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name must be the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mdot is an invalid org, most likely you forgot the org name here?\\x1b[39m)
 
           - Scan ID to view (\\x1b[31mmissing\\x1b[39m)
 
@@ -84,6 +85,7 @@ describe('socket scan view', async () => {
     [
       'scan',
       'view',
+      '--org',
       'fakeorg',
       'scanidee',
       '--dry-run',
diff --git a/src/commands/scan/cmd-scan.mts b/src/commands/scan/cmd-scan.mts
index 2edf07caa..585c7ec40 100644
--- a/src/commands/scan/cmd-scan.mts
+++ b/src/commands/scan/cmd-scan.mts
@@ -42,12 +42,6 @@ export const cmdScan: CliSubcommand = {
             hidden: true,
             argv: ['reach'],
           },
-          // Backwards compat. TODO: Drop next major bump; isTestingV1
-          stream: {
-            description: cmdScanView.description,
-            hidden: true,
-            argv: ['view'], // Original args will be appended (!)
-          },
         },
         argv,
         description,
diff --git a/src/commands/scan/create-scan-from-github.mts b/src/commands/scan/create-scan-from-github.mts
index 6dedfa3a2..fc1ddae77 100644
--- a/src/commands/scan/create-scan-from-github.mts
+++ b/src/commands/scan/create-scan-from-github.mts
@@ -8,7 +8,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { confirm, select } from '@socketsecurity/registry/lib/prompts'
 
 import { handleCreateNewScan } from './handle-create-new-scan.mts'
-import { fetchListAllRepos } from '../repos/fetch-list-all-repos.mts'
+import { fetchListAllRepos } from '../repository/fetch-list-all-repos.mts'
 
 import type { CResult, OutputKind } from '../../types.mts'
 
diff --git a/src/commands/threat-feed/cmd-threat-feed.mts b/src/commands/threat-feed/cmd-threat-feed.mts
index a7c66de76..143a9a3b4 100644
--- a/src/commands/threat-feed/cmd-threat-feed.mts
+++ b/src/commands/threat-feed/cmd-threat-feed.mts
@@ -4,7 +4,6 @@ import { handleThreatFeed } from './handle-threat-feed.mts'
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
@@ -15,6 +14,21 @@ import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
 const { DRY_RUN_BAILING_NOW } = constants
 
+const ECOSYSTEMS = new Set(['gem', 'golang', 'maven', 'npm', 'nuget', 'pypi'])
+const TYPE_FILTERS = new Set([
+  'anom',
+  'c',
+  'fp',
+  'joke',
+  'mal',
+  'secret',
+  'spy',
+  'tp',
+  'typo',
+  'u',
+  'vuln',
+])
+
 const config: CliCommandConfig = {
   commandName: 'threat-feed',
   description: '[beta] View the threat feed',
@@ -24,19 +38,16 @@ const config: CliCommandConfig = {
     ...outputFlags,
     direction: {
       type: 'string',
-      shortFlag: 'd',
       default: 'desc',
       description: 'Order asc or desc by the createdAt attribute',
     },
     eco: {
       type: 'string',
-      shortFlag: 'e',
       default: '',
       description: 'Only show threats for a particular ecosystem',
     },
     filter: {
       type: 'string',
-      shortFlag: 'f',
       default: 'mal',
       description: 'Filter what type of threats to return',
     },
@@ -53,7 +64,6 @@ const config: CliCommandConfig = {
     },
     page: {
       type: 'string',
-      shortFlag: 'p',
       default: '1',
       description: 'Page token',
     },
@@ -65,16 +75,18 @@ const config: CliCommandConfig = {
     },
     pkg: {
       type: 'string',
+      default: '',
       description: 'Filter by this package name',
     },
     version: {
       type: 'string',
+      default: '',
       description: 'Filter by this package version',
     },
   },
   help: (command, config) => `
     Usage
-      $ ${command}${isTestingV1() ? '' : ' <org slug>'}
+      $ ${command} [options] [ECOSYSTEM] [TYPE_FILTER]
 
     API Token Requirements
       - Quota: 1 unit
@@ -87,7 +99,16 @@ const config: CliCommandConfig = {
     Options
       ${getFlagListOutput(config.flags, 6)}
 
-    Valid filters:
+    Valid ecosystems:
+
+      - gem
+      - golang
+      - maven
+      - npm
+      - nuget
+      - pypi
+
+    Valid type filters:
 
       - anom    Anomaly
       - c       Do not filter
@@ -101,23 +122,25 @@ const config: CliCommandConfig = {
       - u       Unreviewed
       - vuln    Vulnerability
 
-    Valid ecosystems:
-
-      - gem
-      - golang
-      - maven
-      - npm
-      - nuget
-      - pypi
-
     Note: if you filter by package name or version, it will do so for anything
           unless you also filter by that ecosystem and/or package name. When in
           doubt, look at the threat-feed and see the names in the name/version
           column. That's what you want to search for.
 
+    You can put filters as args instead, we'll try to match the strings with the
+    correct filter type but since this would not allow you to search for a package
+    called "mal", you can also specify the filters through flags.
+
+    First arg that matches a typo, eco, or version enum is used as such. First arg
+    that matches none of them becomes the package name filter. Rest is ignored.
+
+    Note: The version filter is a prefix search, pkg name is a substring search.
+
     Examples
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'}
-      $ ${command}${isTestingV1() ? '' : ' FakeOrg'} --perPage=5 --page=2 --direction=asc --filter=joke
+      $ ${command}
+      $ ${command} maven --json
+      $ ${command} typo
+      $ ${command} npm joke 1.0.0 --perPage=5 --page=2 --direction=asc
   `,
 }
 
@@ -141,18 +164,60 @@ async function run(
 
   const {
     dryRun,
+    eco,
     interactive,
     json,
     markdown,
     org: orgFlag,
     pkg,
+    type: typef,
     version,
   } = cli.flags
   const outputKind = getOutputKind(json, markdown)
 
+  const argSet = new Set(cli.input)
+  let ecoFilter = String(eco || '')
+  let versionFilter = String(version || '')
+  let typeFilter = String(typef || '')
+  let nameFilter = String(pkg || '')
+  cli.input.some(str => {
+    if (ECOSYSTEMS.has(str)) {
+      ecoFilter = str
+      argSet.delete(str)
+      return true
+    }
+  })
+  cli.input.some(str => {
+    if (/^v?\d+\.\d+\.\d+$/.test(str)) {
+      versionFilter = str
+      argSet.delete(str)
+      return true
+    }
+  })
+  cli.input.some(str => {
+    if (TYPE_FILTERS.has(str)) {
+      typeFilter = str
+      argSet.delete(str)
+      return true
+    }
+  })
+  const haves = new Set([ecoFilter, versionFilter, typeFilter])
+  cli.input.some(str => {
+    if (!haves.has(str)) {
+      nameFilter = str
+      argSet.delete(str)
+      return true
+    }
+  })
+
+  if (argSet.size) {
+    logger.info(
+      `Warning: ignoring these excessive args: ${Array.from(argSet).join(', ')}`,
+    )
+  }
+
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    cli.input[0] || '',
     !!interactive,
     !!dryRun,
   )
@@ -164,7 +229,7 @@ async function run(
     {
       nook: true,
       test: !!orgSlug,
-      message: 'Org name as the first argument',
+      message: 'Org name by default setting, --org, or auto-discovered',
       pass: 'ok',
       fail: 'missing',
     },
@@ -195,13 +260,13 @@ async function run(
 
   await handleThreatFeed({
     direction: String(cli.flags['direction'] || 'desc'),
-    ecosystem: String(cli.flags['eco'] || ''),
-    filter: String(cli.flags['filter'] || 'mal'),
+    ecosystem: ecoFilter,
+    filter: typeFilter,
     outputKind,
     orgSlug,
     page: String(cli.flags['page'] || '1'),
     perPage: Number(cli.flags['perPage']) || 30,
-    pkg: String(pkg || ''),
-    version: String(version || ''),
+    pkg: nameFilter,
+    version: versionFilter,
   })
 }
diff --git a/src/commands/threat-feed/cmd-threat-feed.test.mts b/src/commands/threat-feed/cmd-threat-feed.test.mts
index 578bc9353..1d2bfff24 100644
--- a/src/commands/threat-feed/cmd-threat-feed.test.mts
+++ b/src/commands/threat-feed/cmd-threat-feed.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket threat-feed', async () => {
         "[beta] View the threat feed
 
           Usage
-            $ socket threat-feed <org slug>
+            $ socket threat-feed [options] [ECOSYSTEM] [TYPE_FILTER]
 
           API Token Requirements
             - Quota: 1 unit
@@ -42,7 +40,16 @@ describe('socket threat-feed', async () => {
             --pkg             Filter by this package name
             --version         Filter by this package version
 
-          Valid filters:
+          Valid ecosystems:
+
+            - gem
+            - golang
+            - maven
+            - npm
+            - nuget
+            - pypi
+
+          Valid type filters:
 
             - anom    Anomaly
             - c       Do not filter
@@ -56,23 +63,25 @@ describe('socket threat-feed', async () => {
             - u       Unreviewed
             - vuln    Vulnerability
 
-          Valid ecosystems:
-
-            - gem
-            - golang
-            - maven
-            - npm
-            - nuget
-            - pypi
-
           Note: if you filter by package name or version, it will do so for anything
                 unless you also filter by that ecosystem and/or package name. When in
                 doubt, look at the threat-feed and see the names in the name/version
                 column. That's what you want to search for.
 
+          You can put filters as args instead, we'll try to match the strings with the
+          correct filter type but since this would not allow you to search for a package
+          called "mal", you can also specify the filters through flags.
+
+          First arg that matches a typo, eco, or version enum is used as such. First arg
+          that matches none of them becomes the package name filter. Rest is ignored.
+
+          Note: The version filter is a prefix search, pkg name is a substring search.
+
           Examples
-            $ socket threat-feed FakeOrg
-            $ socket threat-feed FakeOrg --perPage=5 --page=2 --direction=asc --filter=joke"
+            $ socket threat-feed
+            $ socket threat-feed maven --json
+            $ socket threat-feed typo
+            $ socket threat-feed npm joke 1.0.0 --perPage=5 --page=2 --direction=asc"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -102,10 +111,12 @@ describe('socket threat-feed', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>
-
+        \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
+        \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
+        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
         \\x1b[22m"
@@ -116,7 +127,14 @@ describe('socket threat-feed', async () => {
   )
 
   cmdit(
-    ['threat-feed', 'boo', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    [
+      'threat-feed',
+      '--org',
+      'boo',
+      '--dry-run',
+      '--config',
+      '{"apiToken":"anything"}',
+    ],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
@@ -134,30 +152,23 @@ describe('socket threat-feed', async () => {
   )
 
   cmdit(
-    [
-      'threat-feed',
-      '--dry-run',
-      '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
-    ],
-    'should report missing org name in v1',
+    ['threat-feed', '--dry-run', '--config', '{"apiToken":"anything"}'],
+    'should report missing org name',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m
         \\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
         \\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
         \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Org name as the first argument (\\x1b[31mmissing\\x1b[39m)
+          - Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
         \\x1b[22m"
       `)
 
@@ -170,20 +181,18 @@ describe('socket threat-feed', async () => {
       'threat-feed',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything", "defaultOrg": "fakeorg"}',
+      '{"apiToken":"anything", "defaultOrg": "fakeorg"}',
     ],
-    'should accept default org in v1',
+    'should accept default org',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
-          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, default org: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>, org: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
@@ -197,20 +206,18 @@ describe('socket threat-feed', async () => {
       'forcedorg',
       '--dry-run',
       '--config',
-      '{"isTestingV1": true, "apiToken":"anything"}',
+      '{"apiToken":"anything"}',
     ],
-    'should accept --org flag in v1',
+    'should accept --org flag',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`"[DryRun]: Bailing now"`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
         "
            _____         _       _        /---------------
-          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted> (is testing v1)
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-          |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>
-        \\x1b[32m   (Thank you for testing the v1 bump! Please send us any feedback you might have!)
-        \\x1b[39m"
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket threat-feed\`, cwd: <redacted>"
       `)
 
       expect(code, 'dry-run should exit with code 0 if input ok').toBe(0)
diff --git a/src/commands/threat-feed/output-threat-feed.mts b/src/commands/threat-feed/output-threat-feed.mts
index 8b7a5cba3..b729beb2b 100644
--- a/src/commands/threat-feed/output-threat-feed.mts
+++ b/src/commands/threat-feed/output-threat-feed.mts
@@ -4,6 +4,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 
 import constants from '../../constants.mts'
 import { failMsgWithBadge } from '../../utils/fail-msg-with-badge.mts'
+import { msAtHome } from '../../utils/ms-at-home.mts'
 import { serializeResultJson } from '../../utils/serialize-result-json.mts'
 
 import type { ThreadFeedResponse, ThreatResult } from './types.mts'
@@ -50,6 +51,9 @@ export async function outputThreatFeed(
   screen.key(['escape', 'q', 'C-c'], () => process.exit(0))
 
   const TableWidget = require('blessed-contrib/lib/widget/table.js')
+  const detailsBoxHeight = 20 // bottom N rows for details box
+  const tipsBoxHeight = 1 // 1 row for tips box
+
   const table: any = new TableWidget({
     keys: 'true',
     fg: 'white',
@@ -58,7 +62,8 @@ export async function outputThreatFeed(
     interactive: 'true',
     label: 'Threat feed',
     width: '100%',
-    height: '70%', // Changed from 100% to 70%
+    top: 0,
+    bottom: detailsBoxHeight + tipsBoxHeight,
     border: {
       type: 'line',
       fg: 'cyan',
@@ -70,11 +75,21 @@ export async function outputThreatFeed(
     truncate: '_',
   })
 
-  // Create details box at the bottom
   const BoxWidget = require('blessed/lib/widgets/box.js')
+  const tipsBox: Widgets.BoxElement = new BoxWidget({
+    bottom: detailsBoxHeight, // sits just above the details box
+    height: tipsBoxHeight,
+    width: '100%',
+    style: {
+      fg: 'yellow',
+      bg: 'black',
+    },
+    tags: true,
+    content: '↑/↓: Move    Enter: Select    q/ESC: Quit',
+  })
   const detailsBox: Widgets.BoxElement = new BoxWidget({
     bottom: 0,
-    height: '30%',
+    height: detailsBoxHeight,
     width: '100%',
     border: {
       type: 'line',
@@ -100,10 +115,20 @@ export async function outputThreatFeed(
     data: formattedOutput,
   })
 
+  // Initialize details box with the first selection if available
+  if (formattedOutput.length > 0) {
+    const selectedRow = formattedOutput[0]
+    if (selectedRow) {
+      detailsBox.setContent(formatDetailBox(selectedRow, descriptions, 0))
+    }
+  }
+
   // allow control the table with the keyboard
   table.focus()
 
+  // Stacking order: table (top), tipsBox (middle), detailsBox (bottom)
   screen.append(table)
+  screen.append(tipsBox)
   screen.append(detailsBox)
 
   // Update details box when selection changes
@@ -114,13 +139,7 @@ export async function outputThreatFeed(
       if (selectedRow) {
         // Note: the spacing works around issues with the table; it refuses to pad!
         detailsBox.setContent(
-          `Ecosystem: ${selectedRow[0]}\n` +
-            `Name: ${selectedRow[1]}\n` +
-            `Version:${selectedRow[2]}\n` +
-            `Threat type:${selectedRow[3]}\n` +
-            `Detected at:${selectedRow[4]}\n` +
-            `Details: ${selectedRow[5]}\n` +
-            `Description: ${descriptions[selectedIndex]}`,
+          formatDetailBox(selectedRow, descriptions, selectedIndex),
         )
         screen.render()
       }
@@ -137,6 +156,22 @@ export async function outputThreatFeed(
   })
 }
 
+function formatDetailBox(
+  selectedRow: string[],
+  descriptions: string[],
+  selectedIndex: number,
+): string {
+  return (
+    `Ecosystem:    ${selectedRow[0]?.trim()}\n` +
+    `Name:         ${selectedRow[1]?.trim()}\n` +
+    `Version:      ${selectedRow[2]?.trim()}\n` +
+    `Threat type:  ${selectedRow[3]?.trim()}\n` +
+    `Detected at:  ${selectedRow[4]?.trim()}\n` +
+    `Details:      ${selectedRow[5]?.trim()}\n` +
+    `Description:  ${descriptions[selectedIndex]?.trim()}`
+  )
+}
+
 function formatResults(data: ThreatResult[]) {
   return data.map(d => {
     const ecosystem = d.purl.split('pkg:')[1]!.split('/')[0]!
@@ -156,27 +191,3 @@ function formatResults(data: ThreatResult[]) {
     ]
   })
 }
-
-function msAtHome(isoTimeStamp: string): string {
-  const timeStart = Date.parse(isoTimeStamp)
-  const timeEnd = Date.now()
-
-  const rtf = new Intl.RelativeTimeFormat('en', {
-    numeric: 'always',
-    style: 'short',
-  })
-
-  const delta = timeEnd - timeStart
-  if (delta < 60 * 60 * 1000) {
-    return rtf.format(-Math.round(delta / (60 * 1000)), 'minute')
-    // return Math.round(delta / (60 * 1000)) + ' min ago'
-  } else if (delta < 24 * 60 * 60 * 1000) {
-    return rtf.format(-(delta / (60 * 60 * 1000)).toFixed(1), 'hour')
-    // return (delta / (60 * 60 * 1000)).toFixed(1) + ' hr ago'
-  } else if (delta < 7 * 24 * 60 * 60 * 1000) {
-    return rtf.format(-(delta / (24 * 60 * 60 * 1000)).toFixed(1), 'day')
-    // return (delta / (24 * 60 * 60 * 1000)).toFixed(1) + ' day ago'
-  } else {
-    return isoTimeStamp.slice(0, 10)
-  }
-}
diff --git a/src/commands/uninstall/cmd-uninstall-completion.mts b/src/commands/uninstall/cmd-uninstall-completion.mts
index 18b40fe9f..6a805f6ff 100644
--- a/src/commands/uninstall/cmd-uninstall-completion.mts
+++ b/src/commands/uninstall/cmd-uninstall-completion.mts
@@ -13,13 +13,13 @@ const { DRY_RUN_BAILING_NOW } = constants
 const config: CliCommandConfig = {
   commandName: 'completion',
   description: 'Uninstall bash completion for Socket CLI',
-  hidden: true, // beta; isTestingV1
+  hidden: false,
   flags: {
     ...commonFlags,
   },
   help: (command, config) => `
     Usage
-      $ ${command} [name=socket]
+      $ ${command} [options] [COMMAND_NAME=socket]
 
     Uninstalls bash tab completion for the Socket CLI. This will:
     1. Remove tab completion from your current shell for given command
diff --git a/src/commands/uninstall/cmd-uninstall-completion.test.mts b/src/commands/uninstall/cmd-uninstall-completion.test.mts
index 2d0d8aead..c588abf4f 100644
--- a/src/commands/uninstall/cmd-uninstall-completion.test.mts
+++ b/src/commands/uninstall/cmd-uninstall-completion.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,7 +17,7 @@ describe('socket uninstall completion', async () => {
         "Uninstall bash completion for Socket CLI
 
           Usage
-            $ socket uninstall completion [name=socket]
+            $ socket uninstall completion [options] [COMMAND_NAME=socket]
 
           Uninstalls bash tab completion for the Socket CLI. This will:
           1. Remove tab completion from your current shell for given command
diff --git a/src/commands/uninstall/cmd-uninstall.mts b/src/commands/uninstall/cmd-uninstall.mts
index 88ab2c658..83dbc4173 100644
--- a/src/commands/uninstall/cmd-uninstall.mts
+++ b/src/commands/uninstall/cmd-uninstall.mts
@@ -7,7 +7,7 @@ const description = 'Teardown the Socket command from your environment'
 
 export const cmdUninstall: CliSubcommand = {
   description,
-  hidden: true, // beta; isTestingV1
+  hidden: false,
   async run(argv, importMeta, { parentName }) {
     await meowWithSubcommands(
       {
diff --git a/src/commands/uninstall/cmd-uninstall.test.mts b/src/commands/uninstall/cmd-uninstall.test.mts
index f10b67ee3..841a94b45 100644
--- a/src/commands/uninstall/cmd-uninstall.test.mts
+++ b/src/commands/uninstall/cmd-uninstall.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -22,7 +20,7 @@ describe('socket uninstall', async () => {
             $ socket uninstall <command>
 
           Commands
-            (none)
+            completion        Uninstall bash completion for Socket CLI
 
           Options
             (none)
diff --git a/src/commands/wrapper/cmd-wrapper.mts b/src/commands/wrapper/cmd-wrapper.mts
index 620f9fb24..579a75350 100644
--- a/src/commands/wrapper/cmd-wrapper.mts
+++ b/src/commands/wrapper/cmd-wrapper.mts
@@ -9,7 +9,6 @@ import { removeSocketWrapper } from './remove-socket-wrapper.mts'
 import constants from '../../constants.mts'
 import { commonFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
-import { isTestingV1 } from '../../utils/config.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 import { getFlagListOutput } from '../../utils/output-formatting.mts'
@@ -24,27 +23,21 @@ const config: CliCommandConfig = {
   hidden: false,
   flags: {
     ...commonFlags,
-    enable: {
-      type: 'boolean',
-      default: false,
-      description: 'Enables the Socket npm/npx wrapper',
-    },
-    disable: {
-      type: 'boolean',
-      default: false,
-      description: 'Disables the Socket npm/npx wrapper',
-    },
   },
   help: (command, config) => `
     Usage
-      $ ${command} <flag>
+      $ ${command} <"on" | "off">
 
     Options
       ${getFlagListOutput(config.flags, 6)}
 
+    While enabled, the wrapper makes it so that when you call npm/npx on your
+    machine, it will automatically actually run \`socket npm\` / \`socket npx\`
+    instead.
+
     Examples
-      $ ${command} --enable
-      $ ${command} --disable
+      $ ${command} on
+      $ ${command} off
   `,
 }
 
@@ -73,38 +66,33 @@ async function run(
   })
 
   const { json, markdown } = cli.flags
-  let { disable, enable } = cli.flags
   const outputKind = getOutputKind(json, markdown) // TODO: impl json/md further
 
-  if (isTestingV1()) {
-    const [arg] = cli.input
-    if (arg === 'on' || arg === 'enable' || arg === 'enabled') {
-      enable = true
-      disable = false
-    } else if (arg === 'off' || arg === 'disable' || arg === 'disabled') {
-      enable = false
-      disable = true
-    }
+  let enable = false
+  let disable = false
+  const [arg] = cli.input
+  if (arg === 'on' || arg === 'enable' || arg === 'enabled') {
+    enable = true
+    disable = false
+  } else if (arg === 'off' || arg === 'disable' || arg === 'disabled') {
+    enable = false
+    disable = true
   }
 
   const wasValidInput = checkCommandInput(
     outputKind,
     {
-      test: !!(enable || disable),
-      message: isTestingV1()
-        ? 'Must use on or off argument'
-        : 'Must use --enable or --disable',
+      test: enable || disable,
+      message: 'Must specify "on" or "off" argument',
       pass: 'ok',
       fail: 'missing',
     },
     {
       nook: true,
-      test: !enable || !disable,
-      message: isTestingV1()
-        ? 'Do not use both on and off'
-        : 'Do not use both --enable and --disable',
+      test: cli.input.length <= 1,
+      message: 'expecting exactly one argument',
       pass: 'ok',
-      fail: 'missing',
+      fail: `got multiple`,
     },
   )
   if (!wasValidInput) {
diff --git a/src/commands/wrapper/cmd-wrapper.test.mts b/src/commands/wrapper/cmd-wrapper.test.mts
index 4608c413c..a4ebaaa33 100644
--- a/src/commands/wrapper/cmd-wrapper.test.mts
+++ b/src/commands/wrapper/cmd-wrapper.test.mts
@@ -1,5 +1,3 @@
-import path from 'node:path'
-
 import { describe, expect } from 'vitest'
 
 import constants from '../../../src/constants.mts'
@@ -19,15 +17,18 @@ describe('socket wrapper', async () => {
         "Enable or disable the Socket npm/npx wrapper
 
           Usage
-            $ socket wrapper <flag>
+            $ socket wrapper <"on" | "off">
 
           Options
-            --disable         Disables the Socket npm/npx wrapper
-            --enable          Enables the Socket npm/npx wrapper
+            (none)
+
+          While enabled, the wrapper makes it so that when you call npm/npx on your
+          machine, it will automatically actually run \`socket npm\` / \`socket npx\`
+          instead.
 
           Examples
-            $ socket wrapper --enable
-            $ socket wrapper --disable"
+            $ socket wrapper on
+            $ socket wrapper off"
       `,
       )
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
@@ -57,10 +58,9 @@ describe('socket wrapper', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket wrapper\`, cwd: <redacted>
-
         \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
 
-          - Must use --enable or --disable (\\x1b[31mmissing\\x1b[39m)
+          - Must specify "on" or "off" argument (\\x1b[31mmissing\\x1b[39m)
         \\x1b[22m"
       `)
 
@@ -69,7 +69,7 @@ describe('socket wrapper', async () => {
   )
 
   cmdit(
-    ['wrapper', '--dry-run', '--enable', '--config', '{"apiToken":"anything"}'],
+    ['wrapper', '--dry-run', 'on', '--config', '{"apiToken":"anything"}'],
     'should require args with just dry-run',
     async cmd => {
       const { code, stderr, stdout } = await invokeNpm(binCliPath, cmd)
diff --git a/src/utils/config.mts b/src/utils/config.mts
index 664e684d5..51bf3a046 100644
--- a/src/utils/config.mts
+++ b/src/utils/config.mts
@@ -20,8 +20,7 @@ export interface LocalConfig {
   apiToken?: string | null | undefined
   defaultOrg?: string
   enforcedOrgs?: string[] | readonly string[] | null | undefined
-  // Temporary to prepare (and mark) CLI API changes for the major bump
-  isTestingV1?: boolean
+  org?: string // convenience alias for defaultOrg
 }
 
 export const sensitiveConfigKeys: Set<keyof LocalConfig> = new Set(['apiToken'])
@@ -38,7 +37,7 @@ export const supportedConfigKeys: Map<keyof LocalConfig, string> = new Map([
     'enforcedOrgs',
     'Orgs in this list have their security policies enforced on this machine',
   ],
-  ['isTestingV1', 'For development of testing the next major bump'],
+  ['org', 'Alias for defaultOrg'],
 ])
 
 function getConfigValues(): LocalConfig {
@@ -78,7 +77,9 @@ function normalizeConfigKey(
 ): CResult<keyof LocalConfig> {
   // Note: apiKey was the old name of the token. When we load a config with
   //       property apiKey, we'll copy that to apiToken and delete the old property.
-  const normalizedKey = key === 'apiKey' ? 'apiToken' : key
+  // We added `org` as a convenience alias for `defaultOrg`
+  const normalizedKey =
+    key === 'apiKey' ? 'apiToken' : key === 'org' ? 'defaultOrg' : key
   if (!supportedConfigKeys.has(normalizedKey)) {
     return {
       ok: false,
@@ -86,7 +87,7 @@ function normalizeConfigKey(
       data: undefined,
     }
   }
-  return { ok: true, data: key }
+  return { ok: true, data: normalizedKey }
 }
 
 export function findSocketYmlSync(dir = process.cwd()) {
@@ -142,10 +143,6 @@ export function isReadOnlyConfig() {
   return _readOnlyConfig
 }
 
-export function isTestingV1() {
-  return !!getConfigValueOrUndef('isTestingV1')
-}
-
 let _cachedConfig: LocalConfig | undefined
 // When using --config or SOCKET_CLI_CONFIG, do not persist the config.
 let _readOnlyConfig = false
@@ -182,7 +179,7 @@ export function overrideCachedConfig(jsonConfig: unknown): CResult<undefined> {
   _cachedConfig = config as LocalConfig
   _readOnlyConfig = true
 
-  // Normalize apiKey to apiToken.
+  // Normalize apiKey to apiToken
   if (_cachedConfig['apiKey']) {
     if (_cachedConfig['apiToken']) {
       logger.warn(
@@ -221,7 +218,7 @@ export function updateConfigValue<Key extends keyof LocalConfig>(
   if (_readOnlyConfig) {
     return {
       ok: true,
-      message: `Config key '${key}' was updated`,
+      message: `Config key '${keyResult.data}' was updated`,
       data: 'Change applied but not persisted; current config is overridden through env var or flag',
     }
   }
@@ -243,7 +240,7 @@ export function updateConfigValue<Key extends keyof LocalConfig>(
 
   return {
     ok: true,
-    message: `Config key '${key}' was updated`,
+    message: `Config key '${keyResult.data}' was updated`,
     data: undefined,
   }
 }
diff --git a/src/utils/determine-org-slug.mts b/src/utils/determine-org-slug.mts
index dd0278262..fe0a02968 100644
--- a/src/utils/determine-org-slug.mts
+++ b/src/utils/determine-org-slug.mts
@@ -1,34 +1,29 @@
 import { logger } from '@socketsecurity/registry/lib/logger'
 
-import { getConfigValueOrUndef, isTestingV1 } from './config.mts'
+import { getConfigValueOrUndef } from './config.mts'
 import { suggestOrgSlug } from '../commands/scan/suggest-org-slug.mts'
 
 export async function determineOrgSlug(
   orgFlag: string,
-  firstArg: string,
   interactive: boolean,
   dryRun: boolean,
 ): Promise<[string, string | undefined]> {
   const defaultOrgSlug = getConfigValueOrUndef('defaultOrg')
   let orgSlug = String(orgFlag || defaultOrgSlug || '')
   if (!orgSlug) {
-    if (isTestingV1()) {
-      // ask from server
-      logger.warn(
-        'Missing the org slug and no --org flag set. Trying to auto-discover the org now...',
-      )
-      logger.info(
-        '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.fail('Skipping auto-discovery of org in dry-run mode')
-      } else if (!interactive) {
-        logger.fail('Skipping auto-discovery of org when interactive = false')
-      } else {
-        orgSlug = (await suggestOrgSlug()) || ''
-      }
+    // ask from server
+    logger.warn(
+      'Missing the org slug and no --org flag set. Trying to auto-discover the org now...',
+    )
+    logger.info(
+      '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.fail('Skipping auto-discovery of org in dry-run mode')
+    } else if (!interactive) {
+      logger.fail('Skipping auto-discovery of org when interactive = false')
     } else {
-      orgSlug = firstArg || ''
+      orgSlug = (await suggestOrgSlug()) || ''
     }
   }
 
diff --git a/src/utils/meow-with-subcommands.mts b/src/utils/meow-with-subcommands.mts
index 939aa8cfe..293852d86 100644
--- a/src/utils/meow-with-subcommands.mts
+++ b/src/utils/meow-with-subcommands.mts
@@ -1,6 +1,4 @@
 import meow from 'meow'
-import semver from 'semver'
-import colors from 'yoctocolors-cjs'
 
 import { joinAnd } from '@socketsecurity/registry/lib/arrays'
 import { logger } from '@socketsecurity/registry/lib/logger'
@@ -11,7 +9,6 @@ import { naturalCompare } from '@socketsecurity/registry/lib/sorts'
 import {
   getConfigValueOrUndef,
   isReadOnlyConfig,
-  isTestingV1,
   overrideCachedConfig,
   overrideConfigApiToken,
 } from './config.mts'
@@ -222,14 +219,8 @@ export async function meowWithSubcommands(
     }
   }
 
-  if (isTestingV1()) {
-    delete subcommands['diff-scan']
-    delete subcommands['info']
-    delete subcommands['report']
-  }
-
   function formatCommandsForHelp(isRootCommand: boolean) {
-    if (!isRootCommand || !isTestingV1()) {
+    if (!isRootCommand) {
       return getHelpListOutput(
         {
           ...toSortedObject(
@@ -259,7 +250,6 @@ export async function meowWithSubcommands(
       'analytics',
       'audit-log',
       'config',
-      'dependencies',
       'fix',
       'install',
       'login',
@@ -384,11 +374,11 @@ export async function meowWithSubcommands(
     Usage
       $ ${name} <command>
 
-${isRootCommand && isTestingV1() ? '' : '    Commands'}
+${isRootCommand ? '' : '    Commands'}
       ${formatCommandsForHelp(isRootCommand)}
 
-${isRootCommand && isTestingV1() ? '    Options' : '    Options'}${isRootCommand ? '       (Note: all CLI commands have these flags even when not displayed in their help)\n' : ''}
-      ${getFlagListOutput(flags, 6, isTestingV1() ? { padName: 25 } : undefined)}
+${isRootCommand ? '    Options' : '    Options'}${isRootCommand ? '       (Note: all CLI commands have these flags even when not displayed in their help)\n' : ''}
+      ${getFlagListOutput(flags, 6, { padName: 25 })}
 
     Examples
       $ ${name} --help
@@ -521,29 +511,13 @@ function getAsciiHeader(command: string) {
   const nodeVersion = redacting ? REDACTED : process.version
   const defaultOrg = getConfigValueOrUndef('defaultOrg')
   const readOnlyConfig = isReadOnlyConfig() ? '*' : '.'
-  const v1test = isTestingV1() ? ' (is testing v1)' : ''
-  const feedback = isTestingV1()
-    ? colors.green(
-        '   (Thank you for testing the v1 bump! Please send us any feedback you might have!)\n',
-      )
-    : ''
   const shownToken = redacting ? REDACTED : getVisibleTokenPrefix() || 'no'
   const relCwd = redacting ? REDACTED : normalizePath(tildify(process.cwd()))
-  let nodeVerWarn = ''
-  if (semver.parse(constants.NODE_VERSION)!.major < 20) {
-    nodeVerWarn += colors.bold(
-      `   ${colors.red('Warning:')} NodeJS version 19 and lower will be ${colors.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}${v1test}
-  |__   | ${readOnlyConfig} |  _| '_| -_|  _|     | Node: ${nodeVersion}, API token set: ${shownToken}${defaultOrg ? `, default org: ${redacting ? REDACTED : defaultOrg}` : ''}
+  |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver ${cliVersion}
+  |__   | ${readOnlyConfig} |  _| '_| -_|  _|     | Node: ${nodeVersion}, API token set: ${shownToken}${defaultOrg ? `, org: ${redacting ? REDACTED : defaultOrg}` : ''}
   |_____|___|___|_,_|___|_|.dev   | Command: \`${command}\`, cwd: ${relCwd}`.trimStart()
 
-  return `   ${body}\n${nodeVerWarn}${feedback}`
+  return `   ${body}` // Note: logger will auto-append a newline
 }
diff --git a/src/utils/ms-at-home.mts b/src/utils/ms-at-home.mts
new file mode 100644
index 000000000..b57f5b4f1
--- /dev/null
+++ b/src/utils/ms-at-home.mts
@@ -0,0 +1,23 @@
+export function msAtHome(isoTimeStamp: string): string {
+  const timeStart = Date.parse(isoTimeStamp)
+  const timeEnd = Date.now()
+
+  const rtf = new Intl.RelativeTimeFormat('en', {
+    numeric: 'always',
+    style: 'short',
+  })
+
+  const delta = timeEnd - timeStart
+  if (delta < 60 * 60 * 1000) {
+    return rtf.format(-Math.round(delta / (60 * 1000)), 'minute')
+    // return Math.round(delta / (60 * 1000)) + ' min ago'
+  } else if (delta < 24 * 60 * 60 * 1000) {
+    return rtf.format(-(delta / (60 * 60 * 1000)).toFixed(1), 'hour')
+    // return (delta / (60 * 60 * 1000)).toFixed(1) + ' hr ago'
+  } else if (delta < 7 * 24 * 60 * 60 * 1000) {
+    return rtf.format(-(delta / (24 * 60 * 60 * 1000)).toFixed(1), 'day')
+    // return (delta / (24 * 60 * 60 * 1000)).toFixed(1) + ' day ago'
+  } else {
+    return isoTimeStamp.slice(0, 10)
+  }
+}
diff --git a/test/smoke.sh b/test/smoke.sh
index 2ffbe3073..fcc77fc27 100755
--- a/test/smoke.sh
+++ b/test/smoke.sh
@@ -47,7 +47,6 @@ restore_config() {
     echo -e "\n${YELLOW}Restoring backed up configuration values...${NC}"
     eval "${COMMAND_PREFIX} config set defaultOrg ${DEFORG_BAK}"
     eval "${COMMAND_PREFIX} config set apiToken ${TOKEN_BAK}"
-    eval "${COMMAND_PREFIX} config set isTestingV1 ${TESTV1_BAK}"
     echo -e "${GREEN}Configuration restored!${NC}"
 }
 
@@ -259,15 +258,11 @@ fi
 echo "Backing up default org and apitoken..."
 DEFORG_BAK=$(eval "$COMMAND_PREFIX config get defaultOrg --json" | jq -r '.data' )
 TOKEN_BAK=$(eval "$COMMAND_PREFIX config get apiToken --json" | jq -r '.data' )
-TESTV1_BAK=$(eval "$COMMAND_PREFIX config get isTestingV1 --json" | jq -r '.data' )
 echo "Backing complete!"
 
 # Set up trap to restore config on any exit
 trap restore_config EXIT
 
-# This smoke test assumes the <v1 cli api
-run_socket 0 config set isTestingV1 true
-
 ### Analytics
 
 if should_run_section "analytics"; then
@@ -343,20 +338,20 @@ fi
 ### dependencies
 
 if should_run_section "dependencies"; then
-    run_socket 0 dependencies
-    run_socket 0 dependencies --help
-    run_socket 0 dependencies --dry-run
-    run_json   0 dependencies --json
-    run_socket 0 dependencies --markdown
-
-    run_socket 0 dependencies --limit 1
-    run_socket 0 dependencies --offset 5
-    run_socket 0 dependencies --limit 1 --offset 10
-
-    #run_json   2 dependencies --json --wat foo
-    run_json   0 dependencies --json --limit -200
-    run_json   0 dependencies --json --limit NaN
-    run_json   0 dependencies --json --limit foo
+    run_socket 0 organization dependencies
+    run_socket 0 organization dependencies --help
+    run_socket 0 organization dependencies --dry-run
+    run_json   0 organization dependencies --json
+    run_socket 0 organization dependencies --markdown
+
+    run_socket 0 organization dependencies --limit 1
+    run_socket 0 organization dependencies --offset 5
+    run_socket 0 organization dependencies --limit 1 --offset 10
+
+    #run_json   2 organization dependencies --json --wat foo
+    run_json   0 organization dependencies --json --limit -200
+    run_json   0 organization dependencies --json --limit NaN
+    run_json   0 organization dependencies --json --limit foo
 fi
 
 ### fix
@@ -404,27 +399,27 @@ if should_run_section "manifest"; then
     run_socket 2 manifest
     run_socket 0 manifest --help
     run_socket 0 manifest --dry-run
-    run_socket 2 manifest auto
+    run_socket 1 manifest auto
     run_socket 0 manifest auto --help
     run_socket 0 manifest auto --dry-run
-    run_socket 2 manifest conda
+    run_socket 1 manifest conda
     run_socket 0 manifest conda --help
-    run_socket 2 manifest conda --dry-run
-    run_socket 2 manifest gradle
+    run_socket 0 manifest conda --dry-run
+    run_socket 1 manifest gradle
     run_socket 0 manifest gradle --help
-    run_socket 2 manifest gradle --dry-run
-    run_socket 2 manifest kotlin
+    run_socket 1 manifest gradle --dry-run
+    run_socket 1 manifest kotlin
     run_socket 0 manifest kotlin --help
-    run_socket 2 manifest kotlin --dry-run
-    run_socket 2 manifest scala
+    run_socket 0 manifest kotlin --dry-run
+    run_socket 1 manifest scala
     run_socket 0 manifest scala --help
-    run_socket 2 manifest scala --dry-run
+    run_socket 0 manifest scala --dry-run
 fi
 
 ### npm
 
 if should_run_section "npm"; then
-    run_socket 1 npm
+    run_socket 0 npm info
     run_socket 0 npm --help
     run_socket 0 npm --dry-run
     run_socket 0 npm info
@@ -433,7 +428,7 @@ fi
 ### npx
 
 if should_run_section "npx"; then
-    run_socket 2 npx
+    run_socket 0 npx cowsay moo
     run_socket 0 npx --help
     run_socket 0 npx --dry-run
     run_socket 0 npx socket --dry-run
@@ -452,6 +447,8 @@ fi
 
 if should_run_section "optimize"; then
     run_socket 0 optimize
+    run_socket 0 optimize --prod
+    run_socket 0 optimize --pin
     run_socket 0 optimize --help
     run_socket 0 optimize --dry-run
 fi
@@ -459,7 +456,7 @@ fi
 ### organization
 
 if should_run_section "organization"; then
-    run_socket 0 organization
+    run_socket 2 organization
     run_socket 0 organization --help
     run_socket 0 organization --dry-run
     run_socket 0 organization list
@@ -495,9 +492,20 @@ if should_run_section "organization"; then
     run_json   1 organization policy license --org trash --json
     run_socket 0 organization policy license --org $DEFORG_BAK
 
+    echo ""
+    echo ""
+    echo "Clearing defaultOrg for next tests"
     eval "$COMMAND_PREFIX config unset defaultOrg"
-    run_json   2 organization policy security --json --no-interactive
-    run_json   2 organization policy license --json --no-interactive
+    run_json   1 organization policy security --json --no-interactive
+    run_json   1 organization policy license --json --no-interactive
+    echo ""
+    echo ""
+    echo "Setting defaultOrg to an invalid org for the next tests"
+    eval "$COMMAND_PREFIX config set defaultOrg fake_org"
+    run_json   1 organization policy security --json --no-interactive
+    run_json   1 organization policy license --json --no-interactive
+    echo ""
+    echo ""
     echo "Restoring default org to $DEFORG_BAK"
     eval "${COMMAND_PREFIX} config set defaultOrg $DEFORG_BAK"
 fi
@@ -548,7 +556,7 @@ fi
 ### raw-npx
 
 if should_run_section "raw-npx"; then
-    run_socket 0 raw-npx                                    # interactive shell...
+    run_socket 0 raw-npx cowsay moo
     run_socket 0 raw-npx --help
     run_socket 0 raw-npx --dry-run
     run_socket 0 raw-npx socket --dry-run
@@ -577,18 +585,26 @@ if should_run_section "repos"; then
     run_socket 2 repos del --dry-run
     run_socket 0 repos del cli-smoke-test
 
+    echo ""
+    echo ""
+    echo "Clearing defaultOrg for next tests"
     eval "$COMMAND_PREFIX config unset defaultOrg"
     run_json   2 repos create 'cli_donotcreate' --json --no-interactive
     run_json   2 repos del 'cli_donotcreate' --json --no-interactive
     run_json   2 repos view 'cli_donotcreate' --json --no-interactive
     run_json   2 repos list --json --no-interactive
     run_json   2 repos update 'cli_donotcreate' --homepage evil --json --no-interactive
+    echo ""
+    echo ""
+    echo "Setting defaultOrg to an invalid org for the next tests"
     eval "$COMMAND_PREFIX config set defaultOrg fake_org"
     run_json   1 repos create 'cli_donotcreate' --json
     run_json   1 repos del 'cli_donotcreate' --json
     run_json   1 repos view 'cli_donotcreate' --json
     run_json   1 repos list --json
     run_json   1 repos update 'cli_donotcreate' --homepage evil --json
+    echo ""
+    echo ""
     echo "Restoring default org to $DEFORG_BAK"
     eval "${COMMAND_PREFIX} config set defaultOrg $DEFORG_BAK"
     run_json   1 repos view 'cli_donotcreate' --json
@@ -653,18 +669,27 @@ if should_run_section "scan"; then
     run_json   1 scan metadata "$SBOM_ID" --org fake_org --json
     run_socket 1 scan diff "$SBOM_ID" "$SBOM_ID" --org fake_org
     run_json   1 scan diff "$SBOM_ID" "$SBOM_ID" --org fake_org --json
+
+    echo ""
+    echo ""
+    echo "Clearing defaultOrg for the next tests"
     eval "$COMMAND_PREFIX config unset defaultOrg"
     run_json   2 scan create . --json --no-interactive
     run_json   2 scan view "$SBOM_ID" --json --no-interactive
     run_json   2 scan report "$SBOM_ID" --json --no-interactive
     run_json   2 scan metadata "$SBOM_ID" --json --no-interactive
     run_json   2 scan diff "$SBOM_ID" "$SBOM_ID" --json --no-interactive
+    echo ""
+    echo ""
+    echo "Setting defaultOrg to an invalid org for the next tests"
     eval "$COMMAND_PREFIX config set defaultOrg fake_org"
     run_json   1 scan create . --json
     run_json   1 scan view "$SBOM_ID" --json
     run_json   1 scan report "$SBOM_ID" --json
     run_json   1 scan metadata "$SBOM_ID" --json
     run_json   1 scan diff "$SBOM_ID" "$SBOM_ID" --json
+    echo ""
+    echo ""
     echo "Restoring default org to $DEFORG_BAK"
     eval "${COMMAND_PREFIX} config set defaultOrg $DEFORG_BAK"
 fi
@@ -687,8 +712,8 @@ if should_run_section "wrapper"; then
     run_socket 2 wrapper
     run_socket 0 wrapper --help
     run_socket 2 wrapper --dry-run
-    run_socket 0 wrapper --enable
-    run_socket 0 wrapper --disable
+    run_socket 0 wrapper on
+    run_socket 0 wrapper off
 fi
 
 ### The end