infra-kit 0.1.80 → 0.1.82

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.80",
+  "version": "0.1.82",
   "description": "infra-kit",
   "main": "dist/cli.js",
   "module": "dist/cli.js",
   "bin": {
-    "infra-kit": "dist/cli.js"
+    "infra-kit": "dist/cli.js",
+    "ik": "dist/cli.js"
   },
   "engines": {
     "node": ">=20.x"

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

@@ -14,8 +14,8 @@ export const envList = async (): Promise<ToolsExecutionResult> => {
 
   const project = await getDopplerProject()
 
-  logger.info(`Doppler Project: ${project}\n`)
-  logger.info('Available Configs:')
+  logger.info(`Doppler project: ${project}\n`)
+  logger.info('Available configs:')
 
   for (const env of ENVs) {
     logger.info(`  - ${env}`)

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

@@ -101,7 +101,7 @@ export const ghMergeDev = async (args: GhMergeDevArgs): Promise<ToolsExecutionRe
   }
 
   // Track --yes flag if confirmation was interactive (user confirmed)
-  if (allSelected) {
+  if (!confirmedCommand) {
     commandEcho.addOption('--yes', true)
   }
 
@@ -126,13 +126,11 @@ export const ghMergeDev = async (args: GhMergeDevArgs): Promise<ToolsExecutionRe
 
   if (failedBranches.length > 0) {
     logger.info(`\n⚠️  ${failedBranches.length} branch(es) failed to merge automatically.\n`)
-    logger.info('📋 Manual merge script for failed branches:\n')
-    logger.info('```bash')
+    logger.info('📋 Manual merge script for failed branches:')
     for (const branch of failedBranches) {
-      logger.info(`# Phase #1: Merge dev into ${branch}`)
-      logger.info(`git switch ${branch} && git pull origin ${branch} && git merge origin/dev`)
-      logger.info(`# Phase #2:Resolve conflicts if any, then:`)
-      logger.info(`git push origin ${branch} && git switch dev`)
+      logger.info(
+        `# Merge dev into ${branch} and resolve conflicts if any \ngit switch ${branch} && git pull origin ${branch} && git merge origin/dev\ngit push origin ${branch} && git switch dev\n`,
+      )
     }
     logger.info(
       `✅ ${selectedReleaseBranches.length - failedBranches.length}/${selectedReleaseBranches.length} merges completed successfully.`,

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

@@ -25,22 +25,6 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs): Promise<
 
   commandEcho.start('release-deploy-all')
 
-  // TODO: add validation for semver version for version variable
-
-  const releasePRsInfo = await getReleasePRsWithInfo()
-
-  const branches = releasePRsInfo.map((pr) => {
-    return pr.branch
-  })
-
-  const releaseTypes = new Map<string, ReleaseType>(
-    releasePRsInfo.map((pr) => {
-      return [pr.branch, detectReleaseType(pr.title)]
-    }),
-  )
-
-  const releasePRsList: string[] = ['dev', ...branches]
-
   let selectedReleaseBranch = '' // "release/v1.8.0"
 
   if (version) {
@@ -48,6 +32,18 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs): Promise<
   } else {
     commandEcho.setInteractive()
 
+    const releasePRsInfo = await getReleasePRsWithInfo()
+
+    const branches = releasePRsInfo.map((pr) => {
+      return pr.branch
+    })
+
+    const releaseTypes = new Map<string, ReleaseType>(
+      releasePRsInfo.map((pr) => {
+        return [pr.branch, detectReleaseType(pr.title)]
+      }),
+    )
+
     const descriptions = await getJiraDescriptions()
 
     selectedReleaseBranch = await select({
@@ -60,12 +56,6 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs): Promise<
 
   commandEcho.addOption('--version', selectedVersion)
 
-  // Check if release branch exists in the list
-  if (!releasePRsList.includes(selectedReleaseBranch)) {
-    logger.error(`❌ Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)
-    process.exit(1)
-  }
-
   let selectedEnv = ''
 
   if (env) {

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

@@ -32,20 +32,6 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
 
   commandEcho.start('release-deploy-selected')
 
-  const releasePRsInfo = await getReleasePRsWithInfo()
-
-  const branches = releasePRsInfo.map((pr) => {
-    return pr.branch
-  })
-
-  const releaseTypes = new Map<string, ReleaseType>(
-    releasePRsInfo.map((pr) => {
-      return [pr.branch, detectReleaseType(pr.title)]
-    }),
-  )
-
-  const releasePRsList: string[] = ['dev', ...branches]
-
   let selectedReleaseBranch = ''
 
   if (version) {
@@ -53,6 +39,18 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
   } else {
     commandEcho.setInteractive()
 
+    const releasePRsInfo = await getReleasePRsWithInfo()
+
+    const branches = releasePRsInfo.map((pr) => {
+      return pr.branch
+    })
+
+    const releaseTypes = new Map<string, ReleaseType>(
+      releasePRsInfo.map((pr) => {
+        return [pr.branch, detectReleaseType(pr.title)]
+      }),
+    )
+
     const descriptions = await getJiraDescriptions()
 
     selectedReleaseBranch = await select({
@@ -65,12 +63,6 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
 
   commandEcho.addOption('--version', selectedVersion)
 
-  // Check if release branch exists in the list
-  if (!releasePRsList.includes(selectedReleaseBranch)) {
-    logger.error(`❌ Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)
-    process.exit(1)
-  }
-
   let selectedEnv = ''
 
   if (env) {

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

@@ -30,22 +30,6 @@ export const ghReleaseDeployService = async (args: GhReleaseDeployServiceArgs):
 
   commandEcho.start('release-deploy-service')
 
-  // TODO: add validation for semver version for version variable
-
-  const releasePRsInfo = await getReleasePRsWithInfo()
-
-  const branches = releasePRsInfo.map((pr) => {
-    return pr.branch
-  })
-
-  const releaseTypes = new Map<string, ReleaseType>(
-    releasePRsInfo.map((pr) => {
-      return [pr.branch, detectReleaseType(pr.title)]
-    }),
-  )
-
-  const releasePRsList: string[] = ['dev', ...branches]
-
   let selectedReleaseBranch = '' // "release/v1.8.0"
 
   if (version) {
@@ -53,6 +37,18 @@ export const ghReleaseDeployService = async (args: GhReleaseDeployServiceArgs):
   } else {
     commandEcho.setInteractive()
 
+    const releasePRsInfo = await getReleasePRsWithInfo()
+
+    const branches = releasePRsInfo.map((pr) => {
+      return pr.branch
+    })
+
+    const releaseTypes = new Map<string, ReleaseType>(
+      releasePRsInfo.map((pr) => {
+        return [pr.branch, detectReleaseType(pr.title)]
+      }),
+    )
+
     const descriptions = await getJiraDescriptions()
 
     selectedReleaseBranch = await select({
@@ -65,12 +61,6 @@ export const ghReleaseDeployService = async (args: GhReleaseDeployServiceArgs):
 
   commandEcho.addOption('--version', selectedVersion)
 
-  // Check if release branch exists in the list
-  if (!releasePRsList.includes(selectedReleaseBranch)) {
-    logger.error(`❌ Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)
-    process.exit(1)
-  }
-
   let selectedEnv = ''
 
   if (env) {

package/src/commands/init/index.ts

@@ -0,0 +1 @@
+export { init } from './init'

package/src/commands/{env-init/env-init.ts → init/init.ts}

@@ -4,12 +4,16 @@ import path from 'node:path'
 
 import { logger } from 'src/lib/logger'
 
-const MARKER_COMMENT = '# infra-kit shell functions'
+const MARKER_START = '# -- infra-kit:begin --'
+const MARKER_END = '# -- infra-kit:end --'
+
+const LEGACY_PAIRED: [start: string, end: string][] = [['# region infra-kit', '# endregion infra-kit']]
+const LEGACY_SINGLE = '# infra-kit shell functions'
 
 /**
  * Append infra-kit shell functions directly to .zshrc.
  */
-export const envInit = async (): Promise<void> => {
+export const init = async (): Promise<void> => {
   const zshrcPath = path.join(os.homedir(), '.zshrc')
   const shellBlock = buildShellBlock()
 
@@ -28,6 +32,7 @@ export const envInit = async (): Promise<void> => {
 const isBlockLine = (line: string): boolean => {
   return (
     line.startsWith('#') ||
+    line.startsWith('alias ') ||
     line.startsWith('env-load') ||
     line.startsWith('env-clear') ||
     line.startsWith('env-status') ||
@@ -37,14 +42,40 @@ const isBlockLine = (line: string): boolean => {
   )
 }
 
+const removeBetween = (content: string, start: string, end: string): string | null => {
+  const startIdx = content.indexOf(start)
+  const endIdx = content.indexOf(end)
+
+  if (startIdx === -1 || endIdx === -1) return null
+
+  // eslint-disable-next-line sonarjs/slow-regex
+  const before = content.slice(0, startIdx).replace(/\n+$/, '')
+  const after = content.slice(endIdx + end.length).replace(/^\n+/, '')
+
+  return before + (after ? `\n${after}` : '')
+}
+
 const removeExistingBlock = (content: string): string => {
-  const markerIdx = content.indexOf(MARKER_COMMENT)
+  // 1. Current markers
+  const result = removeBetween(content, MARKER_START, MARKER_END)
+
+  if (result !== null) return result
+
+  // 2. Legacy paired markers (# region / # endregion)
+  for (const [start, end] of LEGACY_PAIRED) {
+    const legacyResult = removeBetween(content, start, end)
+
+    if (legacyResult !== null) return legacyResult
+  }
+
+  // 3. Oldest format: single marker + heuristic scan
+  const legacyIdx = content.indexOf(LEGACY_SINGLE)
 
-  if (markerIdx === -1) return content
+  if (legacyIdx === -1) return content
 
   // eslint-disable-next-line sonarjs/slow-regex
-  const before = content.slice(0, markerIdx).replace(/\n+$/, '')
-  const afterLines = content.slice(markerIdx).split('\n')
+  const before = content.slice(0, legacyIdx).replace(/\n+$/, '')
+  const afterLines = content.slice(legacyIdx).split('\n')
 
   let i = 0
 
@@ -61,7 +92,7 @@ const buildShellBlock = (): string => {
   const runCmd = 'pnpm exec infra-kit'
 
   return [
-    MARKER_COMMENT,
+    MARKER_START,
     // eslint-disable-next-line no-template-curly-in-string
     'if [[ -z "${INFRA_KIT_SESSION}" ]]; then',
     '  export INFRA_KIT_SESSION=$(head -c 4 /dev/urandom | xxd -p)',
@@ -69,5 +100,7 @@ const buildShellBlock = (): string => {
     `env-load() { local f; f=$(${runCmd} env-load "$@") && source "$f" && ${runCmd} env-status; }`,
     `env-clear() { local f; f=$(${runCmd} env-clear) && source "$f" && ${runCmd} env-status; }`,
     `env-status() { ${runCmd} env-status; }`,
+    `alias ik='${runCmd}'`,
+    MARKER_END,
   ].join('\n')
 }

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

@@ -30,9 +30,12 @@ const resolveInputs = async (args: ReleaseCreateBatchArgs): Promise<{ versionsLi
     versionInput = await question('Enter versions by comma (e.g. 1.2.5, 1.2.6): ')
   }
 
-  const versionsList = versionInput.split(',').map((version) => {
-    return version.trim()
-  })
+  const versionsList = versionInput
+    .split(',')
+    .map((version) => {
+      return version.trim()
+    })
+    .filter(Boolean)
 
   commandEcho.addOption('--versions', versionsList.join(', '))
 

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

@@ -44,53 +44,53 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
     await ensureWorktreeDirectory(`${worktreeDir}/${RELEASE_DIR}`)
     await ensureWorktreeDirectory(`${worktreeDir}/${FEATURE_DIR}`)
 
-    const releasePRsInfo = await getReleasePRsWithInfo()
+    let selectedReleaseBranches: string[] = []
 
-    const releasePRsList = releasePRsInfo.map((pr) => {
-      return pr.branch
-    })
+    if (versions) {
+      selectedReleaseBranches = versions.split(',').map((v) => {
+        return `release/v${v.trim()}`
+      })
+    } else {
+      const releasePRsInfo = await getReleasePRsWithInfo()
 
-    const releaseTypes = new Map<string, ReleaseType>(
-      releasePRsInfo.map((pr) => {
-        return [pr.branch, detectReleaseType(pr.title)]
-      }),
-    )
+      const releasePRsList = releasePRsInfo.map((pr) => {
+        return pr.branch
+      })
 
-    if (releasePRsList.length === 0) {
-      logger.info('ℹ️ No open release branches found')
+      if (releasePRsList.length === 0) {
+        logger.info('ℹ️ No open release branches found')
 
-      commandEcho.print()
+        commandEcho.print()
 
-      return {
-        content: [{ type: 'text', text: JSON.stringify({ createdWorktrees: [], count: 0 }, null, 2) }],
-        structuredContent: { createdWorktrees: [], count: 0 },
+        return {
+          content: [{ type: 'text', text: JSON.stringify({ createdWorktrees: [], count: 0 }, null, 2) }],
+          structuredContent: { createdWorktrees: [], count: 0 },
+        }
       }
-    }
 
-    let selectedReleaseBranches: string[] = []
+      if (all) {
+        selectedReleaseBranches = releasePRsList
+      } else {
+        commandEcho.setInteractive()
 
-    if (all) {
-      selectedReleaseBranches = releasePRsList
-    } else if (versions) {
-      selectedReleaseBranches = versions.split(',').map((v) => {
-        return `release/v${v.trim()}`
-      })
-    } else {
-      commandEcho.setInteractive()
+        const releaseTypes = new Map<string, ReleaseType>(
+          releasePRsInfo.map((pr) => {
+            return [pr.branch, detectReleaseType(pr.title)]
+          }),
+        )
 
-      const descriptions = await getJiraDescriptions()
+        const descriptions = await getJiraDescriptions()
 
-      selectedReleaseBranches = await checkbox({
-        required: true,
-        message: '🌿 Select release branches',
-        choices: formatBranchChoices({ branches: releasePRsList, descriptions, types: releaseTypes }),
-      })
+        selectedReleaseBranches = await checkbox({
+          required: true,
+          message: '🌿 Select release branches',
+          choices: formatBranchChoices({ branches: releasePRsList, descriptions, types: releaseTypes }),
+        })
+      }
     }
 
     // Track --all flag if all branches were selected (either via flag or interactively)
-    const allSelected = selectedReleaseBranches.length === releasePRsList.length
-
-    if (allSelected) {
+    if (all) {
       commandEcho.addOption('--all', true)
     } else {
       commandEcho.addOption(
@@ -118,7 +118,7 @@ export const worktreesAdd = async (options: WorktreeManagementArgs): Promise<Too
     }
 
     // Track --yes flag if confirmation was interactive (user confirmed)
-    if (allSelected) {
+    if (!confirmedCommand) {
       commandEcho.addOption('--yes', true)
     }