infra-kit 0.1.85 → 0.1.88

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.85",
+  "version": "0.1.88",
   "description": "infra-kit",
   "main": "dist/cli.js",
   "module": "dist/cli.js",
@@ -17,8 +17,8 @@
     "build": "pnpm run clean-artifacts && node ./scripts/build.js",
     "clean-artifacts": "rm -rf dist",
     "clean-cache": "rm -rf node_modules/.cache .eslintcache tsconfig.tsbuildinfo .turbo .swc",
-    "prettier-fix": "pnpm exec prettier **/* --write --no-error-on-unmatched-pattern --log-level warn --ignore-path ../../.prettierignore",
-    "prettier-check": "pnpm exec prettier **/* --check --no-error-on-unmatched-pattern --log-level warn --ignore-path ../../.prettierignore",
+    "prettier-fix": "pnpm exec prettier **/* --write --no-error-on-unmatched-pattern --log-level warn --ignore-path ../../../.prettierignore",
+    "prettier-check": "pnpm exec prettier **/* --check --no-error-on-unmatched-pattern --log-level warn --ignore-path ../../../.prettierignore",
     "eslint-check": "pnpm exec eslint --cache --quiet --report-unused-disable-directives ./src",
     "eslint-fix": "pnpm exec eslint --cache --quiet --report-unused-disable-directives ./src --fix",
     "ts-check": "tsc --noEmit",

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

@@ -60,6 +60,7 @@ export const envClear = async (): Promise<ToolsExecutionResult> => {
   fs.unlinkSync(envLoadPath)
 
   const structuredContent = {
+    filePath: clearFilePath,
     variableCount: varNames.length,
     unsetStatements: unsetLines,
   }
@@ -79,7 +80,7 @@ export const envClear = async (): Promise<ToolsExecutionResult> => {
 export const envClearMcpTool = {
   name: 'env-clear',
   description:
-    'Clear loaded env vars. Returns a file path that must be sourced (source <path>) to apply. The env-clear shell alias does this automatically.',
+    '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 {
@@ -40,7 +41,8 @@ export const envList = async (): Promise<ToolsExecutionResult> => {
 // MCP Tool Registration
 export const envListMcpTool = {
   name: 'env-list',
-  description: 'List available Doppler configs for the detected project',
+  description:
+    'List the environments the project is configured to support. Returns a static list defined in infra-kit constants (not a live fetch from Doppler) plus the Doppler project name auto-detected from the current directory. Read-only.',
   inputSchema: {},
   outputSchema: {
     project: z.string().describe('Detected Doppler project name'),

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 }
         }),
       },
@@ -88,6 +90,7 @@ export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult>
   }).length
 
   const structuredContent = {
+    filePath: envFilePath,
     variableCount: varCount,
     project,
     config: selectedConfig,
@@ -108,9 +111,11 @@ export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult>
 export const envLoadMcpTool = {
   name: 'env-load',
   description:
-    'Load Doppler env vars for a config. Returns a file path that must be sourced (source <path>) to apply variables. The env-load shell alias does this automatically.',
+    'Download the env vars for a Doppler config and write them to a temporary shell script. Does NOT mutate the calling process — returns the path to a script that must be sourced ("source <filePath>") for the vars to take effect. The infra-kit shell wrapper auto-sources; direct MCP callers must handle sourcing themselves or surface filePath to the user. "config" is required when invoked via MCP (the CLI interactive picker is unreachable without a TTY).',
   inputSchema: {
-    config: z.string().describe('Environment config name to load (e.g. dev, arthur, renana)'),
+    config: z
+      .string()
+      .describe('Doppler config / environment name to load (e.g. "dev", "arthur", "renana"). Required for MCP calls.'),
   },
   outputSchema: {
     filePath: z.string().describe('Path to the file that must be sourced to apply variables'),

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

@@ -78,7 +78,8 @@ export const envStatus = async (): Promise<ToolsExecutionResult> => {
 // MCP Tool Registration
 export const envStatusMcpTool = {
   name: 'env-status',
-  description: 'Show Doppler authentication status and detected project info',
+  description:
+    'Report which Doppler project/config is currently loaded in the terminal session, when it was loaded, and how many variables are cached. Read-only — use env-load / env-clear to change the terminal session.',
   inputSchema: {},
   outputSchema: {
     sessionId: z.string().describe('Current terminal session ID'),

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

@@ -186,9 +186,15 @@ const mergeDev = async (branch: string): Promise<boolean> => {
 // MCP Tool Registration
 export const ghMergeDevMcpTool = {
   name: 'gh-merge-dev',
-  description: 'Merge dev branch into selected release branches',
+  description:
+    'Merge origin/dev into every open regular (non-hotfix) release branch and push the result. Mutates local git state and the remote release branches. When invoked via MCP, pass all=true — the branch picker is unreachable without a TTY, and the confirmation prompt is auto-skipped for MCP calls, so the caller is responsible for gating. Irreversible once pushed.',
   inputSchema: {
-    all: z.boolean().describe('Merge dev into all release branches without prompting'),
+    all: z
+      .boolean()
+      .optional()
+      .describe(
+        'Target every open regular release branch. Must be true for MCP calls (the interactive picker is unavailable without a TTY).',
+      ),
   },
   outputSchema: {
     successfulMerges: z.number().describe('Number of successful merges'),

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

@@ -162,9 +162,10 @@ export const ghReleaseDeliver = async (args: GhReleaseDeliverArgs): Promise<Tool
 // MCP Tool Registration
 export const ghReleaseDeliverMcpTool = {
   name: 'gh-release-deliver',
-  description: 'Deliver a release branch to production',
+  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. 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('Version to deliver to production (e.g., "1.2.5")'),
+    version: z.string().describe('Release version to deliver to production (e.g., "1.2.5"). 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

@@ -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)
   }
@@ -128,11 +130,20 @@ export const ghReleaseDeployAll = async (args: GhReleaseDeployAllArgs): Promise<
 // MCP Tool Registration
 export const ghReleaseDeployAllMcpTool = {
   name: 'gh-release-deploy-all',
-  description: 'Deploy a release branch to a specified environment',
+  description:
+    'Dispatch the deploy-all.yml GitHub Actions workflow to deploy every service from a release branch to the given environment. Fire-and-forget — returns once GitHub accepts the workflow_dispatch, NOT when the deployment finishes; watch the workflow run for completion status. Use gh-release-deploy-selected for a subset of services. Pass version="dev" to deploy from the dev branch instead of a release branch. Both "version" and "env" are required when invoked via MCP (interactive pickers are unavailable without a TTY).',
   inputSchema: {
-    version: z.string().describe('Version to deploy (e.g., "1.2.5")'),
-    env: z.string().describe('Environment to deploy to (e.g., "dev", "renana", "oriana")'),
-    skipTerraform: z.boolean().optional().describe('Skip terraform deployment step'),
+    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.',
+      ),
+    env: z
+      .string()
+      .describe(
+        'Target environment name — must match an env configured for the project (e.g. "dev", "renana", "oriana"). Required for MCP calls.',
+      ),
+    skipTerraform: z.boolean().optional().describe('Skip the terraform deployment stage.'),
   },
   outputSchema: {
     releaseBranch: z.string().describe('The release branch that was deployed'),

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)
   }
@@ -211,12 +213,25 @@ const parseServicesFromWorkflow = async (): Promise<string[]> => {
 // MCP Tool Registration
 export const ghReleaseDeploySelectedMcpTool = {
   name: 'gh-release-deploy-selected',
-  description: 'Deploy selected services from a release branch to a specified environment',
+  description:
+    'Dispatch the deploy-selected-services.yml GitHub Actions workflow to deploy a chosen subset of services from a release branch to the given environment. Fire-and-forget — returns once GitHub accepts the workflow_dispatch, NOT when the deployment finishes; watch the workflow run for completion status. Service names are validated against the boolean inputs declared in the workflow. Use gh-release-deploy-all for every service. "version", "env", and "services" are all required when invoked via MCP (interactive pickers are unavailable without a TTY).',
   inputSchema: {
-    version: z.string().describe('Version to deploy (e.g., "1.2.5")'),
-    env: z.string().describe('Environment to deploy to (e.g., "dev", "renana", "oriana")'),
-    services: z.array(z.string()).describe('List of services to deploy (e.g., ["client-be", "client-fe"])'),
-    skipTerraform: z.boolean().optional().describe('Skip terraform deployment step'),
+    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.',
+      ),
+    env: z
+      .string()
+      .describe(
+        'Target environment name — must match an env configured for the project (e.g. "dev", "renana", "oriana"). Required for MCP calls.',
+      ),
+    services: z
+      .array(z.string())
+      .describe(
+        'Service names to deploy. Each must match a boolean input declared in .github/workflows/deploy-selected-services.yml (e.g. "client-be", "client-fe"). Required for MCP calls.',
+      ),
+    skipTerraform: z.boolean().optional().describe('Skip the terraform deployment stage.'),
   },
   outputSchema: {
     releaseBranch: z.string().describe('The release branch that was deployed'),

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

@@ -65,7 +65,8 @@ export const ghReleaseList = async (): Promise<ToolsExecutionResult> => {
 // MCP Tool Registration
 export const ghReleaseListMcpTool = {
   name: 'gh-release-list',
-  description: 'List all open release branches',
+  description:
+    'List every open release PR with its version, type (regular / hotfix), and associated Jira fix-version description. Read-only; sourced from GitHub and Jira.',
   inputSchema: {},
   outputSchema: {
     releases: z

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/commands/release-create/release-create.ts

@@ -160,9 +160,10 @@ export const releaseCreate = async (args: ReleaseCreateArgs): Promise<ToolsExecu
 // MCP Tool Registration
 export const releaseCreateMcpTool = {
   name: 'release-create',
-  description: 'Create a single release branch for specified version with Jira version creation',
+  description:
+    'Create a new release: cuts the release branch off the appropriate base (dev for regular releases, main for hotfixes), opens a GitHub release PR, creates the matching Jira fix version, and optionally checks out to the new branch. Confirmation is auto-skipped for MCP calls, so the caller is responsible for gating. "version" is required when invoked via MCP (the interactive input prompt is unreachable without a TTY); "type" / "description" / "checkout" default to regular / empty / true when omitted.',
   inputSchema: {
-    version: z.string().describe('Version to create (e.g., "1.2.5")'),
+    version: z.string().describe('Version to create (e.g., "1.2.5"). Required for MCP calls.'),
     description: z.string().optional().describe('Optional description for the Jira version'),
     type: z
       .enum(['regular', 'hotfix'])

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

@@ -158,9 +158,12 @@ export const releaseCreateBatch = async (args: ReleaseCreateBatchArgs): Promise<
 // MCP Tool Registration
 export const releaseCreateBatchMcpTool = {
   name: 'release-create-batch',
-  description: 'Create multiple release branches for specified versions with Jira version creation (batch operation)',
+  description:
+    'Create several releases in one pass: for each comma-separated version in "versions", cuts the release branch off the appropriate base (dev for regular releases, main for hotfixes), opens a GitHub PR, and creates the Jira fix version. Continues on per-version failure and reports which versions succeeded and which failed. Confirmation is auto-skipped for MCP calls, so the caller is responsible for gating. "versions" is required when invoked via MCP (the interactive input prompt is unreachable without a TTY). Use release-create for a single version with optional checkout.',
   inputSchema: {
-    versions: z.string().describe('Comma-separated list of versions to create (e.g., "1.2.5, 1.2.6")'),
+    versions: z
+      .string()
+      .describe('Comma-separated list of versions to create (e.g., "1.2.5, 1.2.6"). Required for MCP calls.'),
     type: z
       .enum(['regular', 'hotfix'])
       .optional()

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

@@ -268,12 +268,33 @@ const logResults = (created: string[]): void => {
 // MCP Tool Registration
 export const worktreesAddMcpTool = {
   name: 'worktrees-add',
-  description: 'Create git worktrees for selected release branches',
+  description:
+    'Create local git worktrees for release branches under the worktrees directory and run "pnpm install" in each. Mutates the local filesystem. When invoked via MCP, pass either "versions" (comma-separated) or all=true — the branch picker and "open in Cursor / GitHub Desktop" follow-up prompts are unreachable without a TTY, and the CLI confirmation is auto-skipped for MCP calls.',
   inputSchema: {
-    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'),
+    all: z
+      .boolean()
+      .optional()
+      .describe(
+        'Add worktrees for every open release branch. Either "all" or "versions" must be provided for MCP calls (the interactive picker is unavailable without a TTY). Ignored if "versions" is provided.',
+      ),
+    versions: z
+      .string()
+      .optional()
+      .describe(
+        'Comma-separated release versions to target (e.g. "1.2.5, 1.2.6"). Either "versions" or all=true must be provided for MCP calls. Overrides "all" when set.',
+      ),
+    cursor: z
+      .boolean()
+      .optional()
+      .describe(
+        'Open each created worktree in Cursor. Defaults to false in MCP mode (the follow-up prompt is not shown).',
+      ),
+    githubDesktop: z
+      .boolean()
+      .optional()
+      .describe(
+        'Open each created worktree in GitHub Desktop. Defaults to false in MCP mode (the follow-up prompt is not shown).',
+      ),
   },
   outputSchema: {
     createdWorktrees: z.array(z.string()).describe('List of created git worktree branches'),

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

@@ -83,7 +83,8 @@ export const worktreesList = async (): Promise<ToolsExecutionResult> => {
 // MCP Tool Registration
 export const worktreesListMcpTool = {
   name: 'worktrees-list',
-  description: 'List all git worktrees with detailed information',
+  description:
+    'List existing release-branch worktrees with version, release type (regular / hotfix), and Jira fix-version description. Read-only.',
   inputSchema: {},
   outputSchema: {
     worktrees: z

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

@@ -188,10 +188,21 @@ const logResults = (removed: string[]): void => {
 // MCP Tool Registration
 export const worktreesRemoveMcpTool = {
   name: 'worktrees-remove',
-  description: 'Remove selected worktrees',
+  description:
+    'Remove local git worktrees for release branches. When everything is removed, also runs "git worktree prune" and deletes the worktrees directory. When invoked via MCP, pass either "versions" (comma-separated) or all=true — the branch picker is unreachable without a TTY, and the CLI confirmation is auto-skipped for MCP calls, so the caller is responsible for gating.',
   inputSchema: {
-    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'),
+    all: z
+      .boolean()
+      .optional()
+      .describe(
+        'Remove every existing worktree. Either "all" or "versions" must be provided for MCP calls (the interactive picker is unavailable without a TTY). Ignored if "versions" is provided.',
+      ),
+    versions: z
+      .string()
+      .optional()
+      .describe(
+        'Comma-separated release versions to target (e.g. "1.2.5, 1.2.6"). Either "versions" or all=true must be provided for MCP calls. Overrides "all" when set.',
+      ),
   },
   outputSchema: {
     removedWorktrees: z.array(z.string()).describe('List of removed git worktree branches'),

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

@@ -145,7 +145,8 @@ const logResults = (removed: string[]): void => {
 // MCP Tool Registration
 export const worktreesSyncMcpTool = {
   name: 'worktrees-sync',
-  description: 'Synchronize worktrees with active release branches',
+  description:
+    'Remove worktrees whose release PR is no longer open (stale cleanup). Only removes — never creates; use worktrees-add to create worktrees for new releases. The CLI confirmation is auto-skipped for MCP calls, so the caller is responsible for gating.',
   inputSchema: {},
   outputSchema: {
     removedWorktrees: z.array(z.string()).describe('List of removed worktree branches'),

package/src/entry/cli.ts

@@ -11,7 +11,6 @@ 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'
 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'
@@ -81,22 +80,6 @@ program
     await ghReleaseDeployAll({ version: options.version, env: options.env, skipTerraform: options.skipTerraform })
   })
 
-program
-  .command('release-deploy-service')
-  .description('Deploy specific service in release branch to any environment')
-  .option('-v, --version <version>', 'Specify the version to deploy, e.g. 1.2.5')
-  .option('-e, --env <env>', 'Specify the environment to deploy to, e.g. dev')
-  .option('-s, --service <service>', 'Specify the service to deploy, e.g. client-be')
-  .option('--skip-terraform', 'Skip terraform deployment step')
-  .action(async (options) => {
-    await ghReleaseDeployService({
-      version: options.version,
-      env: options.env,
-      service: options.service,
-      skipTerraform: options.skipTerraform,
-    })
-  })
-
 program
   .command('release-deploy-selected')
   .description('Deploy selected services from release branch to any environment')
@@ -217,7 +200,6 @@ if (process.argv.length <= 2) {
     'release-create',
     'release-create-batch',
     'release-deploy-all',
-    'release-deploy-service',
     'release-deploy-selected',
     'release-deliver',
   ]

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'