Improve banner spacing logic

src/commands/audit-log/cmd-audit-log.test.mts

@@ -78,10 +78,11 @@ describe('socket audit-log', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)

src/commands/config/cmd-config.test.mts

@@ -84,6 +84,7 @@ describe('socket config', async () => {
             |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
             |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
             |_____|___|___|_,_|___|_|.dev   | Command: \`socket\`, cwd: <redacted>
+
           \\x1b[31m\\xd7\\x1b[39m Could not parse Config as JSON"
         `)
 
@@ -104,6 +105,7 @@ describe('socket config', async () => {
             |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
             |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
             |_____|___|___|_,_|___|_|.dev   | Command: \`socket\`, cwd: <redacted>
+
           \\x1b[31m\\xd7\\x1b[39m Could not parse Config as JSON"
         `)
 

src/commands/json/cmd-json.test.mts

@@ -51,6 +51,7 @@ describe('socket json', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket json\`, cwd: <redacted>
+
         \\x1b[34mi\\x1b[39m Target cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m Not found: <redacted>"
       `)
@@ -71,6 +72,7 @@ describe('socket json', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket json\`, cwd: <redacted>
+
         \\x1b[34mi\\x1b[39m Target cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m Not found: <redacted>"
       `)
@@ -97,6 +99,7 @@ describe('socket json', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket json\`, cwd: <redacted>
+
         \\x1b[34mi\\x1b[39m Target cwd: <redacted>
         \\x1b[31m\\xd7\\x1b[39m Not found: <redacted>"
       `)
@@ -136,6 +139,7 @@ describe('socket json', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <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>:"
       `)

src/commands/manifest/cmd-manifest-conda.test.mts

@@ -70,6 +70,7 @@ describe('socket manifest conda', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <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."
       `)
 

src/commands/organization/cmd-organization-policy-license.test.mts

@@ -66,10 +66,11 @@ describe('socket organization policy license', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)
@@ -100,8 +101,10 @@ describe('socket organization policy license', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy license\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
+
         \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode"
       `)
 

src/commands/organization/cmd-organization-policy-security.test.mts

@@ -66,10 +66,11 @@ describe('socket organization policy security', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket organization policy security\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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
 
           - You need to be logged in to use this command. See \`socket login\`. (\\x1b[31mmissing API token\\x1b[39m)

src/commands/repository/cmd-repository-create.test.mts

@@ -67,10 +67,11 @@ describe('socket repository create', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)
@@ -132,10 +133,11 @@ describe('socket repository create', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository create\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)

src/commands/repository/cmd-repository-del.test.mts

@@ -60,10 +60,11 @@ describe('socket repository del', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)
@@ -125,10 +126,11 @@ describe('socket repository del', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository del\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)

src/commands/repository/cmd-repository-list.test.mts

@@ -68,10 +68,11 @@ describe('socket repository list', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository list\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)
@@ -123,10 +124,11 @@ describe('socket repository list', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository list\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)

src/commands/repository/cmd-repository-update.test.mts

@@ -65,10 +65,11 @@ describe('socket repository update', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository update\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)
@@ -102,10 +103,11 @@ describe('socket repository update', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository update\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)

src/commands/repository/cmd-repository-view.test.mts

@@ -61,10 +61,11 @@ describe('socket repository view', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)
@@ -126,10 +127,11 @@ describe('socket repository view', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket repository view\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)

src/commands/scan/cmd-scan-create.mts

@@ -3,6 +3,7 @@ import path from 'node:path'
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { handleCreateNewScan } from './handle-create-new-scan.mts'
+import { outputCreateNewScan } from './output-create-new-scan.mjs'
 import { suggestOrgSlug } from './suggest-org-slug.mts'
 import { suggestTarget } from './suggest_target.mts'
 import constants from '../../constants.mts'
@@ -299,6 +300,18 @@ async function run(
   if (hasApiToken && !dryRun && interactive) {
     if (!orgSlug) {
       const suggestion = await suggestOrgSlug()
+      if (suggestion === undefined) {
+        await outputCreateNewScan(
+          {
+            ok: false,
+            message: 'Canceled by user',
+            cause: 'Org selector was canceled by user',
+          },
+          outputKind,
+          false,
+        )
+        return
+      }
       if (suggestion) {
         orgSlug = suggestion
       }

src/commands/scan/cmd-scan-del.test.mts

@@ -61,10 +61,11 @@ describe('socket scan del', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan del\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)

src/commands/scan/cmd-scan-diff.test.mts

@@ -71,10 +71,11 @@ describe('socket scan diff', async () => {
           |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
           |__   | * |  _| '_| -_|  _|     | Node: <redacted>, API token: <redacted>, org: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan diff\`, cwd: <redacted>
+
         \\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
         \\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
-        \\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
 
+        \\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)