infra-kit 0.1.78 → 0.1.80

package/src/commands/release-create-batch/release-create-batch.ts

@@ -1,4 +1,5 @@
 import confirm from '@inquirer/confirm'
+import select from '@inquirer/select'
 import process from 'node:process'
 import { z } from 'zod'
 import { question } from 'zx'
@@ -7,28 +8,22 @@ import { loadJiraConfig } from 'src/integrations/jira'
 import { commandEcho } from 'src/lib/command-echo'
 import { logger } from 'src/lib/logger'
 import { createSingleRelease, prepareGitForRelease } from 'src/lib/release-utils'
-import type { ReleaseCreationResult } from 'src/lib/release-utils'
+import type { ReleaseCreationResult, ReleaseType } from 'src/lib/release-utils'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 interface ReleaseCreateBatchArgs extends RequiredConfirmedOptionArg {
   versions: string
-  description?: string
+  type?: ReleaseType
 }
 
 /**
- * Create multiple release branches for the specified versions
- * Includes Jira version creation and GitHub release branch creation for each version
+ * Gather and validate batch release inputs interactively if needed
  */
-// eslint-disable-next-line sonarjs/cognitive-complexity
-export const releaseCreateBatch = async (args: ReleaseCreateBatchArgs): Promise<ToolsExecutionResult> => {
-  const { versions: inputVersions, description, confirmedCommand } = args
-
-  commandEcho.start('release-create-batch')
+const resolveInputs = async (args: ReleaseCreateBatchArgs): Promise<{ versionsList: string[]; type: ReleaseType }> => {
+  const { versions: inputVersions, type: inputType, confirmedCommand } = args
 
   let versionInput = inputVersions
-
-  // Load Jira config - it is now mandatory
-  const jiraConfig = await loadJiraConfig()
+  let type: ReleaseType = inputType || 'regular'
 
   if (!versionInput) {
     commandEcho.setInteractive()
@@ -41,13 +36,26 @@ export const releaseCreateBatch = async (args: ReleaseCreateBatchArgs): Promise<
 
   commandEcho.addOption('--versions', versionsList.join(', '))
 
-  // Validate input
   if (versionsList.length === 0) {
     logger.error('No versions provided. Exiting...')
     process.exit(1)
   }
 
-  // Inform user if they only provided one version
+  if (!inputType) {
+    commandEcho.setInteractive()
+
+    type = await select<ReleaseType>({
+      message: 'Select release type:',
+      choices: [
+        { name: 'regular', value: 'regular' },
+        { name: 'hotfix', value: 'hotfix' },
+      ],
+      default: 'regular',
+    })
+  }
+
+  commandEcho.addOption('--type', type)
+
   if (versionsList.length === 1) {
     logger.warn('💡 You are creating only one release. Consider using "create-release" command for single releases.')
   }
@@ -67,14 +75,23 @@ export const releaseCreateBatch = async (args: ReleaseCreateBatchArgs): Promise<
     process.exit(0)
   }
 
-  // Track --yes flag if confirmation was interactive (user confirmed)
   commandEcho.addOption('--yes', true)
 
-  if (description) {
-    commandEcho.addOption('--description', description)
-  }
+  return { versionsList, type }
+}
+
+/**
+ * Create multiple release branches for the specified versions
+ * Includes Jira version creation and GitHub release branch creation for each version
+ */
+export const releaseCreateBatch = async (args: ReleaseCreateBatchArgs): Promise<ToolsExecutionResult> => {
+  commandEcho.start('release-create-batch')
+
+  const jiraConfig = await loadJiraConfig()
+
+  const { versionsList, type } = await resolveInputs(args)
 
-  await prepareGitForRelease()
+  await prepareGitForRelease(type)
 
   const releases: ReleaseCreationResult[] = []
   const failedReleases: Array<{ version: string; error: string }> = []
@@ -82,7 +99,7 @@ export const releaseCreateBatch = async (args: ReleaseCreateBatchArgs): Promise<
   for (const version of versionsList) {
     try {
       // Create each release
-      const release = await createSingleRelease(version, jiraConfig, description)
+      const release = await createSingleRelease({ version, jiraConfig, type })
 
       releases.push(release)
 
@@ -141,7 +158,11 @@ export const releaseCreateBatchMcpTool = {
   description: 'Create multiple release branches for specified versions with Jira version creation (batch operation)',
   inputSchema: {
     versions: z.string().describe('Comma-separated list of versions to create (e.g., "1.2.5, 1.2.6")'),
-    description: z.string().optional().describe('Optional description for the Jira versions'),
+    type: z
+      .enum(['regular', 'hotfix'])
+      .optional()
+      .default('regular')
+      .describe('Release type: "regular" or "hotfix" (default: "regular")'),
   },
   outputSchema: {
     createdBranches: z.array(z.string()).describe('List of created release branches'),
@@ -151,6 +172,7 @@ export const releaseCreateBatchMcpTool = {
       .array(
         z.object({
           version: z.string().describe('Version number'),
+          type: z.enum(['regular', 'hotfix']).describe('Release type'),
           branchName: z.string().describe('Release branch name'),
           prUrl: z.string().describe('GitHub PR URL'),
           jiraVersionUrl: z.string().describe('Jira version URL'),

package/src/commands/worktrees-add/worktrees-add.ts

@@ -1,16 +1,17 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import checkbox from '@inquirer/checkbox'
 import confirm from '@inquirer/confirm'
-import { copyFileSync, existsSync } from 'node:fs'
 import process from 'node:process'
 import { z } from 'zod'
 import { $ } from 'zx'
 
-import { getReleasePRs } from 'src/integrations/gh'
+import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
 import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
 import { getCurrentWorktrees, getProjectRoot } from 'src/lib/git-utils'
 import { logger } from 'src/lib/logger'
+import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
+import type { ReleaseType } from 'src/lib/release-utils'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 // Constants
@@ -20,7 +21,9 @@ const RELEASE_BRANCH_PREFIX = 'release/v'
 
 interface WorktreeManagementArgs extends RequiredConfirmedOptionArg {
   all: boolean
+  versions?: string
   cursor?: boolean
+  githubDesktop?: boolean
 }
 
 /**
@@ -28,7 +31,7 @@ interface WorktreeManagementArgs extends RequiredConfirmedOptionArg {
  * Creates worktrees for active release branches and removes unused ones
  */
 export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<ToolsExecutionResult> => {
-  const { confirmedCommand, all, cursor } = options
+  const { confirmedCommand, all, versions, cursor, githubDesktop } = options
 
   commandEcho.start('worktrees-add')
 
@@ -41,7 +44,17 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
     await ensureWorktreeDirectory(`${worktreeDir}/${RELEASE_DIR}`)
     await ensureWorktreeDirectory(`${worktreeDir}/${FEATURE_DIR}`)
 
-    const releasePRsList = await getReleasePRs()
+    const releasePRsInfo = await getReleasePRsWithInfo()
+
+    const releasePRsList = releasePRsInfo.map((pr) => {
+      return pr.branch
+    })
+
+    const releaseTypes = new Map<string, ReleaseType>(
+      releasePRsInfo.map((pr) => {
+        return [pr.branch, detectReleaseType(pr.title)]
+      }),
+    )
 
     if (releasePRsList.length === 0) {
       logger.info('ℹ️ No open release branches found')
@@ -58,18 +71,19 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
 
     if (all) {
       selectedReleaseBranches = releasePRsList
+    } else if (versions) {
+      selectedReleaseBranches = versions.split(',').map((v) => {
+        return `release/v${v.trim()}`
+      })
     } else {
       commandEcho.setInteractive()
 
+      const descriptions = await getJiraDescriptions()
+
       selectedReleaseBranches = await checkbox({
         required: true,
         message: '🌿 Select release branches',
-        choices: releasePRsList.map((pr) => {
-          return {
-            name: pr.replace('release/v', ''),
-            value: pr,
-          }
-        }),
+        choices: formatBranchChoices({ branches: releasePRsList, descriptions, types: releaseTypes }),
       })
     }
 
@@ -79,7 +93,12 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
     if (allSelected) {
       commandEcho.addOption('--all', true)
     } else {
-      commandEcho.addOption('--branches', selectedReleaseBranches)
+      commandEcho.addOption(
+        '--versions',
+        selectedReleaseBranches.map((branch) => {
+          return branch.replace('release/v', '')
+        }),
+      )
     }
 
     // Ask for confirmation
@@ -103,14 +122,29 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
       commandEcho.addOption('--yes', true)
     }
 
-    const openInCursor = cursor ? true : await confirm({ message: 'Open created worktrees in Cursor?' })
+    const openInCursor = cursor ?? (await confirm({ message: 'Open created worktrees in Cursor?' }))
 
-    if (!openInCursor) {
+    if (typeof cursor === 'undefined') {
       commandEcho.setInteractive()
     }
 
     if (openInCursor) {
       commandEcho.addOption('--cursor', true)
+    } else {
+      commandEcho.addOption('--no-cursor', true)
+    }
+
+    const openInGithubDesktop =
+      githubDesktop ?? (await confirm({ message: 'Open created worktrees in GitHub Desktop?' }))
+
+    if (typeof githubDesktop === 'undefined') {
+      commandEcho.setInteractive()
+    }
+
+    if (openInGithubDesktop) {
+      commandEcho.addOption('--github-desktop', true)
+    } else {
+      commandEcho.addOption('--no-github-desktop', true)
     }
 
     const { branchesToCreate } = categorizeWorktrees({
@@ -118,7 +152,7 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
       currentWorktrees,
     })
 
-    const createdWorktrees = await createWorktrees(branchesToCreate, worktreeDir, projectRoot)
+    const createdWorktrees = await createWorktrees(branchesToCreate, worktreeDir)
 
     logResults(createdWorktrees)
 
@@ -128,6 +162,13 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
       }
     }
 
+    if (openInGithubDesktop) {
+      for (const branch of createdWorktrees) {
+        await $`github ${worktreeDir}/${branch}`
+        await $`sleep 5`
+      }
+    }
+
     commandEcho.print()
 
     const structuredContent = {
@@ -182,26 +223,27 @@ const categorizeWorktrees = (args: CategorizeWorktreesArgs): { branchesToCreate:
 /**
  * Create worktrees for the specified branches
  */
-const createWorktrees = async (branches: string[], worktreeDir: string, projectRoot: string): Promise<string[]> => {
-  const created: string[] = []
-
-  for (const branch of branches) {
-    try {
+const createWorktrees = async (branches: string[], worktreeDir: string): Promise<string[]> => {
+  const results = await Promise.allSettled(
+    branches.map(async (branch) => {
       const worktreePath = `${worktreeDir}/${branch}`
 
       await $`git worktree add ${worktreePath} ${branch}`
+      await $({ cwd: worktreePath })`pnpm install`
 
-      const rootEnvPath = `${projectRoot}/.env`
+      return branch
+    }),
+  )
 
-      if (existsSync(rootEnvPath)) {
-        copyFileSync(rootEnvPath, `${worktreePath}/.env`)
+  const created: string[] = []
 
-        logger.info('📋 Copied .env to worktree')
-      }
+  for (const [index, result] of results.entries()) {
+    if (result.status === 'fulfilled') {
+      created.push(result.value)
+    } else {
+      const branch = branches[index]
 
-      created.push(branch)
-    } catch (error) {
-      logger.error({ error, branch }, `❌ Failed to create worktree for ${branch}`)
+      logger.error({ error: result.reason }, `❌ Failed to create worktree for ${branch}`)
     }
   }
 
@@ -213,26 +255,29 @@ const createWorktrees = async (branches: string[], worktreeDir: string, projectR
  */
 const logResults = (created: string[]): void => {
   if (created.length > 0) {
-    logger.info('\n')
-    logger.info('✅ Created worktrees:')
-    logger.info(created.join('\n'))
+    logger.info('✅ Created git worktrees:')
+    for (const branch of created) {
+      logger.info(branch)
+    }
     logger.info('')
   } else {
-    logger.info('ℹ️ No new worktrees to create')
+    logger.info('ℹ️ No new git worktrees to create')
   }
 }
 
 // MCP Tool Registration
 export const worktreesAddMcpTool = {
   name: 'worktrees-add',
-  description: 'Create worktrees for selected release branches',
+  description: 'Create git worktrees for selected release branches',
   inputSchema: {
-    all: z.boolean().describe('Add worktrees for all release branches without prompting'),
-    cursor: z.boolean().optional().describe('Open created worktrees in Cursor'),
+    all: z.boolean().describe('Add git worktrees for all release branches without prompting'),
+    versions: z.string().optional().describe('Specify versions by comma, e.g. 1.2.5, 1.2.6'),
+    cursor: z.boolean().optional().describe('Open created git worktrees in Cursor'),
+    githubDesktop: z.boolean().optional().describe('Open created git worktrees in GitHub Desktop'),
   },
   outputSchema: {
-    createdWorktrees: z.array(z.string()).describe('List of created worktree branches'),
-    count: z.number().describe('Number of worktrees created'),
+    createdWorktrees: z.array(z.string()).describe('List of created git worktree branches'),
+    count: z.number().describe('Number of git worktrees created'),
   },
   handler: worktreesAdd,
 }

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

@@ -225,7 +225,7 @@ const logResults = (worktrees: WorktreeInfo[]): void => {
 
   logger.info(`\n${'═'.repeat(100)}`)
   logger.info(
-    `📊 Summary: ${worktrees.length} total worktrees (${releases.length} releases, ${features.length} features)`,
+    `📊 Summary: ${worktrees.length} total git worktrees (${releases.length} releases, ${features.length} features)`,
   )
 
   if (current) {

package/src/commands/worktrees-remove/worktrees-remove.ts

@@ -4,15 +4,19 @@ import process from 'node:process'
 import { z } from 'zod'
 import { $ } from 'zx'
 
+import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
 import { WORKTREES_DIR_SUFFIX } from 'src/lib/constants'
 import { getCurrentWorktrees, getProjectRoot } from 'src/lib/git-utils'
 import { logger } from 'src/lib/logger'
+import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
+import type { ReleaseType } from 'src/lib/release-utils'
 import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
 
 // Constants
 interface WorktreeManagementArgs extends RequiredConfirmedOptionArg {
   all: boolean
+  versions?: string
 }
 
 /**
@@ -20,7 +24,7 @@ interface WorktreeManagementArgs extends RequiredConfirmedOptionArg {
  * Creates worktrees for active release branches and removes unused ones
  */
 export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<ToolsExecutionResult> => {
-  const { confirmedCommand, all } = options
+  const { confirmedCommand, all, versions } = options
 
   commandEcho.start('worktrees-remove')
 
@@ -46,18 +50,25 @@ export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<
 
     if (all) {
       selectedReleaseBranches = currentWorktrees
+    } else if (versions) {
+      selectedReleaseBranches = versions.split(',').map((v) => {
+        return `release/v${v.trim()}`
+      })
     } else {
       commandEcho.setInteractive()
 
+      const [descriptions, prInfo] = await Promise.all([getJiraDescriptions(), getReleasePRsWithInfo()])
+
+      const releaseTypes = new Map<string, ReleaseType>(
+        prInfo.map((pr) => {
+          return [pr.branch, detectReleaseType(pr.title)]
+        }),
+      )
+
       selectedReleaseBranches = await checkbox({
         required: true,
         message: '🌿 Select release branches',
-        choices: currentWorktrees.map((pr) => {
-          return {
-            name: pr.replace('release/v', ''),
-            value: pr,
-          }
-        }),
+        choices: formatBranchChoices({ branches: currentWorktrees, descriptions, types: releaseTypes }),
       })
     }
 
@@ -67,7 +78,7 @@ export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<
     if (allSelected) {
       commandEcho.addOption('--all', true)
     } else {
-      commandEcho.addOption('--branches', selectedReleaseBranches)
+      commandEcho.addOption('--versions', selectedReleaseBranches)
     }
 
     // Ask for confirmation
@@ -118,22 +129,39 @@ export const worktreesRemove = async (options: WorktreeManagementArgs): Promise<
 }
 
 /**
- * Remove worktrees for the specified branches
+ * Remove worktrees for the specified branches and whole folder
  */
 const removeWorktrees = async (branches: string[], worktreeDir: string): Promise<string[]> => {
-  const removed: string[] = []
-
-  for (const branch of branches) {
-    try {
+  const results = await Promise.allSettled(
+    branches.map(async (branch) => {
       const worktreePath = `${worktreeDir}/${branch}`
 
       await $`git worktree remove ${worktreePath}`
-      removed.push(branch)
-    } catch (error) {
-      logger.error({ error, branch }, `❌ Failed to remove worktree for ${branch}`)
+
+      return branch
+    }),
+  )
+
+  const removed: string[] = []
+
+  for (const [index, result] of results.entries()) {
+    if (result.status === 'fulfilled') {
+      removed.push(result.value)
+    } else {
+      const branch = branches[index]
+
+      logger.error({ error: result.reason }, `❌ Failed to remove worktree for ${branch}`)
     }
   }
 
+  if (removed.length === branches.length) {
+    await $`git worktree prune`
+    await $`rm -rf ${worktreeDir}`
+
+    logger.info(`🗑️ Removed worktree folder: ${worktreeDir}`)
+    logger.info('')
+  }
+
   return removed
 }
 
@@ -143,7 +171,9 @@ const removeWorktrees = async (branches: string[], worktreeDir: string): Promise
 const logResults = (removed: string[]): void => {
   if (removed.length > 0) {
     logger.info('❌ Removed worktrees:')
-    logger.info(removed.join('\n'))
+    for (const branch of removed) {
+      logger.info(branch)
+    }
     logger.info('')
   } else {
     logger.info('ℹ️ No unused worktrees to remove')
@@ -155,11 +185,12 @@ export const worktreesRemoveMcpTool = {
   name: 'worktrees-remove',
   description: 'Remove selected worktrees',
   inputSchema: {
-    all: z.boolean().describe('Remove all worktrees without prompting'),
+    all: z.boolean().describe('Remove all git worktrees without prompting'),
+    versions: z.string().optional().describe('Specify versions by comma, e.g. 1.2.5, 1.2.6'),
   },
   outputSchema: {
-    removedWorktrees: z.array(z.string()).describe('List of removed worktree branches'),
-    count: z.number().describe('Number of worktrees removed'),
+    removedWorktrees: z.array(z.string()).describe('List of removed git worktree branches'),
+    count: z.number().describe('Number of git worktrees removed'),
   },
   handler: worktreesRemove,
 }

package/src/commands/worktrees-sync/worktrees-sync.ts

@@ -133,7 +133,9 @@ const removeWorktrees = async (branches: string[], worktreeDir: string): Promise
 const logResults = (removed: string[]): void => {
   if (removed.length > 0) {
     logger.info('❌ Removed worktrees:')
-    logger.info(removed.join('\n'))
+    for (const branch of removed) {
+      logger.info(branch)
+    }
     logger.info('')
   } else {
     logger.info('ℹ️ No unused worktrees to remove')

package/src/entry/cli.ts

@@ -1,4 +1,4 @@
-import { Command } from 'commander'
+import { Command, Option } from 'commander'
 
 import { doctor } from 'src/commands/doctor'
 import { envClear } from 'src/commands/env-clear'
@@ -6,7 +6,6 @@ import { envInit } from 'src/commands/env-init'
 import { envList } from 'src/commands/env-list'
 import { envLoad } from 'src/commands/env-load'
 import { envStatus } from 'src/commands/env-status'
-// Commands
 import { ghMergeDev } from 'src/commands/gh-merge-dev'
 import { ghReleaseDeliver } from 'src/commands/gh-release-deliver'
 import { ghReleaseDeployAll } from 'src/commands/gh-release-deploy-all'
@@ -43,12 +42,14 @@ program
   .description('Create a single release branch')
   .option('-v, --version <version>', 'Specify the version to create, e.g. 1.2.5')
   .option('-d, --description <description>', 'Optional description for the Jira version')
+  .addOption(new Option('-t, --type <type>', 'Release type (default: regular)').choices(['regular', 'hotfix']))
   .option('-y, --yes', 'Skip confirmation prompt')
   .option('--no-checkout', 'Do not checkout the created branch after creation (checkout is default)')
   .action(async (options) => {
     await releaseCreate({
       version: options.version,
       description: options.description,
+      type: options.type,
       confirmedCommand: options.yes,
       checkout: options.checkout,
     })
@@ -58,12 +59,12 @@ program
   .command('release-create-batch')
   .description('Create multiple release branches (batch operation)')
   .option('-v, --versions <versions>', 'Specify the versions to create by comma, e.g. 1.2.5, 1.2.6')
-  .option('-d, --description <description>', 'Optional description for the Jira versions')
+  .addOption(new Option('-t, --type <type>', 'Release type (default: regular)').choices(['regular', 'hotfix']))
   .option('-y, --yes', 'Skip confirmation prompt')
   .action(async (options) => {
     await releaseCreateBatch({
       versions: options.versions,
-      description: options.description,
+      type: options.type,
       confirmedCommand: options.yes,
     })
   })
@@ -132,9 +133,19 @@ program
   .description('Add git worktrees for release branches')
   .option('-y, --yes', 'Skip confirmation prompt')
   .option('-a, --all', 'Select all active release branches')
+  .option('-v, --versions <versions>', 'Specify versions by comma, e.g. 1.2.5, 1.2.6')
   .option('-c, --cursor', 'Open created worktrees in Cursor')
+  .option('--no-cursor', 'Skip Cursor prompt')
+  .option('-g, --github-desktop', 'Open created worktrees in GitHub Desktop')
+  .option('--no-github-desktop', 'Skip GitHub Desktop prompt')
   .action(async (options) => {
-    await worktreesAdd({ confirmedCommand: options.yes, all: options.all, cursor: options.cursor })
+    await worktreesAdd({
+      confirmedCommand: options.yes,
+      all: options.all,
+      versions: options.versions,
+      cursor: options.cursor,
+      githubDesktop: options.githubDesktop,
+    })
   })
 
 program
@@ -149,8 +160,9 @@ program
   .description('Remove git worktrees for release branches')
   .option('-y, --yes', 'Skip confirmation prompt')
   .option('-a, --all', 'Select all active release branches')
+  .option('-v, --versions <versions>', 'Specify versions by comma, e.g. 1.2.5, 1.2.6')
   .action(async (options) => {
-    await worktreesRemove({ confirmedCommand: options.yes, all: options.all })
+    await worktreesRemove({ confirmedCommand: options.yes, all: options.all, versions: options.versions })
   })
 
 program
@@ -183,9 +195,7 @@ program
 
 program
   .command('env-load')
-  .description(
-    'Load Doppler env vars for a config. Prints a file path to stdout — auto-sourced by the env-load shell alias, or run source <path> manually',
-  )
+  .description('Load Doppler env vars for a config. Source the returned file path to apply.')
   .option('-c, --config <config>', 'Environment config name to load (e.g. dev, arthur)')
   .action(async (options) => {
     await envLoad({ config: options.config })
@@ -193,9 +203,7 @@ program
 
 program
   .command('env-clear')
-  .description(
-    'Clear loaded env vars. Prints a file path to stdout — auto-sourced by the env-clear shell alias, or run source <path> manually',
-  )
+  .description('Clear loaded env vars. Source the returned file path to apply.')
   .action(async () => {
     await envClear()
   })