Use git repo information for default branch name and repo name

jdalton · jdalton · commit 4a09d107cd36 · 2025-07-12T09:38:51.000-04:00
diff --git a/src/commands/ci/handle-ci.mts b/src/commands/ci/handle-ci.mts
@@ -1,6 +1,7 @@
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { getDefaultOrgSlug } from './fetch-default-org-slug.mts'
+import { getRepoName, gitBranch } from '../../utils/git.mts'
 import { serializeResultJson } from '../../utils/serialize-result-json.mts'
 import { handleCreateNewScan } from '../scan/handle-create-new-scan.mts'
 
@@ -17,10 +18,12 @@ export async function handleCI(autoManifest: boolean): Promise<void> {
     return
   }
 
+  const cwd = process.cwd()
+
   // TODO: does it makes sense to use custom branch/repo names here? probably socket.yml, right
   await handleCreateNewScan({
     autoManifest,
-    branchName: 'socket-default-branch',
+    branchName: (await gitBranch(cwd)) || 'socket-default-branch',
     commitMessage: '',
     commitHash: '',
     committers: '',
@@ -29,12 +32,14 @@ export async function handleCI(autoManifest: boolean): Promise<void> {
     interactive: false,
     orgSlug: result.data,
     outputKind: 'json',
-    pendingHead: true, // when true, requires branch name set, tmp false
+    // When 'pendingHead' is true, it requires 'branchName' set and 'tmp' false.
+    pendingHead: true,
     pullRequest: 0,
-    repoName: 'socket-default-repository',
+    repoName: (await getRepoName(cwd)) || 'socket-default-repository',
     readOnly: false,
     report: true,
     targets: ['.'],
-    tmp: false, // don't set when pendingHead is true
+    // Don't set 'tmp' when 'pendingHead' is true.
+    tmp: false,
   })
 }
diff --git a/src/commands/fix/fix-env-helpers.mts b/src/commands/fix/fix-env-helpers.mts
@@ -2,7 +2,7 @@ import { debugFn } from '@socketsecurity/registry/lib/debug'
 
 import { getSocketPrs } from './pull-request.mts'
 import constants from '../../constants.mts'
-import { getBaseGitBranch, gitRepoInfo } from '../../utils/git.mts'
+import { getBaseBranch, getRepoInfo } from '../../utils/git.mts'
 
 import type { PrMatch } from './pull-request.mts'
 import type { RepoInfo } from '../../utils/git.mts'
@@ -35,7 +35,7 @@ export interface FixEnv {
 }
 
 export async function getFixEnv(): Promise<FixEnv> {
-  const baseBranch = await getBaseGitBranch()
+  const baseBranch = await getBaseBranch()
   const gitEmail = constants.ENV.SOCKET_CLI_GIT_USER_EMAIL
   const gitUser = constants.ENV.SOCKET_CLI_GIT_USER_NAME
   const githubToken = constants.ENV.SOCKET_CLI_GITHUB_TOKEN
@@ -48,7 +48,7 @@ export async function getFixEnv(): Promise<FixEnv> {
     if (isCi) {
       debugFn('notice', 'falling back to `git remote get-url origin`')
     }
-    repoInfo = await gitRepoInfo()
+    repoInfo = await getRepoInfo()
   }
   const prs =
     isCi && repoInfo
diff --git a/src/commands/scan/cmd-scan-create.mts b/src/commands/scan/cmd-scan-create.mts
@@ -11,6 +11,7 @@ import { commonFlags, outputFlags } from '../../flags.mts'
 import { checkCommandInput } from '../../utils/check-input.mts'
 import { determineOrgSlug } from '../../utils/determine-org-slug.mts'
 import { getOutputKind } from '../../utils/get-output-kind.mts'
+import { getRepoName, gitBranch } from '../../utils/git.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
 import { getFlagListOutput } from '../../utils/output-formatting.mts'
 import { hasDefaultToken } from '../../utils/sdk.mts'
@@ -255,15 +256,15 @@ async function run(
       branchName = sockJson.defaults.scan.create.branch
       logger.info('Using default --branch from socket.json:', branchName)
     } else {
-      branchName = 'socket-default-branch'
+      branchName = (await gitBranch(cwd)) || 'socket-default-branch'
     }
   }
   if (!repoName) {
     if (sockJson.defaults?.scan?.create?.repo) {
       repoName = sockJson.defaults.scan.create.repo
       logger.info('Using default --repo from socket.json:', repoName)
     } else {
-      repoName = 'socket-default-repository'
+      repoName = (await getRepoName(cwd)) || 'socket-default-repository'
     }
   }
   if (typeof report !== 'boolean') {
diff --git a/src/commands/scan/fetch-create-org-full-scan.mts b/src/commands/scan/fetch-create-org-full-scan.mts
@@ -1,4 +1,5 @@
 import { handleApiCall } from '../../utils/api.mts'
+import { getRepoName } from '../../utils/git.mts'
 import { setupSdk } from '../../utils/sdk.mts'
 
 import type { CResult } from '../../types.mts'
@@ -43,7 +44,9 @@ export async function fetchCreateOrgFullScan(
         ...(committers ? { committers } : {}),
         make_default_branch: String(defaultBranch),
         ...(pullRequest ? { pull_request: String(pullRequest) } : {}),
-        repo: repoName || 'socket-default-repository', // mandatory, this is server default for repo
+        // The repo is mandatory, this is server default for repo.
+        repo:
+          repoName || (await getRepoName(cwd)) || 'socket-default-repository',
         set_as_pending_head: String(pendingHead),
         tmp: String(tmp),
       },
diff --git a/src/commands/scan/setup-scan-config.mts b/src/commands/scan/setup-scan-config.mts
@@ -5,6 +5,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { input, select } from '@socketsecurity/registry/lib/prompts'
 
 import constants from '../../constants.mts'
+import { getRepoName, gitBranch } from '../../utils/git.mts'
 import {
   type SocketJson,
   readSocketJson,
@@ -77,7 +78,7 @@ export async function setupScanConfig(
       if (!sockJson.defaults.scan.create) {
         sockJson.defaults.scan.create = {}
       }
-      const result = await configureScan(sockJson.defaults.scan.create)
+      const result = await configureScan(sockJson.defaults.scan.create, cwd)
       if (!result.ok || result.data.canceled) {
         return result
       }
@@ -129,11 +130,13 @@ async function configureScan(
   config: NonNullable<
     NonNullable<NonNullable<SocketJson['defaults']>['scan']>['create']
   >,
+  cwd = process.cwd(),
 ): Promise<CResult<{ canceled: boolean }>> {
   const defaultRepoName = await input({
     message:
       '(--repo) What repo name (slug) should be reported to Socket for this dir?',
-    default: config.repo || 'socket-default-repository',
+    default:
+      config.repo || (await getRepoName(cwd)) || 'socket-default-repository',
     required: false,
     // validate: async string => bool
   })
@@ -151,7 +154,7 @@ async function configureScan(
   const defaultBranchName = await input({
     message:
       '(--branch) What branch name (slug) should be reported to Socket for this dir?',
-    default: config.branch || 'socket-default-branch',
+    default: config.branch || (await gitBranch(cwd)) || 'socket-default-branch',
     required: false,
     // validate: async string => bool
   })
diff --git a/src/utils/git.mts b/src/utils/git.mts
@@ -7,7 +7,7 @@ import constants from '../constants.mts'
 import type { CResult } from '../types.mts'
 import type { SpawnOptions } from '@socketsecurity/registry/lib/spawn'
 
-export async function getBaseGitBranch(cwd = process.cwd()): Promise<string> {
+export async function getBaseBranch(cwd = process.cwd()): Promise<string> {
   // Lazily access constants.ENV properties.
   const { GITHUB_BASE_REF, GITHUB_REF_NAME, GITHUB_REF_TYPE } = constants.ENV
   // 1. In a pull request, this is always the base branch.
@@ -30,11 +30,67 @@ export async function getBaseGitBranch(cwd = process.cwd()): Promise<string> {
       return match[0].trim()
     }
   } catch {}
-  // GitHub defaults to branch name "main"
+  // GitHub and GitLab default to branch name "main"
   // https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches#about-the-default-branch
   return 'main'
 }
 
+export type RepoInfo = {
+  owner: string
+  repo: string
+}
+
+export async function getRepoInfo(
+  cwd = process.cwd(),
+): Promise<RepoInfo | null> {
+  let info = null
+  try {
+    const remoteUrl = (
+      await spawn('git', ['remote', 'get-url', 'origin'], { cwd })
+    ).stdout
+    info = parseGitRemoteUrl(remoteUrl)
+    if (!info) {
+      debugFn('error', 'git: unmatched git remote URL format')
+      debugDir('inspect', { remoteUrl })
+    }
+  } catch (e) {
+    debugFn('error', 'caught: `git remote get-url origin` failed')
+    debugDir('inspect', { error: e })
+  }
+  return info
+}
+
+export async function getRepoName(cwd = process.cwd()): Promise<string | null> {
+  const repoInfo = await getRepoInfo(cwd)
+  return repoInfo?.repo ?? null
+}
+
+export async function getRepoOwner(
+  cwd = process.cwd(),
+): Promise<string | null> {
+  const repoInfo = await getRepoInfo(cwd)
+  return repoInfo?.owner ?? null
+}
+
+export async function gitBranch(cwd = process.cwd()): Promise<string | null> {
+  const stdioPipeOptions: SpawnOptions = { cwd }
+  // Try symbolic-ref first which returns the branch name or fails in a
+  // detached HEAD state.
+  try {
+    return (
+      await spawn('git', ['symbolic-ref', '--short', 'HEAD'], stdioPipeOptions)
+    ).stdout
+  } catch {}
+  // Fallback to using rev-parse to get the short commit hash in a
+  // detached HEAD state.
+  try {
+    return (
+      await spawn('git', ['rev-parse', '--short', 'HEAD'], stdioPipeOptions)
+    ).stdout
+  } catch {}
+  return null
+}
+
 export type GitCreateAndPushBranchOptions = {
   cwd?: string | undefined
   email?: string | undefined
@@ -227,42 +283,6 @@ export async function gitRemoteBranchExists(
   return false
 }
 
-export type RepoInfo = {
-  owner: string
-  repo: string
-}
-
-export async function gitRepoInfo(
-  cwd = process.cwd(),
-): Promise<RepoInfo | null> {
-  try {
-    const remoteUrl = (
-      await spawn('git', ['remote', 'get-url', 'origin'], { cwd })
-    ).stdout
-    // 1. Handle SSH-style, e.g. git@github.com:owner/repo.git
-    const sshMatch = /^git@[^:]+:([^/]+)\/(.+?)(?:\.git)?$/.exec(remoteUrl)
-    if (sshMatch) {
-      return { owner: sshMatch[1]!, repo: sshMatch[2]! }
-    }
-    // 2. Handle HTTPS/URL-style, e.g. https://github.com/owner/repo.git
-    try {
-      const parsed = new URL(remoteUrl)
-      const segments = parsed.pathname.split('/')
-      const owner = segments.at(-2)
-      const repo = segments.at(-1)?.replace(/\.git$/, '')
-      if (owner && repo) {
-        return { owner, repo }
-      }
-    } catch {}
-    debugFn('error', 'git: unmatched git remote URL format')
-    debugDir('inspect', { remoteUrl })
-  } catch (e) {
-    debugFn('error', 'caught: `git remote get-url origin` failed')
-    debugDir('inspect', { error: e })
-  }
-  return null
-}
-
 export async function gitResetAndClean(
   branch = 'HEAD',
   cwd = process.cwd(),
@@ -307,3 +327,35 @@ export async function gitUnstagedModifiedFiles(
     }
   }
 }
+
+const parsedGitRemoteUrlCache = new Map<string, RepoInfo | null>()
+
+export function parseGitRemoteUrl(remoteUrl: string): RepoInfo | null {
+  let result = parsedGitRemoteUrlCache.get(remoteUrl) ?? null
+  if (result) {
+    return { ...result }
+  }
+  // Handle SSH-style
+  const sshMatch = /^git@[^:]+:([^/]+)\/(.+?)(?:\.git)?$/.exec(remoteUrl)
+  // 1. Handle SSH-style, e.g. git@github.com:owner/repo.git
+  if (sshMatch) {
+    result = { owner: sshMatch[1]!, repo: sshMatch[2]! }
+  }
+  if (result) {
+    // 2. Handle HTTPS/URL-style, e.g. https://github.com/owner/repo.git
+    try {
+      const parsed = new URL(remoteUrl)
+      // Remove leading slashes from pathname and split by "/" to extract segments.
+      const segments = parsed.pathname.replace(/^\/+/, '').split('/')
+      // The second-to-last segment is expected to be the owner (e.g., "owner" in /owner/repo.git).
+      const owner = segments.at(-2)
+      // The last segment is expected to be the repo name, so we remove the ".git" suffix if present.
+      const repo = segments.at(-1)?.replace(/\.git$/, '')
+      if (owner && repo) {
+        result = { owner, repo }
+      }
+    } catch {}
+  }
+  parsedGitRemoteUrlCache.set(remoteUrl, result)
+  return { ...result } as RepoInfo | null
+}
