infra-kit 0.1.75 → 0.1.76

package/package.json

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

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

@@ -6,17 +6,17 @@ import { z } from 'zod'
 import {
   ENV_CLEAR_FILE,
   ENV_LOAD_FILE,
-  getSessionCacheDir,
   INFRA_KIT_ENV_CONFIG_VAR,
   INFRA_KIT_ENV_LOADED_AT_VAR,
   INFRA_KIT_ENV_PROJECT_VAR,
+  getSessionCacheDir,
   parseVarNamesFromEnvFile,
 } from 'src/lib/constants'
 import { logger } from 'src/lib/logger'
 import type { ToolsExecutionResult } from 'src/types'
 
 /**
- * Clear previously loaded environment variables. Usage: env-clear (after running eval "$(infra-kit env-init)" in shell)
+ * Clear loaded env vars. Prints a file path to stdout that must be sourced to apply. The env-clear shell alias does this automatically.
  */
 export const envClear = async (): Promise<ToolsExecutionResult> => {
   const cacheDir = getSessionCacheDir()
@@ -59,8 +59,6 @@ export const envClear = async (): Promise<ToolsExecutionResult> => {
   // Remove env load file so env-clear can detect "no env loaded" next time
   fs.unlinkSync(envLoadPath)
 
-  logger.info(`Cleared ${varNames.length} environment variables`)
-
   const structuredContent = {
     variableCount: varNames.length,
     unsetStatements: unsetLines,
@@ -81,9 +79,10 @@ export const envClear = async (): Promise<ToolsExecutionResult> => {
 export const envClearMcpTool = {
   name: 'env-clear',
   description:
-    'Clear previously loaded environment variables. Usage: env-clear (after running eval "$(infra-kit env-init)" in shell)',
+    'Clear loaded env vars. Returns a file path that must be sourced (source <path>) to apply. The env-clear shell alias does this automatically.',
   inputSchema: {},
   outputSchema: {
+    filePath: z.string().describe('Path to the file that must be sourced to apply'),
     variableCount: z.number().describe('Number of variables cleared'),
     unsetStatements: z.array(z.string()).describe('Unset statements generated'),
   },

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

@@ -1,7 +1,6 @@
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
-import process from 'node:process'
 
 import { logger } from 'src/lib/logger'
 
@@ -12,15 +11,7 @@ const MARKER_COMMENT = '# infra-kit shell functions'
  */
 export const envInit = async (): Promise<void> => {
   const zshrcPath = path.join(os.homedir(), '.zshrc')
-  const binPath = getBinPath()
-
-  if (!fs.existsSync(binPath)) {
-    logger.error(`Could not find infra-kit binary at ${binPath}`)
-
-    return
-  }
-
-  const shellBlock = buildShellBlock(binPath)
+  const shellBlock = buildShellBlock()
 
   if (fs.existsSync(zshrcPath)) {
     const content = fs.readFileSync(zshrcPath, 'utf-8')
@@ -34,11 +25,6 @@ export const envInit = async (): Promise<void> => {
   logger.info('Run `source ~/.zshrc` or open a new terminal to activate.')
 }
 
-const getBinPath = (): string => {
-  // resolve the absolute path to the infra-kit binary
-  return path.resolve(path.join(path.dirname(process.argv[1]!), 'cli.js'))
-}
-
 const isBlockLine = (line: string): boolean => {
   return (
     line.startsWith('#') ||
@@ -69,15 +55,15 @@ const removeExistingBlock = (content: string): string => {
   return before + (remaining ? `\n${remaining}` : '')
 }
 
-const buildShellBlock = (binPath: string): string => {
-  const runCmd = `node ${binPath}`
+const buildShellBlock = (): string => {
+  const runCmd = 'pnpm dlx infra-kit'
 
   return [
     MARKER_COMMENT,
     '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"; }`,
-    `env-clear() { local f; f=$(${runCmd} env-clear) && source "$f"; }`,
+    `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; }`,
   ].join('\n')
 }

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

@@ -16,12 +16,10 @@ import {
   INFRA_KIT_ENV_PROJECT_VAR,
   getSessionCacheDir,
 } from 'src/lib/constants'
-import { logger } from 'src/lib/logger'
 import type { ToolsExecutionResult } from 'src/types'
 
 interface EnvLoadArgs {
   config?: string
-  quiet?: boolean
 }
 
 /**
@@ -30,7 +28,7 @@ interface EnvLoadArgs {
 export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult> => {
   await validateDopplerCliAndAuth()
 
-  const { config, quiet } = args
+  const { config } = args
 
   commandEcho.start('env-load')
 
@@ -40,12 +38,17 @@ export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult>
     selectedConfig = config
   } else {
     commandEcho.setInteractive()
-    selectedConfig = await select({
-      message: 'Select environment config',
-      choices: ENVs.map((env) => {
-        return { name: env, value: env }
-      }),
-    })
+    selectedConfig = await select(
+      {
+        message: 'Select environment config',
+        choices: ENVs.map((env) => {
+          return { name: env, value: env }
+        }),
+      },
+      // Render to stderr so the prompt is visible when stdout is captured via $() in the shell function.
+      // Only env-load and env-clear use the $() stdout-capture shell pattern.
+      { output: process.stderr },
+    )
   }
 
   commandEcho.addOption('--config', selectedConfig)
@@ -80,11 +83,9 @@ export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult>
   // REQUIRED
   process.stdout.write(`${envFilePath}\n`)
 
-  const varCount = envContent.split('\n').filter((line) => line.includes('=')).length
-
-  if (!quiet) {
-    logger.info(`Loaded ${varCount} variables from ${project}/${selectedConfig}`)
-  }
+  const varCount = envContent.split('\n').filter((line) => {
+    return line.includes('=')
+  }).length
 
   const structuredContent = {
     variableCount: varCount,
@@ -107,11 +108,12 @@ export const envLoad = async (args: EnvLoadArgs): Promise<ToolsExecutionResult>
 export const envLoadMcpTool = {
   name: 'env-load',
   description:
-    'Load environment variables from Doppler for a given config. Usage: env-load -c dev (after running eval "$(infra-kit env-init)" in shell)',
+    '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.',
   inputSchema: {
     config: z.string().describe('Environment config name to load (e.g. dev, arthur, renana)'),
   },
   outputSchema: {
+    filePath: z.string().describe('Path to the file that must be sourced to apply variables'),
     variableCount: z.number().describe('Number of variables loaded'),
     project: z.string().describe('Doppler project name'),
     config: z.string().describe('Doppler config name'),

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

@@ -3,10 +3,8 @@ import process from 'node:process'
 import { z } from 'zod'
 
 import { validateDopplerCliAndAuth } from 'src/integrations/doppler'
-import { getDopplerProject } from 'src/integrations/doppler/doppler-project'
 import {
   ENV_LOAD_FILE,
-  ENVs,
   INFRA_KIT_ENV_CONFIG_VAR,
   INFRA_KIT_ENV_LOADED_AT_VAR,
   INFRA_KIT_ENV_PROJECT_VAR,
@@ -23,12 +21,7 @@ import type { ToolsExecutionResult } from 'src/types'
 export const envStatus = async (): Promise<ToolsExecutionResult> => {
   await validateDopplerCliAndAuth()
 
-  const project = await getDopplerProject()
-
-  logger.info('Doppler Environment Status:\n')
-  logger.info(`  Authenticated: yes`)
-  logger.info(`  Detected Project: ${project}`)
-  logger.info(`  Available Configs: ${ENVs.join(', ')}`)
+  logger.info('Environment Session Status:\n')
 
   // Check session-loaded vars — getSessionCacheDir() throws if INFRA_KIT_SESSION is unset
   const cacheDir = getSessionCacheDir()
@@ -55,15 +48,12 @@ export const envStatus = async (): Promise<ToolsExecutionResult> => {
     logger.info(
       `  Session: ${sessionLoadedCount} of ${sessionTotalCount} vars loaded (project: ${sessionProject}, config: ${sessionConfig}, loaded at: ${sessionLoadedAt})`,
     )
-    logger.info(`  Session ID: ${sessionId}`)
   } else {
     logger.info('  Session: no env loaded')
   }
+  logger.info(`  Session ID: ${sessionId}`)
 
   const structuredContent = {
-    authenticated: true,
-    project,
-    configs: ENVs,
     sessionId,
     sessionLoadedCount,
     sessionTotalCount,
@@ -89,9 +79,6 @@ export const envStatusMcpTool = {
   description: 'Show Doppler authentication status and detected project info',
   inputSchema: {},
   outputSchema: {
-    authenticated: z.boolean().describe('Whether the user is authenticated'),
-    project: z.string().describe('Detected Doppler project name'),
-    configs: z.array(z.string()).describe('Available environment configs'),
     sessionId: z.string().describe('Current terminal session ID'),
     sessionLoadedCount: z.number().describe('Number of cached vars active in the current session'),
     sessionTotalCount: z.number().describe('Total number of cached var names'),

package/src/entry/cli.ts

@@ -183,16 +183,15 @@ program
 
 program
   .command('env-load')
-  .description('Load environment variables from Doppler. Usage: env-load -c dev (after shell init)')
+  .description('Load Doppler env vars for a config. Prints a file path to stdout — auto-sourced by the env-load shell alias, or run source <path> manually')
   .option('-c, --config <config>', 'Environment config name to load (e.g. dev, arthur)')
-  .option('-q, --quiet', 'Suppress info logging')
   .action(async (options) => {
-    await envLoad({ config: options.config, quiet: options.quiet })
+    await envLoad({ config: options.config })
   })
 
 program
   .command('env-clear')
-  .description('Clear previously loaded environment variables. Usage: env-clear (after shell init)')
+  .description('Clear loaded env vars. Prints a file path to stdout — auto-sourced by the env-clear shell alias, or run source <path> manually')
   .action(async () => {
     await envClear()
   })

package/src/lib/constants.ts

@@ -13,7 +13,7 @@ export const DOPPLER_PROJECT_MAP: Record<string, string> = {
 }
 
 export const ENV_CACHE_DIR = './node_modules/.cache/infra-kit'
-export const ENV_LOAD_FILE = 'env-load.env'
+export const ENV_LOAD_FILE = 'env-load.sh'
 export const ENV_CLEAR_FILE = 'env-clear.sh'
 
 export const INFRA_KIT_SESSION_VAR = 'INFRA_KIT_SESSION'
@@ -28,8 +28,12 @@ export const parseVarNamesFromEnvFile = (filePath: string): string[] => {
 
   return content
     .split('\n')
-    .filter((line) => line.includes('=') && !line.startsWith('set '))
-    .map((line) => line.split('=')[0]!)
+    .filter((line) => {
+      return line.includes('=') && !line.startsWith('set ')
+    })
+    .map((line) => {
+      return line.split('=')[0]!
+    })
 }
 
 export const getSessionCacheDir = (): string => {