merge with main

mtorp · mtorp · commit 24a490c730e6 · 2025-08-18T19:47:12.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socket",
-  "version": "1.0.90",
+  "version": "1.0.91",
   "description": "CLI for Socket.dev",
   "homepage": "https://github.com/SocketDev/socket-cli",
   "license": "MIT",
@@ -85,7 +85,7 @@
     "@babel/runtime": "7.28.3",
     "@biomejs/biome": "2.2.0",
     "@coana-tech/cli": "14.11.14",
-    "@cyclonedx/cdxgen": "11.5.0",
+    "@cyclonedx/cdxgen": "11.6.0",
     "@dotenvx/dotenvx": "1.48.4",
     "@eslint/compat": "1.3.2",
     "@eslint/js": "9.33.0",
@@ -125,7 +125,7 @@
     "@types/semver": "7.7.0",
     "@types/which": "3.0.4",
     "@types/yargs-parser": "21.0.3",
-    "@typescript-eslint/parser": "8.39.1",
+    "@typescript-eslint/parser": "8.40.0",
     "@typescript/native-preview": "7.0.0-dev.20250529.1",
     "@vitest/coverage-v8": "3.2.4",
     "blessed": "0.1.81",
@@ -158,18 +158,18 @@
     "npm-package-arg": "13.0.0",
     "npm-run-all2": "8.0.4",
     "open": "10.2.0",
-    "oxlint": "1.11.2",
+    "oxlint": "1.12.0",
     "pony-cause": "2.1.11",
     "registry-auth-token": "5.1.0",
     "registry-url": "7.2.0",
-    "rollup": "4.46.2",
+    "rollup": "4.46.3",
     "semver": "7.7.2",
     "synp": "1.9.14",
     "terminal-link": "2.1.1",
     "tiny-updater": "3.5.3",
     "trash": "9.0.0",
     "type-coverage": "2.29.7",
-    "typescript-eslint": "8.39.1",
+    "typescript-eslint": "8.40.0",
     "unplugin-purge-polyfills": "0.1.0",
     "vitest": "3.2.4",
     "which": "5.0.0",
diff --git a/src/commands/audit-log/cmd-audit-log.mts b/src/commands/audit-log/cmd-audit-log.mts
@@ -92,10 +92,12 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag, page, perPage } = cli.flags
+  const { json, markdown, org: orgFlag, page, perPage } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const noLegacy = !cli.flags['type']
 
   let [typeFilter = ''] = cli.input
@@ -106,7 +108,7 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/organization/cmd-organization-policy-license.mts b/src/commands/organization/cmd-organization-policy-license.mts
@@ -71,15 +71,17 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag } = cli.flags
+  const { json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const hasApiToken = hasDefaultToken()
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/organization/cmd-organization-policy-security.mts b/src/commands/organization/cmd-organization-policy-security.mts
@@ -71,15 +71,17 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag } = cli.flags
+  const { json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const hasApiToken = hasDefaultToken()
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/repository/cmd-repository-create.mts b/src/commands/repository/cmd-repository-create.mts
@@ -90,10 +90,12 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag } = cli.flags
+  const { json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const noLegacy = !cli.flags['repoName']
 
   const [repoName = ''] = cli.input
@@ -102,7 +104,7 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/repository/cmd-repository-del.mts b/src/commands/repository/cmd-repository-del.mts
@@ -67,10 +67,12 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag } = cli.flags
+  const { json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const noLegacy = !cli.flags['repoName']
 
   const [repoName = ''] = cli.input
@@ -79,7 +81,7 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/repository/cmd-repository-list.mts b/src/commands/repository/cmd-repository-list.mts
@@ -97,22 +97,17 @@ async function run(
     parentName,
   })
 
-  const {
-    all,
-    direction = 'desc',
-    interactive,
-    json,
-    markdown,
-    org: orgFlag,
-  } = cli.flags
+  const { all, direction = 'desc', json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const hasApiToken = hasDefaultToken()
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/repository/cmd-repository-update.mts b/src/commands/repository/cmd-repository-update.mts
@@ -92,10 +92,12 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag } = cli.flags
+  const { json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const noLegacy = !cli.flags['repoName']
 
   const [repoName = ''] = cli.input
@@ -104,7 +106,7 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/repository/cmd-repository-view.mts b/src/commands/repository/cmd-repository-view.mts
@@ -68,10 +68,12 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag } = cli.flags
+  const { json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const noLegacy = !cli.flags['repoName']
 
   const [repoName = ''] = cli.input
@@ -80,7 +82,7 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/scan/cmd-scan-del.mts b/src/commands/scan/cmd-scan-del.mts
@@ -68,17 +68,19 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag } = cli.flags
+  const { json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const [scanId = ''] = cli.input
 
   const hasApiToken = hasDefaultToken()
 
   const [orgSlug, defaultOrgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/scan/cmd-scan-diff.mts b/src/commands/scan/cmd-scan-diff.mts
@@ -93,10 +93,12 @@ async function run(
     parentName,
   })
 
-  const { depth, file, interactive, json, markdown, org: orgFlag } = cli.flags
+  const { depth, file, json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   let [id1 = '', id2 = ''] = cli.input
   // Support dropping in full socket urls to an sbom.
   if (id1.startsWith(SOCKET_SBOM_URL_PREFIX)) {
@@ -110,7 +112,7 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/scan/cmd-scan-list.mts b/src/commands/scan/cmd-scan-list.mts
@@ -116,16 +116,12 @@ async function run(
     parentName,
   })
 
-  const {
-    branch: branchFlag,
-    interactive,
-    json,
-    markdown,
-    org: orgFlag,
-  } = cli.flags
+  const { branch: branchFlag, json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const noLegacy = !cli.flags['repo']
 
   const [repo = '', branchArg = ''] = cli.input
@@ -136,7 +132,7 @@ async function run(
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/scan/cmd-scan-metadata.mts b/src/commands/scan/cmd-scan-metadata.mts
@@ -71,17 +71,19 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag } = cli.flags
+  const { json, markdown, org: orgFlag } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const [scanId = ''] = cli.input
 
   const hasApiToken = hasDefaultToken()
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/scan/cmd-scan-report.mts b/src/commands/scan/cmd-scan-report.mts
@@ -119,7 +119,6 @@ async function run(
 
   const {
     fold = 'none',
-    interactive,
     json,
     license,
     markdown,
@@ -129,13 +128,15 @@ async function run(
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const [scanId = '', file = ''] = cli.input
 
   const hasApiToken = hasDefaultToken()
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/scan/cmd-scan-view.mts b/src/commands/scan/cmd-scan-view.mts
@@ -80,17 +80,19 @@ async function run(
     parentName,
   })
 
-  const { interactive, json, markdown, org: orgFlag, stream } = cli.flags
+  const { json, markdown, org: orgFlag, stream } = cli.flags
 
   const dryRun = !!cli.flags['dryRun']
 
+  const interactive = !!cli.flags['interactive']
+
   const [scanId = '', file = ''] = cli.input
 
   const hasApiToken = hasDefaultToken()
 
   const [orgSlug] = await determineOrgSlug(
     String(orgFlag || ''),
-    !!interactive,
+    interactive,
     dryRun,
   )
 
diff --git a/src/commands/scan/finalize-tier1-scan.mts b/src/commands/scan/finalize-tier1-scan.mts
@@ -13,16 +13,16 @@ export type FinalizeTier1ScanOptions = {
  *  - Sets the tier1 reachability scan to "finalized" state.
  */
 export async function finalizeTier1Scan(
-  tier1_reachability_scan_id: string,
-  report_run_id: string,
+  tier1ReachabilityScanId: string,
+  scanId: string,
 ): Promise<CResult<unknown>> {
   // we do not use the SDK here because the tier1-reachability-scan/finalize is a hidden
   // endpoint that is not part of the OpenAPI specification.
   return await sendApiRequest('tier1-reachability-scan/finalize', {
     method: 'POST',
     body: {
-      tier1_reachability_scan_id,
-      report_run_id,
+      tier1_reachability_scan_id: tier1ReachabilityScanId,
+      report_run_id: scanId,
     },
   })
 }
diff --git a/src/commands/scan/handle-create-new-scan.mts b/src/commands/scan/handle-create-new-scan.mts
diff --git a/src/commands/scan/handle-scan-reach.mts b/src/commands/scan/handle-scan-reach.mts
diff --git a/src/commands/scan/perform-reachability-analysis.mts b/src/commands/scan/perform-reachability-analysis.mts
diff --git a/src/commands/threat-feed/cmd-threat-feed.mts b/src/commands/threat-feed/cmd-threat-feed.mts
