infra-kit 0.1.108 → 0.1.110

package/src/lib/git-utils/__tests__/git-utils.test.ts

@@ -23,8 +23,8 @@ describe('getCurrentWorktrees', () => {
     worktreeList.stdout = [
       asWorktreeLine('main'),
       asWorktreeLine('release/v1.18.22'),
-      asWorktreeLine('release/n/checkout-redesign'),
-      asWorktreeLine('release/garbage'),
+      asWorktreeLine('release/checkout-redesign'),
+      asWorktreeLine('release/Bad_Name'),
       asWorktreeLine('feature/login-page'),
       '/repos/project  abc1234 (bare)',
       '',
@@ -32,13 +32,13 @@ describe('getCurrentWorktrees', () => {
   })
 
   it('returns versioned AND named release worktrees for type release', async () => {
-    await expect(getCurrentWorktrees('release')).resolves.toEqual(['release/v1.18.22', 'release/n/checkout-redesign'])
+    await expect(getCurrentWorktrees('release')).resolves.toEqual(['release/v1.18.22', 'release/checkout-redesign'])
   })
 
   it('excludes junk release branches and non-release branches', async () => {
     const branches = await getCurrentWorktrees('release')
 
-    expect(branches).not.toContain('release/garbage')
+    expect(branches).not.toContain('release/Bad_Name')
     expect(branches).not.toContain('feature/login-page')
     expect(branches).not.toContain('main')
   })

package/src/lib/git-utils/git-utils.ts

@@ -93,6 +93,47 @@ export const getProjectRoot = async (): Promise<string> => {
   return result.stdout.trim()
 }
 
+/**
+ * Get the current git branch name (e.g. `dev`, `main`, `release/v1.2.3`).
+ */
+export const getCurrentBranch = async (): Promise<string> => {
+  const result = await $`git rev-parse --abbrev-ref HEAD`
+
+  return result.stdout.trim()
+}
+
+/**
+ * Whether the working tree has no staged, unstaged, or untracked changes.
+ */
+export const isWorkingTreeClean = async (): Promise<boolean> => {
+  const result = await $`git status --porcelain`
+
+  return result.stdout.trim().length === 0
+}
+
+/**
+ * Whether the current checkout is a linked git worktree rather than the main
+ * repository checkout.
+ *
+ * A linked worktree's git dir lives under `<main>/.git/worktrees/<name>`, so it
+ * differs from the shared common dir; in the main checkout the two resolve to
+ * the same path. Both are anchored to the toplevel so `--git-common-dir` (which
+ * git may report relative to cwd) resolves consistently.
+ */
+export const isInsideLinkedWorktree = async (): Promise<boolean> => {
+  const cwd = await getProjectRoot()
+
+  const [gitDirResult, commonDirResult] = await Promise.all([
+    $({ cwd })`git rev-parse --absolute-git-dir`,
+    $({ cwd })`git rev-parse --git-common-dir`,
+  ])
+
+  const gitDir = gitDirResult.stdout.trim()
+  const commonDir = path.resolve(cwd, commonDirResult.stdout.trim())
+
+  return gitDir !== commonDir
+}
+
 /**
  * Get the current repository name (basename of the project root)
  */

package/src/lib/git-utils/index.ts

@@ -1 +1,8 @@
-export { getCurrentWorktrees, getProjectRoot, getRepoName } from './git-utils'
+export {
+  getCurrentBranch,
+  getCurrentWorktrees,
+  getProjectRoot,
+  getRepoName,
+  isInsideLinkedWorktree,
+  isWorkingTreeClean,
+} from './git-utils'

package/src/lib/release-id/__tests__/release-id.test.ts

@@ -29,13 +29,13 @@ describe('parseBranchName', () => {
     expect(parseBranchName('release/v1.2.3')).toEqual(version(1, 2, 3))
   })
 
-  it('parses release/n/<name> as a name', () => {
-    expect(parseBranchName('release/n/checkout-redesign')).toEqual(name('checkout-redesign'))
+  it('parses release/<name> as a name', () => {
+    expect(parseBranchName('release/checkout-redesign')).toEqual(name('checkout-redesign'))
   })
 
   it('strips a leading refs/heads/ prefix for versions and names', () => {
     expect(parseBranchName('refs/heads/release/v2.0.1')).toEqual(version(2, 0, 1))
-    expect(parseBranchName('refs/heads/release/n/my-feature')).toEqual(name('my-feature'))
+    expect(parseBranchName('refs/heads/release/my-feature')).toEqual(name('my-feature'))
   })
 
   it('trims surrounding whitespace', () => {
@@ -48,23 +48,31 @@ describe('parseBranchName', () => {
     expect(parseBranchName('dev')).toBeNull()
   })
 
-  it('returns null for junk under the release/ prefix', () => {
-    expect(parseBranchName('release/foo')).toBeNull()
-    expect(parseBranchName('release/garbage')).toBeNull()
+  it('parses bare release/<kebab> as a name', () => {
+    expect(parseBranchName('release/foo')).toEqual(name('foo'))
+    expect(parseBranchName('release/garbage')).toEqual(name('garbage'))
   })
 
-  it('returns null for incomplete version branches', () => {
+  it('returns null for malformed version branches that are also not valid names', () => {
     expect(parseBranchName('release/v1.2')).toBeNull()
-    expect(parseBranchName('release/v1')).toBeNull()
     expect(parseBranchName('release/v1.2.3.4')).toBeNull()
-    expect(parseBranchName('release/vfoo')).toBeNull()
+  })
+
+  it('falls through to a name when the release/v segment is not valid semver', () => {
+    expect(parseBranchName('release/v1.2.3')).toEqual(version(1, 2, 3))
+    expect(parseBranchName('release/v1')).toEqual(name('v1'))
+    expect(parseBranchName('release/vfoo')).toEqual(name('vfoo'))
+    expect(parseBranchName('release/vnext')).toEqual(name('vnext'))
   })
 
   it('returns null for invalid names', () => {
-    expect(parseBranchName('release/n/Bad_Name')).toBeNull()
-    expect(parseBranchName('release/n/UPPER')).toBeNull()
-    expect(parseBranchName('release/n/main')).toBeNull()
-    expect(parseBranchName('release/n/')).toBeNull()
+    expect(parseBranchName('release/Bad_Name')).toBeNull()
+    expect(parseBranchName('release/UPPER')).toBeNull()
+    expect(parseBranchName('release/main')).toBeNull()
+    expect(parseBranchName('release/')).toBeNull()
+    // The retired release/n/<name> form is no longer valid: 'n/checkout-redesign'
+    // contains a slash and fails the kebab-case rule.
+    expect(parseBranchName('release/n/checkout-redesign')).toBeNull()
   })
 
   it('never throws on arbitrary input', () => {
@@ -81,19 +89,19 @@ describe('parseBranchName', () => {
 describe('parseReleaseRef', () => {
   it('delegates a release branch ref to parseBranchName', () => {
     expect(parseReleaseRef('release/v1.2.3')).toEqual(version(1, 2, 3))
-    expect(parseReleaseRef('release/n/checkout-redesign')).toEqual(name('checkout-redesign'))
+    expect(parseReleaseRef('release/checkout-redesign')).toEqual(name('checkout-redesign'))
     expect(parseReleaseRef('refs/heads/release/v3.4.5')).toEqual(version(3, 4, 5))
   })
 
   it('throws when a release branch ref is invalid', () => {
     expect(() => {
-      return parseReleaseRef('release/garbage')
+      return parseReleaseRef('release/Bad_Name')
     }).toThrow(InvalidReleaseRefError)
     expect(() => {
       return parseReleaseRef('release/v1.2')
     }).toThrow(InvalidReleaseRefError)
     expect(() => {
-      return parseReleaseRef('release/n/Bad_Name')
+      return parseReleaseRef('release/main')
     }).toThrow(InvalidReleaseRefError)
   })
 
@@ -204,7 +212,7 @@ describe('validateName', () => {
 describe('formatBranchName', () => {
   it('formats versions and names', () => {
     expect(formatBranchName(version(1, 2, 3))).toBe('release/v1.2.3')
-    expect(formatBranchName(name('checkout-redesign'))).toBe('release/n/checkout-redesign')
+    expect(formatBranchName(name('checkout-redesign'))).toBe('release/checkout-redesign')
   })
 })
 
@@ -244,13 +252,13 @@ describe('displayLabel', () => {
 describe('isReleaseBranch', () => {
   it('returns true for both branch schemes', () => {
     expect(isReleaseBranch('release/v1.2.3')).toBe(true)
-    expect(isReleaseBranch('release/n/checkout-redesign')).toBe(true)
+    expect(isReleaseBranch('release/checkout-redesign')).toBe(true)
     expect(isReleaseBranch('refs/heads/release/v1.2.3')).toBe(true)
   })
 
   it('returns false for junk', () => {
     expect(isReleaseBranch('feature/x')).toBe(false)
-    expect(isReleaseBranch('release/foo')).toBe(false)
+    expect(isReleaseBranch('release/Bad_Name')).toBe(false)
     expect(isReleaseBranch('main')).toBe(false)
   })
 

package/src/lib/release-id/release-id.ts

@@ -18,7 +18,6 @@ const KEBAB_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/
 
 const RELEASE_BRANCH_PREFIX = 'release/'
 const VERSION_BRANCH_PREFIX = 'release/v'
-const NAME_BRANCH_PREFIX = 'release/n/'
 const REFS_HEADS_PREFIX = 'refs/heads/'
 
 const NEXT_TOKEN = 'next'
@@ -91,33 +90,35 @@ export const validateName = (name: string): void => {
 /**
  * Lenient parse of a git branch name into a {@link ReleaseId}. Tolerates a
  * leading `refs/heads/`. Returns `null` for anything that is not a valid
- * `release/v<semver>` or `release/n/<name>` branch. Never throws.
+ * `release/v<semver>` or `release/<name>` branch. Never throws.
+ *
+ * Precedence is version-first: `release/v<semver>` is a version, but if the
+ * segment after `release/v` is not a valid semver (e.g. `release/vnext`), the
+ * whole token after `release/` is treated as a candidate name instead.
  */
 export const parseBranchName = (branch: string): ReleaseId | null => {
   const stripped = stripRefsHeads(branch.trim())
 
+  if (!stripped.startsWith(RELEASE_BRANCH_PREFIX)) return null
+
   if (stripped.startsWith(VERSION_BRANCH_PREFIX)) {
     const semverPart = stripped.slice(VERSION_BRANCH_PREFIX.length)
     const match = BRANCH_SEMVER_RE.exec(semverPart)
 
-    if (!match) return null
-
-    return makeVersion(Number(match[1]), Number(match[2]), Number(match[3]))
+    if (match) {
+      return makeVersion(Number(match[1]), Number(match[2]), Number(match[3]))
+    }
   }
 
-  if (stripped.startsWith(NAME_BRANCH_PREFIX)) {
-    const namePart = stripped.slice(NAME_BRANCH_PREFIX.length)
+  const namePart = stripped.slice(RELEASE_BRANCH_PREFIX.length)
 
-    try {
-      validateName(namePart)
-    } catch {
-      return null
-    }
-
-    return { kind: 'name', name: namePart, raw: namePart }
+  try {
+    validateName(namePart)
+  } catch {
+    return null
   }
 
-  return null
+  return { kind: 'name', name: namePart, raw: namePart }
 }
 
 /**
@@ -138,7 +139,7 @@ export const parseReleaseRef = (input: string): ReleaseId => {
 
     if (!parsed) {
       throw new InvalidReleaseRefError(
-        `"${input}" looks like a release branch but is not a valid release/v<semver> or release/n/<name> ref.`,
+        `"${input}" looks like a release branch but is not a valid release/v<semver> or release/<name> ref.`,
       )
     }
 
@@ -168,11 +169,11 @@ export const parseReleaseRef = (input: string): ReleaseId => {
   return { kind: 'name', name: trimmed, raw: trimmed }
 }
 
-/** Render the branch name for a release id: `release/v1.2.3` | `release/n/<name>`. */
+/** Render the branch name for a release id: `release/v1.2.3` | `release/<name>`. */
 export const formatBranchName = (id: ReleaseId): string => {
   if (id.kind === 'version') return `${VERSION_BRANCH_PREFIX}${id.raw}`
 
-  return `${NAME_BRANCH_PREFIX}${id.name}`
+  return `${RELEASE_BRANCH_PREFIX}${id.name}`
 }
 
 /**

package/src/lib/release-utils/__tests__/release-utils.test.ts

@@ -14,7 +14,7 @@ describe('parseBranchChoices', () => {
   it('parses version and name branches and drops junk', () => {
     const result = parseBranchChoices([
       'release/v1.2.3',
-      'release/n/checkout-redesign',
+      'release/checkout-redesign',
       'feature/not-a-release',
       'release/v9.9', // malformed semver
     ])
@@ -31,7 +31,7 @@ describe('parseBranchChoices', () => {
 
     expect(labels).toEqual(['1.2.3', 'checkout-redesign'])
     expect(kinds).toEqual(['version', 'name'])
-    expect(branches).toEqual(['release/v1.2.3', 'release/n/checkout-redesign'])
+    expect(branches).toEqual(['release/v1.2.3', 'release/checkout-redesign'])
   })
 
   it('returns an empty array when nothing parses', () => {
@@ -42,7 +42,7 @@ describe('parseBranchChoices', () => {
 describe('formatBranchChoices', () => {
   it('labels versions and names, keying Jira descriptions by the Jira version name', () => {
     const choices = formatBranchChoices({
-      branches: ['release/v1.2.3', 'release/n/checkout-redesign'],
+      branches: ['release/v1.2.3', 'release/checkout-redesign'],
       // Jira descriptions are keyed by the Jira version NAME: `v1.2.3` | `<name>`.
       descriptions: new Map([
         ['v1.2.3', 'version desc'],
@@ -54,16 +54,16 @@ describe('formatBranchChoices', () => {
     expect(choices[0]?.value).toBe('release/v1.2.3')
     expect(choices[0]?.name).toContain('1.2.3')
     expect(choices[0]?.name).toContain('version desc')
-    expect(choices[1]?.value).toBe('release/n/checkout-redesign')
+    expect(choices[1]?.value).toBe('release/checkout-redesign')
     expect(choices[1]?.name).toContain('checkout-redesign')
     expect(choices[1]?.name).toContain('name desc')
   })
 
   it('includes the type tag when types are provided', () => {
     const choices = formatBranchChoices({
-      branches: ['release/n/checkout-redesign'],
+      branches: ['release/checkout-redesign'],
       descriptions: new Map(),
-      types: new Map([['release/n/checkout-redesign', 'hotfix']]),
+      types: new Map([['release/checkout-redesign', 'hotfix']]),
     })
 
     expect(choices[0]?.name).toContain('[hotfix]')
@@ -90,7 +90,7 @@ describe('resolveReleaseBranch', () => {
   })
 
   it('builds a name branch from a release name', () => {
-    expect(resolveReleaseBranch('checkout-redesign')).toBe('release/n/checkout-redesign')
+    expect(resolveReleaseBranch('checkout-redesign')).toBe('release/checkout-redesign')
   })
 
   it('throws an OperationError for junk input', () => {
@@ -113,7 +113,7 @@ describe('releaseLabelFromBranch', () => {
 
   it('labels version and name branches', () => {
     expect(releaseLabelFromBranch('release/v1.2.3')).toBe('1.2.3')
-    expect(releaseLabelFromBranch('release/n/checkout-redesign')).toBe('checkout-redesign')
+    expect(releaseLabelFromBranch('release/checkout-redesign')).toBe('checkout-redesign')
   })
 
   it('falls back to the raw branch when it does not parse', () => {

package/src/lib/release-utils/release-utils.ts

@@ -160,7 +160,7 @@ export const parseBranchChoices = (branches: string[]): ParsedBranchChoice[] =>
 
 /**
  * Resolve an operator-supplied release ref (version `1.2.3` / `v1.2.3` or name
- * `checkout-redesign`) to its branch name (`release/v1.2.3` | `release/n/<name>`).
+ * `checkout-redesign`) to its branch name (`release/v1.2.3` | `release/<name>`).
  * Strict: surfaces a parse failure as an OperationError with remediation text.
  */
 export const resolveReleaseBranch = (versionArg: string): string => {

package/src/lib/version-utils/__tests__/load-existing-versions.test.ts

@@ -13,11 +13,11 @@ describe('extractVersionBranches', () => {
     expect(extractVersionBranches(stdout)).toEqual(['1.62.0', '1.64.5'])
   })
 
-  it('ignores named release/n/* branches (irrelevant to next-bump math)', () => {
+  it('ignores named release/<name> branches (irrelevant to next-bump math)', () => {
     const stdout = [
       lsRemoteLine('release/v1.0.0'),
-      lsRemoteLine('release/n/checkout-redesign'),
-      lsRemoteLine('release/n/zeta-feature'),
+      lsRemoteLine('release/checkout-redesign'),
+      lsRemoteLine('release/zeta-feature'),
     ].join('\n')
 
     expect(extractVersionBranches(stdout)).toEqual(['1.0.0'])
@@ -25,7 +25,7 @@ describe('extractVersionBranches', () => {
 
   it('ignores junk and non-release lines without throwing', () => {
     const stdout = [
-      lsRemoteLine('release/garbage'),
+      lsRemoteLine('release/Bad_Name'),
       lsRemoteLine('release/v2.3.4'),
       'malformed-line-without-tab',
       lsRemoteLine('feature/login'),

package/src/lib/version-utils/__tests__/next-version.test.ts

@@ -295,7 +295,7 @@ describe('resolveReleaseEntries', () => {
     it('named entry produces the named branch/PR/Jira output', () => {
       const { id } = resolve({ name: 'checkout-redesign', type: 'regular' })
 
-      expect(formatBranchName(id)).toBe('release/n/checkout-redesign')
+      expect(formatBranchName(id)).toBe('release/checkout-redesign')
       expect(formatPrTitle(id, 'regular')).toBe('Release checkout-redesign')
       expect(formatJiraName(id)).toBe('checkout-redesign')
     })

package/src/lib/version-utils/load-existing-versions.ts

@@ -11,7 +11,7 @@ import type { SemVer } from './next-version'
  * Extract version-branch tokens from raw `git ls-remote` stdout. Each line is
  * `<sha>\t<ref>`; refs are routed through release-id's lenient
  * {@link parseBranchName} and only `kind: 'version'` ids are kept (named
- * `release/n/*` branches are irrelevant to `next`-bump math and are dropped).
+ * `release/<name>` branches are irrelevant to `next`-bump math and are dropped).
  * Returns the no-`v` semver tokens (e.g. `1.2.3`) that
  * {@link collectKnownVersions} parses as versions. Pure — no I/O — so it is
  * unit-testable without the network.

package/src/lib/version-utils/version-utils.ts

@@ -3,7 +3,7 @@
  *
  * SemVer-ONLY: this assumes a `v<semver>` token and will produce `NaN`s for
  * anything else. Callers that may see branch names or named releases
- * (`release/n/<name>`) MUST use the `release-id` module (`parseBranchName` /
+ * (`release/<name>`) MUST use the `release-id` module (`parseBranchName` /
  * `parseReleaseRef` + `compareReleaseIds`) instead. Only provably names-free
  * callers (the `collectKnownVersions` / `next`-bump math path) may use this.
  */