infra-kit 0.1.87 → 0.1.88

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.87",
+  "version": "0.1.88",
   "description": "infra-kit",
   "main": "dist/cli.js",
   "module": "dist/cli.js",

package/src/commands/doctor/doctor.ts

@@ -26,7 +26,7 @@ const checkCommand = async (
 }
 
 /**
- * Check installation and authentication status of gh and doppler CLIs
+ * Check installation and authentication status of gh, doppler, and aws CLIs
  */
 export const doctor = async (): Promise<ToolsExecutionResult> => {
   const checks: CheckResult[] = await Promise.all([
@@ -54,6 +54,19 @@ export const doctor = async (): Promise<ToolsExecutionResult> => {
       'Doppler CLI is authenticated',
       'Doppler CLI is not authenticated. Run: doppler login',
     ),
+    checkCommand(
+      'aws installed',
+      ['aws', '--version'],
+      'AWS CLI is installed',
+      'AWS CLI is not installed. Install from: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html',
+    ),
+    // INFO: no need now, util the user does not load the env variables, the aws cli is not authenticated
+    // checkCommand(
+    //   'aws authenticated',
+    //   ['aws', 'sts', 'get-caller-identity'],
+    //   'AWS CLI is authenticated',
+    //   'AWS CLI is not authenticated. Run: aws configure (or aws sso login)',
+    // ),
   ])
 
   logger.info('Doctor check results:\n')
@@ -87,7 +100,7 @@ export const doctor = async (): Promise<ToolsExecutionResult> => {
 // MCP Tool Registration
 export const doctorMcpTool = {
   name: 'doctor',
-  description: 'Check installation and authentication status of gh and doppler CLIs',
+  description: 'Check installation and authentication status of gh, doppler, and aws CLIs',
   inputSchema: {},
   outputSchema: {
     checks: z

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

@@ -80,7 +80,7 @@ export const envClear = async (): Promise<ToolsExecutionResult> => {
 export const envClearMcpTool = {
   name: 'env-clear',
   description:
-    'Generate a shell script that unsets every env var previously loaded by env-load for this session, plus the infra-kit session metadata vars. Does NOT mutate the calling process — returns the path to a script that must be sourced ("source <filePath>") for the unsets to take effect. The infra-kit shell wrapper auto-sources; direct MCP callers must handle sourcing themselves or surface filePath to the user. Errors if no env is currently loaded.',
+    'Generate a shell script that unsets every env var previously loaded by env-load for this session, plus the infra-kit session metadata vars. Does NOT mutate the calling process. When `infra-kit init` has installed the zsh shell integration, the user\'s terminal auto-sources the unset script on its next prompt (precmd hook) — so calling this via MCP will clear the vars in the shell that launched Claude Code automatically. Other callers must source "<filePath>" themselves or surface it to the user. Errors if no env is currently loaded.',
   inputSchema: {},
   outputSchema: {
     filePath: z.string().describe('Path to the file that must be sourced to apply'),

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

@@ -2,7 +2,7 @@ import { z } from 'zod'
 
 import { validateDopplerCliAndAuth } from 'src/integrations/doppler'
 import { getDopplerProject } from 'src/integrations/doppler/doppler-project'
-import { ENVs } from 'src/lib/constants'
+import { getInfraKitConfig } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
 import type { ToolsExecutionResult } from 'src/types'
 
@@ -13,17 +13,18 @@ export const envList = async (): Promise<ToolsExecutionResult> => {
   await validateDopplerCliAndAuth()
 
   const project = await getDopplerProject()
+  const { environments } = await getInfraKitConfig()
 
   logger.info(`Doppler project: ${project}\n`)
   logger.info('Available configs:')
 
-  for (const env of ENVs) {
+  for (const env of environments) {
     logger.info(`  - ${env}`)
   }
 
   const structuredContent = {
     project,
-    configs: ENVs,
+    configs: environments,
   }
 
   return {

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

@@ -10,12 +10,12 @@ import { getDopplerProject } from 'src/integrations/doppler/doppler-project'
 import { commandEcho } from 'src/lib/command-echo'
 import {
   ENV_LOAD_FILE,
-  ENVs,
   INFRA_KIT_ENV_CONFIG_VAR,
   INFRA_KIT_ENV_LOADED_AT_VAR,
   INFRA_KIT_ENV_PROJECT_VAR,
   getSessionCacheDir,
 } from 'src/lib/constants'
+import { getInfraKitConfig } from 'src/lib/infra-kit-config'
 import type { ToolsExecutionResult } from 'src/types'
 
 interface EnvLoadArgs {
@@ -37,11 +37,13 @@ export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult>
   if (config) {
     selectedConfig = config
   } else {
+    const { environments } = await getInfraKitConfig()
+
     commandEcho.setInteractive()
     selectedConfig = await select(
       {
         message: 'Select environment config',
-        choices: ENVs.map((env) => {
+        choices: environments.map((env) => {
           return { name: env, value: env }
         }),
       },

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

@@ -5,7 +5,7 @@ import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
-import { ENVs } from 'src/lib/constants'
+import { getInfraKitConfig } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
 import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
 import type { ReleaseType } from 'src/lib/release-utils'
@@ -56,6 +56,8 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs): Promise<
 
   commandEcho.addOption('--version', selectedVersion)
 
+  const { environments } = await getInfraKitConfig()
+
   let selectedEnv = ''
 
   if (env) {
@@ -65,7 +67,7 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs): Promise<
 
     selectedEnv = await select({
       message: '🧪 Select environment',
-      choices: ENVs.map((env) => {
+      choices: environments.map((env) => {
         return {
           name: env,
           value: env,
@@ -76,7 +78,7 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs): Promise<
 
   commandEcho.addOption('--env', selectedEnv)
 
-  if (!ENVs.includes(selectedEnv)) {
+  if (!environments.includes(selectedEnv)) {
     logger.error(`❌ Invalid environment: ${selectedEnv}. Exiting...`)
     process.exit(1)
   }

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

@@ -9,8 +9,8 @@ import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
-import { ENVs } from 'src/lib/constants'
 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 type { ReleaseType } from 'src/lib/release-utils'
@@ -63,6 +63,8 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
 
   commandEcho.addOption('--version', selectedVersion)
 
+  const { environments } = await getInfraKitConfig()
+
   let selectedEnv = ''
 
   if (env) {
@@ -72,7 +74,7 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
 
     selectedEnv = await select({
       message: '🧪 Select environment',
-      choices: ENVs.map((env) => {
+      choices: environments.map((env) => {
         return {
           name: env,
           value: env,
@@ -83,7 +85,7 @@ export const ghReleaseDeploySelected = async (args: GhReleaseDeploySelectedArgs)
 
   commandEcho.addOption('--env', selectedEnv)
 
-  if (!ENVs.includes(selectedEnv)) {
+  if (!environments.includes(selectedEnv)) {
     logger.error(`❌ Invalid environment: ${selectedEnv}. Exiting...`)
     process.exit(1)
   }

package/src/commands/init/init.ts

@@ -38,7 +38,14 @@ const isBlockLine = (line: string): boolean => {
     line.startsWith('env-status') ||
     line.startsWith('if ') ||
     line.startsWith('  export INFRA_KIT_SESSION') ||
-    line.startsWith('fi')
+    line.startsWith('export _INFRA_KIT_LAST_') ||
+    line.startsWith('export _INFRA_KIT_') ||
+    line.startsWith(': ${_INFRA_KIT_') ||
+    line.startsWith('fi') ||
+    line.startsWith('zmodload ') ||
+    line.startsWith('autoload ') ||
+    line.startsWith('add-zsh-hook ') ||
+    line.startsWith('_infra_kit_autoload')
   )
 }
 
@@ -93,14 +100,49 @@ const buildShellBlock = (): string => {
 
   return [
     MARKER_START,
+    'zmodload zsh/stat 2>/dev/null',
+    'zmodload zsh/datetime 2>/dev/null',
     // 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)',
     'fi',
-    `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; }`,
+    // eslint-disable-next-line no-template-curly-in-string
+    ': ${_INFRA_KIT_LAST_LOAD_MTIME:=0}',
+    // eslint-disable-next-line no-template-curly-in-string
+    ': ${_INFRA_KIT_LAST_CLEAR_MTIME:=0}',
+    // eslint-disable-next-line no-template-curly-in-string
+    ': ${_INFRA_KIT_SHELL_STARTED:=${EPOCHSECONDS:-0}}',
+    'export _INFRA_KIT_LAST_LOAD_MTIME _INFRA_KIT_LAST_CLEAR_MTIME _INFRA_KIT_SHELL_STARTED',
+    `env-load() { local f; f=$(${runCmd} env-load "$@") && source "$f" && _INFRA_KIT_LAST_LOAD_MTIME=$(zstat +mtime -- "$f" 2>/dev/null || echo 0) && ${runCmd} env-status; }`,
+    `env-clear() { local f; f=$(${runCmd} env-clear) && source "$f" && _INFRA_KIT_LAST_CLEAR_MTIME=$(zstat +mtime -- "$f" 2>/dev/null || echo 0) && ${runCmd} env-status; }`,
     `env-status() { ${runCmd} env-status; }`,
     `alias ik='${runCmd}'`,
+    '_infra_kit_autoload() {',
+    '  [[ -z "$INFRA_KIT_SESSION" ]] && return',
+    '  local dir="./node_modules/.cache/infra-kit/$INFRA_KIT_SESSION"',
+    '  local load_file="$dir/env-load.sh"',
+    '  local clear_file="$dir/env-clear.sh"',
+    '  local mtime',
+    '  if [[ -f "$load_file" ]]; then',
+    '    mtime=$(zstat +mtime -- "$load_file" 2>/dev/null || echo 0)',
+    '    if (( mtime > _INFRA_KIT_LAST_LOAD_MTIME && mtime >= _INFRA_KIT_SHELL_STARTED )); then',
+    '      source "$load_file"',
+    '      _INFRA_KIT_LAST_LOAD_MTIME=$mtime',
+    // eslint-disable-next-line no-template-curly-in-string
+    '      print -u2 "infra-kit: auto-loaded vars for ${INFRA_KIT_ENV_CONFIG:-?}"',
+    '    fi',
+    '  fi',
+    '  if [[ -f "$clear_file" ]]; then',
+    '    mtime=$(zstat +mtime -- "$clear_file" 2>/dev/null || echo 0)',
+    '    if (( mtime > _INFRA_KIT_LAST_CLEAR_MTIME && mtime >= _INFRA_KIT_SHELL_STARTED )); then',
+    '      source "$clear_file"',
+    '      _INFRA_KIT_LAST_CLEAR_MTIME=$mtime',
+    '      print -u2 "infra-kit: auto-cleared env"',
+    '    fi',
+    '  fi',
+    '}',
+    'autoload -Uz add-zsh-hook',
+    'add-zsh-hook precmd _infra_kit_autoload',
     MARKER_END,
   ].join('\n')
 }

package/src/integrations/doppler/doppler-project.ts

@@ -1,23 +1,10 @@
-import path from 'node:path'
-
-import { DOPPLER_PROJECT_MAP } from 'src/lib/constants'
-import { getProjectRoot } from 'src/lib/git-utils'
+import { getInfraKitConfig } from 'src/lib/infra-kit-config'
 
 /**
- * Resolve Doppler project name from the current working directory
+ * Resolve Doppler project name from infra-kit.yml at the project root
  */
 export const getDopplerProject = async (): Promise<string> => {
-  const projectRoot = await getProjectRoot()
-
-  const dirName = path.basename(projectRoot)
-  const dopplerProject = DOPPLER_PROJECT_MAP[dirName]
-
-  if (!dopplerProject) {
-    throw new Error(
-      `Could not determine Doppler project for directory "${dirName}". ` +
-        `Expected one of: ${Object.keys(DOPPLER_PROJECT_MAP).join(', ')}`,
-    )
-  }
+  const { dopplerProjectName } = await getInfraKitConfig()
 
-  return dopplerProject
+  return dopplerProjectName
 }

package/src/lib/constants.ts

@@ -2,16 +2,6 @@ import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
 
-/**
- * List of environments for the project deployment
- */
-export const ENVs = ['dev', 'arthur', 'renana', 'roman', 'eliran', 'oriana']
-
-export const DOPPLER_PROJECT_MAP: Record<string, string> = {
-  'hulyo-monorepo': 'hulyo',
-  'travelist-monorepo': 'travelist',
-}
-
 export const ENV_CACHE_DIR = './node_modules/.cache/infra-kit'
 export const ENV_LOAD_FILE = 'env-load.sh'
 export const ENV_CLEAR_FILE = 'env-clear.sh'

package/src/lib/infra-kit-config.ts

@@ -0,0 +1,49 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import yaml from 'yaml'
+import { z } from 'zod'
+
+import { getProjectRoot } from 'src/lib/git-utils'
+
+const INFRA_KIT_CONFIG_FILE = 'infra-kit.yml'
+
+const infraKitConfigSchema = z.object({
+  dopplerProjectName: z.string().min(1),
+  environments: z.array(z.string().min(1)).min(1),
+  taskManagerProvider: z.union([z.string(), z.literal(false)]),
+})
+
+export type InfraKitConfig = z.infer<typeof infraKitConfigSchema>
+
+let cached: Promise<InfraKitConfig> | null = null
+
+export const getInfraKitConfig = async (): Promise<InfraKitConfig> => {
+  if (!cached) {
+    cached = loadInfraKitConfig()
+  }
+
+  return cached
+}
+
+const loadInfraKitConfig = async (): Promise<InfraKitConfig> => {
+  const projectRoot = await getProjectRoot()
+
+  const configPath = path.join(projectRoot, INFRA_KIT_CONFIG_FILE)
+
+  let raw: string
+
+  try {
+    raw = await fs.readFile(configPath, 'utf-8')
+  } catch {
+    throw new Error(`infra-kit.yml not found at ${configPath}`)
+  }
+
+  const parsed = yaml.parse(raw)
+  const result = infraKitConfigSchema.safeParse(parsed)
+
+  if (!result.success) {
+    throw new Error(`Invalid infra-kit.yml at ${configPath}: ${result.error.message}`)
+  }
+
+  return result.data
+}