infra-kit 0.1.98 → 0.1.100

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.98",
+  "version": "0.1.100",
   "description": "infra-kit",
   "main": "dist/cli.js",
   "module": "dist/cli.js",
@@ -17,27 +17,27 @@
     "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 silent --ignore-path ../../../.prettierignore",
+    "prettier-check": "pnpm exec prettier **/* --check --no-error-on-unmatched-pattern --log-level silent --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",
-    "test": "pnpm exec vitest run --reporter=dot",
-    "test-watch": "pnpm exec vitest --watch",
-    "test-ui": "pnpm exec vitest --ui",
-    "test-report": "pnpm exec vitest run --coverage",
+    "test": "pnpm exec vitest run --reporter=minimal",
+    "test-watch": "pnpm exec vitest --watch --silent passed-only",
+    "test-ui": "pnpm exec vitest --ui --silent passed-only",
+    "test-report": "pnpm exec vitest run --coverage --silent passed-only",
     "qa": "pnpm run prettier-check && pnpm run eslint-check && pnpm run ts-check && pnpm run test && echo ✅ Success",
     "fix": "pnpm run prettier-fix && pnpm run eslint-fix && pnpm run qa"
   },
   "dependencies": {
-    "@inquirer/checkbox": "^5.1.4",
-    "@inquirer/confirm": "^6.0.12",
-    "@inquirer/select": "^5.1.4",
+    "@inquirer/checkbox": "catalog:",
+    "@inquirer/confirm": "catalog:",
+    "@inquirer/select": "catalog:",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "commander": "^14.0.3",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
-    "yaml": "^2.8.4",
+    "yaml": "catalog:",
     "zod": "^3.25.76",
     "zx": "^8.8.5"
   },

package/src/commands/config/config.ts

@@ -105,7 +105,7 @@ export const configEdit = async (): Promise<ToolsExecutionResult> => {
   await fs.mkdir(path.dirname(paths.userProject), { recursive: true })
 
   if (!(await fileExists(paths.userProject))) {
-    const stub = `# infra-kit user override for ${paths.projectName}\n# This file is shallow-merged on top of project infra-kit.yml.\n# Top-level keys (envManagement, ide, taskManager, environments) replace wholesale.\n`
+    const stub = `# infra-kit user override for ${paths.projectName} — ~/.infra-kit/projects/${paths.projectName}/infra-kit.yml\n#\n# Layer 3 (highest precedence) of the config merge chain. Shallow-merged on\n# top of <repo>/infra-kit.yml and ~/.infra-kit/config.yml — top-level keys\n# (environments, envManagement, ide, taskManager, worktrees) replace wholesale.\n`
 
     await fs.writeFile(paths.userProject, stub, 'utf-8')
   }

package/src/commands/doctor/doctor.ts

@@ -8,7 +8,7 @@ import { MARKER_END, MARKER_START, buildShellBlock } from 'src/commands/init/ini
 import { getProjectRoot } from 'src/lib/git-utils/git-utils'
 import { getInfraKitConfig, getInfraKitConfigPaths, resetInfraKitConfigCache } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
-import type { ToolsExecutionResult } from 'src/types'
+import { defineMcpTool, textContent } from 'src/types'
 
 interface CheckResult {
   name: string
@@ -148,10 +148,58 @@ const checkUserOverridePath = async (): Promise<CheckResult> => {
   }
 }
 
+const RTK_REQUIRED_INDEXES = [1, 2, 3, 5, 7] as const
+
+const checkRtkConfigured = async (): Promise<CheckResult> => {
+  const name = 'rtk configured'
+
+  try {
+    const result = await $`rtk init --show`
+    const statusLines = result.stdout
+      .split('\n')
+      .map((l) => {
+        return l.trim()
+      })
+      .filter((l) => {
+        return l.startsWith('[ok]') || l.startsWith('[--]')
+      })
+
+    const failed: number[] = []
+
+    for (const idx of RTK_REQUIRED_INDEXES) {
+      const line = statusLines[idx - 1]
+
+      if (!line || !line.startsWith('[ok]')) {
+        failed.push(idx)
+      }
+    }
+
+    if (failed.length > 0) {
+      return {
+        name,
+        status: 'fail',
+        message: `rtk setup incomplete (items ${failed.join(', ')} not [ok]). Run: rtk init -g --auto-patch`,
+      }
+    }
+
+    return {
+      name,
+      status: 'pass',
+      message: 'rtk hook, RTK.md, global CLAUDE.md, settings.json, and Cursor hook are configured',
+    }
+  } catch (err) {
+    return {
+      name,
+      status: 'fail',
+      message: `Failed to run 'rtk init --show': ${(err as Error).message}`,
+    }
+  }
+}
+
 /**
- * Check installation and authentication status of gh, doppler, and aws CLIs
+ * Check installation and authentication status of gh, doppler, aws, and rtk CLIs
  */
-export const doctor = async (): Promise<ToolsExecutionResult> => {
+export const doctor = async () => {
   const checks: CheckResult[] = await Promise.all([
     checkCommand(
       'gh installed',
@@ -190,6 +238,13 @@ export const doctor = async (): Promise<ToolsExecutionResult> => {
     //   'AWS CLI is authenticated',
     //   'AWS CLI is not authenticated. Run: aws configure (or aws sso login)',
     // ),
+    checkCommand(
+      'rtk installed',
+      ['rtk', '--version'],
+      'RTK is installed',
+      'RTK is not installed. Install from: https://github.com/rtk-ai/rtk',
+    ),
+    checkRtkConfigured(),
     Promise.resolve(checkZshrcInitialized()),
     checkPnpmWorkspaceVirtualStore(),
     checkInfraKitConfigValid(),
@@ -214,20 +269,15 @@ export const doctor = async (): Promise<ToolsExecutionResult> => {
   }
 
   return {
-    content: [
-      {
-        type: 'text',
-        text: JSON.stringify(structuredContent, null, 2),
-      },
-    ],
+    content: textContent(JSON.stringify(structuredContent, null, 2)),
     structuredContent,
   }
 }
 
 // MCP Tool Registration
-export const doctorMcpTool = {
+export const doctorMcpTool = defineMcpTool({
   name: 'doctor',
-  description: 'Check installation and authentication status of gh, doppler, and aws CLIs',
+  description: 'Check installation and authentication status of gh, doppler, aws, and rtk CLIs',
   inputSchema: {},
   outputSchema: {
     checks: z
@@ -242,4 +292,4 @@ export const doctorMcpTool = {
     allPassed: z.boolean().describe('Whether all checks passed'),
   },
   handler: doctor,
-}
+})

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

@@ -13,14 +13,14 @@ import {
   getSessionCacheDir,
   parseVarNamesFromEnvFile,
 } from 'src/lib/constants'
-import type { ToolsExecutionResult } from 'src/types'
+import { defineMcpTool, textContent } from 'src/types'
 
 /**
  * Clear loaded env vars. Prints a file path to stdout that must be sourced to apply.
  * The env-clear shell alias does this automatically. Throws when no env is loaded
  * so CLI callers exit non-zero and MCP callers receive a structured tool error.
  */
-export const envClear = async (): Promise<ToolsExecutionResult> => {
+export const envClear = async () => {
   const cacheDir = getSessionCacheDir()
   const envLoadPath = path.join(cacheDir, ENV_LOAD_FILE)
 
@@ -58,18 +58,13 @@ export const envClear = async (): Promise<ToolsExecutionResult> => {
   }
 
   return {
-    content: [
-      {
-        type: 'text',
-        text: JSON.stringify(structuredContent, null, 2),
-      },
-    ],
+    content: textContent(JSON.stringify(structuredContent, null, 2)),
     structuredContent,
   }
 }
 
 // MCP Tool Registration
-export const envClearMcpTool = {
+export const envClearMcpTool = defineMcpTool({
   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. 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.',
@@ -80,4 +75,4 @@ export const envClearMcpTool = {
     unsetStatements: z.array(z.string()).describe('Unset statements generated'),
   },
   handler: envClear,
-}
+})

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

@@ -3,7 +3,7 @@ import { z } from 'zod/v4'
 import { getDopplerProject } from 'src/integrations/doppler/doppler-project'
 import { getInfraKitConfig } from 'src/lib/infra-kit-config'
 import { logger } from 'src/lib/logger'
-import type { ToolsExecutionResult } from 'src/types'
+import { defineMcpTool, textContent } from 'src/types'
 
 /**
  * List available Doppler configs for the detected project.
@@ -12,7 +12,7 @@ import type { ToolsExecutionResult } from 'src/types'
  * do not run validateDopplerCliAndAuth here — users listing envs often do so
  * before `doppler login`, and a spurious auth error would be misleading.
  */
-export const envList = async (): Promise<ToolsExecutionResult> => {
+export const envList = async () => {
   const project = await getDopplerProject()
   const { environments } = await getInfraKitConfig()
 
@@ -29,18 +29,13 @@ export const envList = async (): Promise<ToolsExecutionResult> => {
   }
 
   return {
-    content: [
-      {
-        type: 'text',
-        text: JSON.stringify(structuredContent, null, 2),
-      },
-    ],
+    content: textContent(JSON.stringify(structuredContent, null, 2)),
     structuredContent,
   }
 }
 
 // MCP Tool Registration
-export const envListMcpTool = {
+export const envListMcpTool = defineMcpTool({
   name: 'env-list',
   description:
     'List the environments the project is configured to support. Returns the `environments` list declared in infra-kit.yml at the project root (not a live fetch from Doppler) plus the Doppler project name resolved from the same file. Read-only.',
@@ -50,4 +45,4 @@ export const envListMcpTool = {
     configs: z.array(z.string()).describe('Available environment configs'),
   },
   handler: envList,
-}
+})

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

@@ -19,7 +19,7 @@ import {
   getSessionCacheDir,
 } from 'src/lib/constants'
 import { getInfraKitConfig } from 'src/lib/infra-kit-config'
-import type { ToolsExecutionResult } from 'src/types'
+import { defineMcpTool, textContent } from 'src/types'
 
 interface EnvLoadArgs {
   config?: string
@@ -28,7 +28,7 @@ interface EnvLoadArgs {
 /**
  * Load environment variables from Doppler for the given config
  */
-export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult> => {
+export const envLoad = async (args: EnvLoadArgs) => {
   await validateDopplerCliAndAuth()
 
   const { config } = args
@@ -98,12 +98,7 @@ export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult>
   }
 
   return {
-    content: [
-      {
-        type: 'text',
-        text: JSON.stringify(structuredContent, null, 2),
-      },
-    ],
+    content: textContent(JSON.stringify(structuredContent, null, 2)),
     structuredContent,
   }
 }
@@ -189,7 +184,7 @@ export const assertValidEnvContent = (content: string): void => {
 }
 
 // MCP Tool Registration
-export const envLoadMcpTool = {
+export const envLoadMcpTool = defineMcpTool({
   name: 'env-load',
   description:
     '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).',
@@ -205,4 +200,4 @@ export const envLoadMcpTool = {
     config: z.string().describe('Doppler config name'),
   },
   handler: envLoad,
-}
+})

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

@@ -13,12 +13,12 @@ import {
   parseVarNamesFromEnvFile,
 } from 'src/lib/constants'
 import { logger } from 'src/lib/logger'
-import type { ToolsExecutionResult } from 'src/types'
+import { defineMcpTool, textContent } from 'src/types'
 
 /**
  * Show Doppler authentication status and detected project info
  */
-export const envStatus = async (): Promise<ToolsExecutionResult> => {
+export const envStatus = async () => {
   await validateDopplerCliAndAuth()
 
   logger.info('Environment session status:')
@@ -73,18 +73,13 @@ export const envStatus = async (): Promise<ToolsExecutionResult> => {
   }
 
   return {
-    content: [
-      {
-        type: 'text',
-        text: JSON.stringify(structuredContent, null, 2),
-      },
-    ],
+    content: textContent(JSON.stringify(structuredContent, null, 2)),
     structuredContent,
   }
 }
 
 // MCP Tool Registration
-export const envStatusMcpTool = {
+export const envStatusMcpTool = defineMcpTool({
   name: 'env-status',
   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.',
@@ -98,4 +93,4 @@ export const envStatusMcpTool = {
     sessionLoadedAt: z.string().nullable().describe('ISO 8601 timestamp of when the env was loaded'),
   },
   handler: envStatus,
-}
+})

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

@@ -7,18 +7,20 @@ import { $ } from 'zx'
 
 import { getReleasePRsWithInfo } from 'src/integrations/gh'
 import { commandEcho } from 'src/lib/command-echo'
+import { OperationError } from 'src/lib/errors/operation-error'
 import { logger } from 'src/lib/logger'
 import { detectReleaseType, formatBranchChoices, getJiraDescriptions } from 'src/lib/release-utils'
-import type { RequiredConfirmedOptionArg, ToolsExecutionResult } from 'src/types'
+import { defineMcpTool, textContent } from 'src/types'
+import type { RequiredConfirmedOptionArg } from 'src/types'
 
 interface GhMergeDevArgs extends RequiredConfirmedOptionArg {
-  all: boolean
+  all?: boolean
 }
 
 /**
  * Merge dev into every release branch
  */
-export const ghMergeDev = async (args: GhMergeDevArgs): Promise<ToolsExecutionResult> => {
+export const ghMergeDev = async (args: GhMergeDevArgs) => {
   const { all, confirmedCommand } = args
 
   commandEcho.start('merge-dev')
@@ -39,12 +41,9 @@ export const ghMergeDev = async (args: GhMergeDevArgs): Promise<ToolsExecutionRe
     commandEcho.print()
 
     return {
-      content: [
-        {
-          type: 'text',
-          text: JSON.stringify({ successfulMerges: 0, failedMerges: 0, failedBranches: [], totalBranches: 0 }, null, 2),
-        },
-      ],
+      content: textContent(
+        JSON.stringify({ successfulMerges: 0, failedMerges: 0, failedBranches: [], totalBranches: 0 }, null, 2),
+      ),
       structuredContent: { successfulMerges: 0, failedMerges: 0, failedBranches: [], totalBranches: 0 },
     }
   }
@@ -149,12 +148,7 @@ export const ghMergeDev = async (args: GhMergeDevArgs): Promise<ToolsExecutionRe
   }
 
   return {
-    content: [
-      {
-        type: 'text',
-        text: JSON.stringify(structuredContent, null, 2),
-      },
-    ],
+    content: textContent(JSON.stringify(structuredContent, null, 2)),
     structuredContent,
   }
 }
@@ -175,7 +169,12 @@ const mergeDev = async (branch: string): Promise<boolean> => {
 
     return true
   } catch (error: unknown) {
-    logger.error({ error, branch }, `Error merging dev into ${branch}`)
+    const err = new OperationError(error, {
+      operation: `merge dev into ${branch}`,
+      remediation: "resolve conflicts manually or rerun after 'git fetch origin'",
+    })
+
+    logger.error({ error, branch, msg: err.message })
 
     await $`git reset --merge HEAD~1`
 
@@ -184,7 +183,7 @@ const mergeDev = async (branch: string): Promise<boolean> => {
 }
 
 // MCP Tool Registration
-export const ghMergeDevMcpTool = {
+export const ghMergeDevMcpTool = defineMcpTool({
   name: 'gh-merge-dev',
   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.',
@@ -203,4 +202,4 @@ export const ghMergeDevMcpTool = {
     totalBranches: z.number().describe('Total number of branches processed'),
   },
   handler: ghMergeDev,
-}
+})