infra-kit 0.1.81 → 0.1.82

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.81",
+  "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/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/entry/cli.ts

@@ -1,8 +1,9 @@
+import select, { Separator } from '@inquirer/select'
 import { Command, Option } from 'commander'
+import process from 'node:process'
 
 import { doctor } from 'src/commands/doctor'
 import { envClear } from 'src/commands/env-clear'
-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'
@@ -12,6 +13,7 @@ import { ghReleaseDeployAll } from 'src/commands/gh-release-deploy-all'
 import { ghReleaseDeploySelected } from 'src/commands/gh-release-deploy-selected'
 import { ghReleaseDeployService } from 'src/commands/gh-release-deploy-service'
 import { ghReleaseList } from 'src/commands/gh-release-list'
+import { init } from 'src/commands/init'
 import { releaseCreate } from 'src/commands/release-create'
 import { releaseCreateBatch } from 'src/commands/release-create-batch'
 import { worktreesAdd } from 'src/commands/worktrees-add'
@@ -187,10 +189,10 @@ program
   })
 
 program
-  .command('env-init')
-  .description('Set up shell functions for env-load/env-clear in .zshrc')
+  .command('init')
+  .description('Inject shell integration into your profile .zshrc')
   .action(async () => {
-    await envInit()
+    await init()
   })
 
 program
@@ -208,4 +210,65 @@ program
     await envClear()
   })
 
-program.parse()
+if (process.argv.length <= 2) {
+  const releaseCommands = [
+    'merge-dev',
+    'release-list',
+    'release-create',
+    'release-create-batch',
+    'release-deploy-all',
+    'release-deploy-service',
+    'release-deploy-selected',
+    'release-deliver',
+  ]
+  const worktreeCommands = ['worktrees-add', 'worktrees-list', 'worktrees-remove', 'worktrees-sync']
+  const envCommands = ['doctor', 'init', 'env-status', 'env-list', 'env-load', 'env-clear']
+
+  const commandMap = new Map(
+    program.commands.map((cmd) => {
+      return [cmd.name(), cmd]
+    }),
+  )
+
+  const allNames = [...releaseCommands, ...worktreeCommands, ...envCommands]
+  const maxLen = Math.max(
+    ...allNames.map((n) => {
+      return n.length
+    }),
+  )
+
+  const toChoices = (names: string[]) => {
+    return names
+      .filter((n) => {
+        return commandMap.has(n)
+      })
+      .map((n) => {
+        return {
+          name: `${n.padEnd(maxLen)}  ${commandMap.get(n)!.description()}`,
+          value: n,
+        }
+      })
+  }
+
+  const selected = await select(
+    {
+      message: 'Select a command to run',
+      choices: [
+        new Separator(' '),
+        new Separator('— Release Management —'),
+        ...toChoices(releaseCommands),
+        new Separator(' '),
+        new Separator('— Worktrees —'),
+        ...toChoices(worktreeCommands),
+        new Separator(' '),
+        new Separator('— Environment —'),
+        ...toChoices(envCommands),
+      ],
+    },
+    { output: process.stderr },
+  )
+
+  program.parse(['node', 'infra-kit', selected])
+} else {
+  program.parse()
+}

package/src/lib/command-echo/command-echo.ts

@@ -60,8 +60,7 @@ const createCommandEcho = () => {
         .filter(Boolean)
         .join(' ')
 
-      logger.info(`📟 Equivalent command: \npnpm exec infra-kit ${commandName} ${formattedOptions}`)
-      logger.info('')
+      logger.info(`📟 Equivalent command: \npnpm exec infra-kit ${commandName} ${formattedOptions}\n`)
     },
 
     /**

package/src/lib/constants.ts

@@ -40,7 +40,7 @@ export const getSessionCacheDir = (): string => {
   const session = process.env[INFRA_KIT_SESSION_VAR]
 
   if (!session) {
-    throw new Error('INFRA_KIT_SESSION is not set. Run `source ~/.zshrc` or `infra-kit env-init` first.')
+    throw new Error('INFRA_KIT_SESSION is not set. Run `source ~/.zshrc` or `infra-kit init` first.')
   }
 
   return path.join(ENV_CACHE_DIR, session)

package/src/commands/env-init/index.ts

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