infra-kit 0.1.102 → 0.1.107

package/src/commands/doctor/doctor.ts

@@ -1,13 +1,20 @@
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
-import { z } from 'zod/v4'
+import { z } from 'zod'
 import { $ } from 'zx'
 
+import {
+  AGENTS_IMPORT_END,
+  AGENTS_IMPORT_START,
+  AGENTS_MARKER_END,
+  AGENTS_MARKER_START,
+} from 'src/commands/init/agent-files'
 import { MARKER_END, MARKER_START, buildShellBlock } from 'src/commands/init/init'
 import { getProjectRoot } from 'src/lib/git-utils/git-utils'
 import { getInfraKitConfig, getInfraKitConfigPaths, resetInfraKitConfigCache } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
+import { hasManagedBlock } from 'src/lib/managed-block'
 import { defineMcpTool, textContent } from 'src/types'
 
 interface CheckResult {
@@ -108,7 +115,7 @@ const checkInfraKitConfigValid = async (): Promise<CheckResult> => {
     return {
       name,
       status: 'pass',
-      message: 'infra-kit.yml is valid (user overrides applied if present)',
+      message: 'infra-kit.json is valid (user overrides applied if present)',
     }
   } catch (err) {
     return { name, status: 'fail', message: (err as Error).message }
@@ -125,7 +132,7 @@ const checkInfraKitConfigValid = async (): Promise<CheckResult> => {
  * // {
  * //   name: 'user override path',
  * //   status: 'pass',
- * //   message: '~/.infra-kit/projects/api/infra-kit.yml (not yet created) — project: api',
+ * //   message: '~/.infra-kit/projects/api/infra-kit.json (not yet created) — project: api',
  * // }
  */
 const checkUserOverridePath = async (): Promise<CheckResult> => {
@@ -196,11 +203,67 @@ const checkRtkConfigured = async (): Promise<CheckResult> => {
   }
 }
 
+/**
+ * Check that the repo agent-instruction files managed by `infra-kit init` exist:
+ * the `AGENTS.md` block, the `@AGENTS.md` import region in `CLAUDE.md`, and the
+ * `.cursor/rules` block. Presence only. Repo-gated: returns no checks when run
+ * outside an infra-kit repo so doctor never crashes there.
+ */
+export const checkAgentFiles = async (): Promise<CheckResult[]> => {
+  let mainConfigPath: string
+
+  try {
+    mainConfigPath = (await getInfraKitConfigPaths()).main
+  } catch {
+    return []
+  }
+
+  if (!fs.existsSync(mainConfigPath)) return []
+
+  const root = path.dirname(mainConfigPath)
+
+  const blockPresent = (relPath: string, start: string, end: string): boolean => {
+    const filePath = path.join(root, relPath)
+    const content = fs.existsSync(filePath) ? fs.readFileSync(filePath, 'utf-8') : ''
+
+    return hasManagedBlock(content, start, end)
+  }
+
+  const entries = [
+    {
+      name: 'AGENTS.md block',
+      present: blockPresent('AGENTS.md', AGENTS_MARKER_START, AGENTS_MARKER_END),
+      okMessage: 'AGENTS.md block present',
+      missingMessage: 'infra-kit block missing from AGENTS.md. Run: infra-kit init',
+    },
+    {
+      name: 'CLAUDE.md import',
+      present: blockPresent('CLAUDE.md', AGENTS_IMPORT_START, AGENTS_IMPORT_END),
+      okMessage: 'CLAUDE.md imports @AGENTS.md',
+      missingMessage: '@AGENTS.md import block missing from CLAUDE.md. Run: infra-kit init',
+    },
+    {
+      name: '.cursor/rules block',
+      present: blockPresent(path.join('.cursor', 'rules', 'infra-kit.mdc'), AGENTS_MARKER_START, AGENTS_MARKER_END),
+      okMessage: '.cursor/rules/infra-kit.mdc block present',
+      missingMessage: '.cursor/rules/infra-kit.mdc block missing. Run: infra-kit init',
+    },
+  ]
+
+  return entries.map((entry): CheckResult => {
+    return {
+      name: entry.name,
+      status: entry.present ? 'pass' : 'fail',
+      message: entry.present ? entry.okMessage : entry.missingMessage,
+    }
+  })
+}
+
 /**
  * Check installation and authentication status of gh, doppler, aws, and rtk CLIs
  */
 export const doctor = async () => {
-  const checks: CheckResult[] = await Promise.all([
+  const baseChecks: CheckResult[] = await Promise.all([
     checkCommand(
       'gh installed',
       ['gh', '--version'],
@@ -251,6 +314,8 @@ export const doctor = async () => {
     checkUserOverridePath(),
   ])
 
+  const checks: CheckResult[] = [...baseChecks, ...(await checkAgentFiles())]
+
   logger.info('Doctor check results:\n')
 
   for (const check of checks) {

package/src/commands/env-clear/env-clear.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
-import { z } from 'zod/v4'
+import { z } from 'zod'
 
 import {
   ENV_CLEAR_FILE,

package/src/commands/env-list/env-list.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod/v4'
+import { z } from 'zod'
 
 import { getDopplerProject } from 'src/integrations/doppler/doppler-project'
 import { getInfraKitConfig } from 'src/lib/infra-kit-config'
@@ -8,7 +8,7 @@ import { defineMcpTool, textContent } from 'src/types'
 /**
  * List available Doppler configs for the detected project.
  *
- * Purely local: reads infra-kit.yml and does not call Doppler. We intentionally
+ * Purely local: reads infra-kit.json and does not call Doppler. We intentionally
  * do not run validateDopplerCliAndAuth here — users listing envs often do so
  * before `doppler login`, and a spurious auth error would be misleading.
  */
@@ -38,7 +38,7 @@ export const envList = async () => {
 export const envListMcpTool = defineMcpTool({
   name: 'env-list',
   description:
-    'List the environments the project is configured to support. Returns the `environments` list declared in infra-kit.yml at the project root (not a live fetch from Doppler) plus the Doppler project name resolved from the same file. Read-only.',
+    'List the environments the project is configured to support. Returns the `environments` list declared in infra-kit.json at the project root (not a live fetch from Doppler) plus the Doppler project name resolved from the same file. Read-only.',
   inputSchema: {},
   outputSchema: {
     project: z.string().describe('Detected Doppler project name'),

package/src/commands/env-load/env-load.ts

@@ -3,7 +3,7 @@ import { Buffer } from 'node:buffer'
 import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
-import { z } from 'zod/v4'
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { validateDopplerCliAndAuth } from 'src/integrations/doppler'

package/src/commands/env-status/env-status.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
 import process from 'node:process'
-import { z } from 'zod/v4'
+import { z } from 'zod'
 
 import { validateDopplerCliAndAuth } from 'src/integrations/doppler'
 import {

package/src/commands/gh-merge-dev/gh-merge-dev.ts

@@ -2,14 +2,14 @@
 import checkbox from '@inquirer/checkbox'
 import confirm from '@inquirer/confirm'
 import process from 'node:process'
-import { z } from 'zod/v4'
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
 import { OperationError } from 'src/lib/errors/operation-error'
 import { logger } from 'src/lib/logger'
-import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
+import { detectReleaseType, formatBranchChoices, getJiraDescriptions, releaseBranchLabels } from 'src/lib/release-utils'
 import { defineMcpTool, textContent } from 'src/types'
 import type { RequiredConfirmedOptionArg } from 'src/types'
 
@@ -70,12 +70,7 @@ export const ghMergeDev = async (args: GhMergeDevArgs) => {
   if (allSelected) {
     commandEcho.addOption('--all', true)
   } else {
-    commandEcho.addOption(
-      '--versions',
-      selectedReleaseBranches.map((branch) => {
-        return branch.replace('release/v', '')
-      }),
-    )
+    commandEcho.addOption('--versions', releaseBranchLabels(selectedReleaseBranches))
   }
 
   // Validate input

package/src/commands/gh-release-deliver/gh-release-deliver.ts

@@ -1,7 +1,7 @@
 import confirm from '@inquirer/confirm'
 import select from '@inquirer/select'
 import process from 'node:process'
-import { z } from 'zod/v4'
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
@@ -12,7 +12,14 @@ import { formatZxError } from 'src/lib/errors/format-zx-error'
 import { OperationError } from 'src/lib/errors/operation-error'
 import { getCurrentWorktrees, getProjectRoot, getRepoName } from 'src/lib/git-utils'
 import { logger } from 'src/lib/logger'
-import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
+import { displayLabel, formatJiraName, formatRcTitle, parseBranchName } from 'src/lib/release-id'
+import type { ReleaseId } from 'src/lib/release-id'
+import {
+  detectReleaseType,
+  formatBranchChoices,
+  getJiraDescriptions,
+  resolveReleaseBranch,
+} from 'src/lib/release-utils'
 import type { ReleaseType } from 'src/lib/release-utils'
 import { removeWorktrees } from 'src/lib/worktrees'
 import { defineMcpTool, textContent } from 'src/types'
@@ -62,8 +69,8 @@ const fetchPRByHead = async (head: string): Promise<PRStatus | null> => {
  * the merge step on resume. Title-matched on purpose: an older MERGED RC PR
  * from a different release must not short-circuit this version's flow.
  */
-const fetchMergedRcPRForVersion = async (version: string): Promise<PRStatus | null> => {
-  const expectedTitle = `Release v${version} (RC)`
+const fetchMergedRcPRForVersion = async (id: ReleaseId): Promise<PRStatus | null> => {
+  const expectedTitle = formatRcTitle(id)
   const result = await $`gh pr list --head dev --base main --state merged --json number,state,title --limit 20`
   const prs = JSON.parse(result.stdout) as PRStatus[]
   const match = prs.find((pr) => {
@@ -92,7 +99,7 @@ interface ResolvedTarget {
 }
 
 const resolveTargetFromVersion = async (version: string): Promise<ResolvedTarget> => {
-  const selectedReleaseBranch = `release/v${version}`
+  const selectedReleaseBranch = resolveReleaseBranch(version)
   const pr = await fetchPRByHead(selectedReleaseBranch)
 
   if (!pr) {
@@ -208,8 +215,9 @@ const mergeReleasePR = async (args: MergeReleasePRArgs): Promise<void> => {
   )
 }
 
-const resolveRcPRNumber = async (selectedVersion: string): Promise<number> => {
-  const expectedTitle = `Release v${selectedVersion} (RC)`
+const resolveRcPRNumber = async (id: ReleaseId): Promise<number> => {
+  const selectedLabel = displayLabel(id)
+  const expectedTitle = formatRcTitle(id)
   const existingOpen = await fetchOpenDevToMainPR()
 
   // Adopt any existing open dev→main PR. GitHub permits only one open PR per
@@ -221,7 +229,7 @@ const resolveRcPRNumber = async (selectedVersion: string): Promise<number> => {
 
     if (existingOpen.title !== expectedTitle) {
       logger.info(
-        `Adopting open dev → main PR #${rcNumber} ("${existingOpen.title}") and retitling for v${selectedVersion}`,
+        `Adopting open dev → main PR #${rcNumber} ("${existingOpen.title}") and retitling for ${selectedLabel}`,
       )
       await runStep(
         `retitle dev → main PR #${rcNumber} to "${expectedTitle}"`,
@@ -236,7 +244,7 @@ const resolveRcPRNumber = async (selectedVersion: string): Promise<number> => {
   }
 
   await runStep(
-    `create RC PR (dev → main) for v${selectedVersion}`,
+    `create RC PR (dev → main) for ${selectedLabel}`,
     `run 'gh pr create --base main --head dev' manually to surface the underlying error (e.g. no commits between dev and main)`,
     async () => {
       await $`gh pr create --base main --head dev --title ${expectedTitle} --body ""`
@@ -247,7 +255,7 @@ const resolveRcPRNumber = async (selectedVersion: string): Promise<number> => {
 
   if (!created) {
     throw new OperationError(undefined, {
-      operation: `look up RC PR for v${selectedVersion}`,
+      operation: `look up RC PR for ${selectedLabel}`,
       remediation: `verify the RC PR was created ('gh pr list --head dev --base main')`,
     })
   }
@@ -255,19 +263,20 @@ const resolveRcPRNumber = async (selectedVersion: string): Promise<number> => {
   return created.number
 }
 
-const ensureRcPRMerged = async (selectedVersion: string): Promise<void> => {
-  const alreadyMerged = await fetchMergedRcPRForVersion(selectedVersion)
+const ensureRcPRMerged = async (id: ReleaseId): Promise<void> => {
+  const selectedLabel = displayLabel(id)
+  const alreadyMerged = await fetchMergedRcPRForVersion(id)
 
   if (alreadyMerged) {
-    logger.info(`✓ RC PR for v${selectedVersion} already merged into main — skipping`)
+    logger.info(`✓ RC PR for ${selectedLabel} already merged into main — skipping`)
 
     return
   }
 
-  const rcNumber = await resolveRcPRNumber(selectedVersion)
+  const rcNumber = await resolveRcPRNumber(id)
 
   await runStep(
-    `merge RC PR #${rcNumber} (dev → main) for v${selectedVersion}`,
+    `merge RC PR #${rcNumber} (dev → main) for ${selectedLabel}`,
     `check 'gh pr view ${rcNumber}' for mergeability and required reviews`,
     async () => {
       await $`gh pr merge ${rcNumber} --squash --admin`
@@ -299,7 +308,7 @@ const syncMainIntoDev = async (): Promise<void> => {
   )
 }
 
-const deliverJiraReleaseSafely = async (selectedReleaseBranch: string): Promise<void> => {
+const deliverJiraReleaseSafely = async (id: ReleaseId): Promise<void> => {
   const jiraConfig = await loadJiraConfigOptional()
 
   if (!jiraConfig) {
@@ -309,7 +318,8 @@ const deliverJiraReleaseSafely = async (selectedReleaseBranch: string): Promise<
   }
 
   try {
-    const versionName = selectedReleaseBranch.replace('release/', '')
+    // Jira fix version name: `v1.2.3` | `<name>` — must match create-time formatJiraName.
+    const versionName = formatJiraName(id)
 
     await deliverJiraRelease({ versionName }, jiraConfig)
   } catch (error) {
@@ -333,9 +343,21 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs) => {
     ? await resolveTargetFromVersion(version)
     : await resolveTargetInteractively()
 
-  const selectedVersion = selectedReleaseBranch.replace('release/v', '')
+  // selectedReleaseBranch is always a release branch (operator ref strictly
+  // parsed, or picked from discovery-filtered choices) so this cannot be null.
+  const releaseId = parseBranchName(selectedReleaseBranch)
+
+  if (!releaseId) {
+    throw new OperationError(undefined, {
+      operation: `deliver release ${selectedReleaseBranch}`,
+      remediation: 'pass a version (e.g. "1.2.5") or a release name (e.g. "checkout-redesign")',
+    })
+  }
+
+  const selectedVersion = displayLabel(releaseId)
 
   commandEcho.addOption('--version', selectedVersion)
+  logger.info(`Delivering ${releaseId.kind === 'name' ? 'named release' : 'version'} ${selectedReleaseBranch}`)
 
   const releaseType: ReleaseType = detectReleaseType(releasePrTitle)
 
@@ -363,7 +385,7 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs) => {
   await mergeReleasePR({ selectedReleaseBranch, releaseType })
 
   if (releaseType !== 'hotfix') {
-    await ensureRcPRMerged(selectedVersion)
+    await ensureRcPRMerged(releaseId)
   }
 
   await dispatchDeployWorkflow()
@@ -371,7 +393,7 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs) => {
 
   $.quiet = false
 
-  await deliverJiraReleaseSafely(selectedReleaseBranch)
+  await deliverJiraReleaseSafely(releaseId)
 
   logger.info(`Successfully delivered ${selectedReleaseBranch} to production!`)
 
@@ -396,7 +418,11 @@ export const ghReleaseDeliverMcpTool = defineMcpTool({
   description:
     'Deliver a release to production. For hotfixes: squash-merges the release branch to main and dispatches the deploy-all workflow. For regular releases: squash-merges to dev, opens an RC PR, merges dev into main, dispatches the deploy-all workflow, then syncs main back to dev. Also releases the matching Jira fix version if Jira is configured. Dispatches the deploy workflow fire-and-forget — the tool returns once the workflow is accepted by GitHub, not when the deployment finishes. PR-merge steps are idempotent: re-running after a partial failure skips PRs that are already merged. Irreversible production operation: the confirmation prompt is auto-skipped for MCP calls, so the caller is responsible for gating. "version" is required when invoked via MCP (the picker is unreachable without a TTY).',
   inputSchema: {
-    version: z.string().describe('Release version to deliver to production (e.g., "1.2.5"). Required for MCP calls.'),
+    version: z
+      .string()
+      .describe(
+        'Accepts a release version (e.g. "1.2.5") OR a release name (e.g. "checkout-redesign") to deliver to production. Required for MCP calls.',
+      ),
   },
   outputSchema: {
     releaseBranch: z.string().describe('The release branch that was delivered'),

package/src/commands/gh-release-deploy-all/gh-release-deploy-all.ts

@@ -1,5 +1,5 @@
 import select from '@inquirer/select'
-import { z } from 'zod/v4'
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
@@ -7,7 +7,13 @@ import { commandEcho } from 'src/lib/command-echo'
 import { OperationError } from 'src/lib/errors/operation-error'
 import { getInfraKitConfig } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
-import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
+import {
+  detectReleaseType,
+  formatBranchChoices,
+  getJiraDescriptions,
+  releaseLabelFromBranch,
+  resolveReleaseBranch,
+} from 'src/lib/release-utils'
 import type { ReleaseType } from 'src/lib/release-utils'
 import { defineMcpTool, textContent } from 'src/types'
 
@@ -25,10 +31,10 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs) => {
 
   commandEcho.start('release-deploy-all')
 
-  let selectedReleaseBranch = '' // "release/v1.8.0"
+  let selectedReleaseBranch = '' // "release/v1.8.0" | "release/n/checkout-redesign" | "dev"
 
   if (version) {
-    selectedReleaseBranch = version === 'dev' ? 'dev' : `release/v${version}`
+    selectedReleaseBranch = version === 'dev' ? 'dev' : resolveReleaseBranch(version)
   } else {
     commandEcho.setInteractive()
 
@@ -52,7 +58,7 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs) => {
     })
   }
 
-  const selectedVersion = selectedReleaseBranch === 'dev' ? 'dev' : selectedReleaseBranch.replace('release/v', '')
+  const selectedVersion = releaseLabelFromBranch(selectedReleaseBranch)
 
   commandEcho.addOption('--version', selectedVersion)
 
@@ -109,7 +115,7 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs) => {
 
     const structuredContent = {
       releaseBranch: selectedReleaseBranch,
-      version: selectedReleaseBranch.replace('release/v', ''),
+      version: selectedVersion,
       environment: selectedEnv,
       skipTerraformDeploy: shouldSkipTerraform,
       success: true,
@@ -137,7 +143,7 @@ export const ghReleaseDeployAllMcpTool = defineMcpTool({
     version: z
       .string()
       .describe(
-        'Release version to deploy from (e.g. "1.2.5") — resolves to the release/vX.Y.Z branch. Pass "dev" to deploy from the dev branch instead. Required for MCP calls.',
+        'Accepts a release version (e.g. "1.2.5") OR a release name (e.g. "checkout-redesign") — resolves to the release/vX.Y.Z or release/n/<name> branch. Pass "dev" to deploy from the dev branch instead. Required for MCP calls.',
       ),
     env: z
       .string()

package/src/commands/gh-release-deploy-selected/gh-release-deploy-selected.ts

@@ -3,7 +3,7 @@ import select from '@inquirer/select'
 import fs from 'node:fs/promises'
 import { resolve } from 'node:path'
 import yaml from 'yaml'
-import { z } from 'zod/v4'
+import { z } from 'zod'
 import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
@@ -12,7 +12,13 @@ import { OperationError } from 'src/lib/errors/operation-error'
 import { getProjectRoot } from 'src/lib/git-utils'
 import { getInfraKitConfig } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
-import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
+import {
+  detectReleaseType,
+  formatBranchChoices,
+  getJiraDescriptions,
+  releaseLabelFromBranch,
+  resolveReleaseBranch,
+} from 'src/lib/release-utils'
 import type { ReleaseType } from 'src/lib/release-utils'
 import { defineMcpTool, textContent } from 'src/types'
 
@@ -35,7 +41,7 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
   let selectedReleaseBranch = ''
 
   if (version) {
-    selectedReleaseBranch = version === 'dev' ? 'dev' : `release/v${version}`
+    selectedReleaseBranch = version === 'dev' ? 'dev' : resolveReleaseBranch(version)
   } else {
     commandEcho.setInteractive()
 
@@ -59,7 +65,7 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
     })
   }
 
-  const selectedVersion = selectedReleaseBranch === 'dev' ? 'dev' : selectedReleaseBranch.replace('release/v', '')
+  const selectedVersion = releaseLabelFromBranch(selectedReleaseBranch)
 
   commandEcho.addOption('--version', selectedVersion)
 
@@ -172,7 +178,7 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
 
     const structuredContent = {
       releaseBranch: selectedReleaseBranch,
-      version: selectedReleaseBranch.replace('release/v', ''),
+      version: selectedVersion,
       environment: selectedEnv,
       services: selectedServices,
       skipTerraformDeploy: shouldSkipTerraform,
@@ -226,7 +232,7 @@ export const ghReleaseDeploySelectedMcpTool = defineMcpTool({
     version: z
       .string()
       .describe(
-        'Release version to deploy from (e.g. "1.2.5") — resolves to the release/vX.Y.Z branch. Pass "dev" to deploy from the dev branch instead. Required for MCP calls.',
+        'Accepts a release version (e.g. "1.2.5") OR a release name (e.g. "checkout-redesign") — resolves to the release/vX.Y.Z or release/n/<name> branch. Pass "dev" to deploy from the dev branch instead. Required for MCP calls.',
       ),
     env: z
       .string()

package/src/commands/gh-release-list/gh-release-list.ts

@@ -1,7 +1,8 @@
-import { z } from 'zod/v4'
+import { z } from 'zod'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { logger } from 'src/lib/logger'
+import { displayLabel, formatJiraName, parseBranchName } from 'src/lib/release-id'
 import { detectReleaseType, formatVersionLabel, getJiraDescriptions } from 'src/lib/release-utils'
 import { defineMcpTool, textContent } from 'src/types'
 
@@ -11,11 +12,21 @@ import { defineMcpTool, textContent } from 'src/types'
 export const ghReleaseList = async () => {
   const releasePRs = await getReleasePRsWithInfo()
 
-  const releases = releasePRs.map((pr) => {
-    return {
-      version: pr.branch.replace('release/', ''),
-      type: detectReleaseType(pr.title),
-    }
+  // Skip branches that do not parse as release ids (lenient discovery source).
+  const releases = releasePRs.flatMap((pr) => {
+    const id = parseBranchName(pr.branch)
+
+    if (!id) return []
+
+    return [
+      {
+        // Human display label: `1.2.3` | `<name>`.
+        version: displayLabel(id),
+        // Jira-descriptions map is keyed by the Jira version NAME (`v1.2.3` | `<name>`).
+        jiraKey: formatJiraName(id),
+        type: detectReleaseType(pr.title),
+      },
+    ]
   })
 
   const jiraDescriptions = await getJiraDescriptions()
@@ -28,7 +39,7 @@ export const ghReleaseList = async () => {
 
   const formattedLines = releases.map((release) => {
     const label = formatVersionLabel(release.version, release.type, maxVersionLength)
-    const description = jiraDescriptions.get(release.version)
+    const description = jiraDescriptions.get(release.jiraKey)
 
     if (description) {
       return `${label}  ${description}`
@@ -45,7 +56,7 @@ export const ghReleaseList = async () => {
       return {
         version: release.version,
         type: release.type,
-        description: jiraDescriptions.get(release.version) || null,
+        description: jiraDescriptions.get(release.jiraKey) || null,
       }
     }),
     count: releases.length,