@solid-stack/mason 1.0.26 → 1.0.29

package/dist/bin.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { cac } from 'cac';
-import * as p16 from '@clack/prompts';
-import pc16 from 'picocolors';
-import fs11 from 'fs';
+import * as p19 from '@clack/prompts';
+import pc13 from 'picocolors';
+import fs14 from 'fs';
 import path2 from 'path';
 import { fileURLToPath } from 'url';
 import Handlebars from 'handlebars';
@@ -12,7 +12,7 @@ import { createHash } from 'crypto';
 function writeFileSafely(absolutePath, content, options = {}) {
   const projectRoot = options.projectRoot || process.cwd();
   const relPath = path2.relative(projectRoot, absolutePath).replace(/\\/g, "/");
-  const existedBefore = fs11.existsSync(absolutePath);
+  const existedBefore = fs14.existsSync(absolutePath);
   if (options.dryRun) {
     return {
       relativePath: relPath,
@@ -32,10 +32,10 @@ function writeFileSafely(absolutePath, content, options = {}) {
     };
   }
   const dir = path2.dirname(absolutePath);
-  if (!fs11.existsSync(dir)) {
-    fs11.mkdirSync(dir, { recursive: true });
+  if (!fs14.existsSync(dir)) {
+    fs14.mkdirSync(dir, { recursive: true });
   }
-  fs11.writeFileSync(absolutePath, content, "utf-8");
+  fs14.writeFileSync(absolutePath, content, "utf-8");
   return {
     relativePath: relPath,
     absolutePath,
@@ -47,17 +47,17 @@ function writeFileSafely(absolutePath, content, options = {}) {
 function printGeneratedFiles(files, isDryRun = false) {
   console.log("");
   if (isDryRun) {
-    p16.log.warn(pc16.yellow(pc16.bold("[DRY RUN PREVIEW] No files were written to disk.")));
+    p19.log.warn(pc13.yellow(pc13.bold("[DRY RUN PREVIEW] No files were written to disk.")));
   }
   for (const f of files) {
     if (f.action === "created") {
-      p16.log.success(`${pc16.bold(f.relativePath)} ${pc16.dim("(created)")}`);
+      p19.log.success(`${pc13.bold(f.relativePath)} ${pc13.dim("(created)")}`);
     } else if (f.action === "overwritten") {
-      p16.log.warn(`${pc16.bold(f.relativePath)} ${pc16.dim("(overwritten)")}`);
+      p19.log.warn(`${pc13.bold(f.relativePath)} ${pc13.dim("(overwritten)")}`);
     } else if (f.action === "skipped") {
-      p16.log.info(`${pc16.dim(f.relativePath)} ${pc16.dim("(skipped - already exists, pass -o to overwrite)")}`);
+      p19.log.info(`${pc13.dim(f.relativePath)} ${pc13.dim("(skipped - already exists, pass -o to overwrite)")}`);
     } else {
-      p16.log.info(`${pc16.bold(f.relativePath)} ${pc16.dim("(preview)")}`);
+      p19.log.info(`${pc13.bold(f.relativePath)} ${pc13.dim("(preview)")}`);
     }
   }
 }
@@ -129,9 +129,9 @@ function loadMasonConfig(startDir = process.cwd()) {
   let current = path2.resolve(startDir);
   while (true) {
     const configPath = path2.join(current, "mason.config.json");
-    if (fs11.existsSync(configPath)) {
+    if (fs14.existsSync(configPath)) {
       try {
-        return JSON.parse(fs11.readFileSync(configPath, "utf-8"));
+        return JSON.parse(fs14.readFileSync(configPath, "utf-8"));
       } catch {
         return null;
       }
@@ -146,7 +146,7 @@ function getEffectiveMode(projectRoot, flags) {
   if (flags?.registry) return "registry";
   const config = loadMasonConfig(projectRoot);
   if (config?.mode) return config.mode;
-  if (fs11.existsSync(path2.join(projectRoot, "index.json")) && (fs11.existsSync(path2.join(projectRoot, "features")) || fs11.existsSync(path2.join(projectRoot, "shared")) || fs11.existsSync(path2.join(projectRoot, "src/features")) || fs11.existsSync(path2.join(projectRoot, "src/shared")))) {
+  if (fs14.existsSync(path2.join(projectRoot, "index.json")) && (fs14.existsSync(path2.join(projectRoot, "features")) || fs14.existsSync(path2.join(projectRoot, "shared")) || fs14.existsSync(path2.join(projectRoot, "src/features")) || fs14.existsSync(path2.join(projectRoot, "src/shared")))) {
     return "registry";
   }
   return "app";
@@ -160,12 +160,12 @@ function getConfiguredFeaturesDir(projectRoot, flags) {
   }
   const mode = getEffectiveMode(projectRoot, flags);
   if (mode === "registry") {
-    if (fs11.existsSync(path2.join(projectRoot, "src/features"))) {
+    if (fs14.existsSync(path2.join(projectRoot, "src/features"))) {
       return path2.join(projectRoot, "src/features");
     }
     return path2.join(projectRoot, "features");
   }
-  if (fs11.existsSync(path2.join(projectRoot, "src/features"))) {
+  if (fs14.existsSync(path2.join(projectRoot, "src/features"))) {
     return path2.join(projectRoot, "src/features");
   }
   return path2.join(projectRoot, "features");
@@ -179,12 +179,12 @@ function getConfiguredSharedDir(projectRoot, flags) {
   }
   const mode = getEffectiveMode(projectRoot, flags);
   if (mode === "registry") {
-    if (fs11.existsSync(path2.join(projectRoot, "src/shared"))) {
+    if (fs14.existsSync(path2.join(projectRoot, "src/shared"))) {
       return path2.join(projectRoot, "src/shared");
     }
     return path2.join(projectRoot, "shared");
   }
-  if (fs11.existsSync(path2.join(projectRoot, "src/shared"))) {
+  if (fs14.existsSync(path2.join(projectRoot, "src/shared"))) {
     return path2.join(projectRoot, "src/shared");
   }
   return path2.join(projectRoot, "shared");
@@ -194,7 +194,7 @@ function getConfiguredSharedDir(projectRoot, flags) {
 function findProjectRoot(startDir = process.cwd()) {
   let current = path2.resolve(startDir);
   while (true) {
-    if (fs11.existsSync(path2.join(current, "package.json"))) {
+    if (fs14.existsSync(path2.join(current, "package.json"))) {
       return current;
     }
     const parent = path2.dirname(current);
@@ -212,9 +212,9 @@ function resolveSharedDir(projectRoot, flags) {
 }
 function listExistingFeatures(projectRoot) {
   const featuresDir = resolveFeaturesDir(projectRoot);
-  if (!fs11.existsSync(featuresDir)) return [];
+  if (!fs14.existsSync(featuresDir)) return [];
   try {
-    const entries = fs11.readdirSync(featuresDir, { withFileTypes: true });
+    const entries = fs14.readdirSync(featuresDir, { withFileTypes: true });
     return entries.filter((e) => e.isDirectory()).map((e) => e.name).sort();
   } catch {
     return [];
@@ -225,9 +225,9 @@ function listDomainInterfaces(projectRoot, featureName) {
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
     const domainDir = path2.join(resolveFeaturesDir(projectRoot), feat, "domain");
-    if (!fs11.existsSync(domainDir)) continue;
+    if (!fs14.existsSync(domainDir)) continue;
     try {
-      const files = fs11.readdirSync(domainDir);
+      const files = fs14.readdirSync(domainDir);
       for (const file of files) {
         if (file.endsWith(".ts") && !file.endsWith(".test.ts") && !file.endsWith(".d.ts")) {
           const name = file.replace(/\.ts$/, "");
@@ -240,7 +240,7 @@ function listDomainInterfaces(projectRoot, featureName) {
             });
           } else {
             try {
-              const content = fs11.readFileSync(fullPath, "utf-8");
+              const content = fs14.readFileSync(fullPath, "utf-8");
               if (/export\s+(?:abstract\s+class|interface)\s+(\w+)/.test(content)) {
                 results.push({
                   name,
@@ -263,9 +263,9 @@ function listDomainEntities(projectRoot, featureName) {
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
     const domainDir = path2.join(resolveFeaturesDir(projectRoot), feat, "domain");
-    if (!fs11.existsSync(domainDir)) continue;
+    if (!fs14.existsSync(domainDir)) continue;
     try {
-      const files = fs11.readdirSync(domainDir);
+      const files = fs14.readdirSync(domainDir);
       for (const file of files) {
         if (file.endsWith(".ts") && !file.endsWith(".test.ts") && !file.endsWith(".d.ts")) {
           const name = file.replace(/\.ts$/, "");
@@ -288,9 +288,9 @@ function listUseCases(projectRoot, featureName) {
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
     const useCasesDir = path2.join(resolveFeaturesDir(projectRoot), feat, "useCases");
-    if (!fs11.existsSync(useCasesDir)) continue;
+    if (!fs14.existsSync(useCasesDir)) continue;
     try {
-      const files = fs11.readdirSync(useCasesDir);
+      const files = fs14.readdirSync(useCasesDir);
       for (const file of files) {
         if (file.endsWith(".ts") && !file.endsWith(".test.ts") && !file.endsWith(".d.ts")) {
           const name = file.replace(/\.ts$/, "");
@@ -322,29 +322,29 @@ hbs.registerHelper("join", (arr, sep) => {
 });
 var cachedTemplatesDir = null;
 function getTemplatesDir() {
-  if (cachedTemplatesDir && fs11.existsSync(cachedTemplatesDir)) {
+  if (cachedTemplatesDir && fs14.existsSync(cachedTemplatesDir)) {
     return cachedTemplatesDir;
   }
   const currentDir = typeof __dirname !== "undefined" ? __dirname : path2.dirname(fileURLToPath(import.meta.url));
   const cand1 = path2.resolve(currentDir, "../../templates");
-  if (fs11.existsSync(cand1)) {
+  if (fs14.existsSync(cand1)) {
     cachedTemplatesDir = cand1;
     return cand1;
   }
   const cand2 = path2.resolve(currentDir, "../templates");
-  if (fs11.existsSync(cand2)) {
+  if (fs14.existsSync(cand2)) {
     cachedTemplatesDir = cand2;
     return cand2;
   }
   const cand3 = path2.resolve(currentDir, "templates");
-  if (fs11.existsSync(cand3)) {
+  if (fs14.existsSync(cand3)) {
     cachedTemplatesDir = cand3;
     return cand3;
   }
   let curr = currentDir;
   while (true) {
     const candTemplates = path2.join(curr, "templates");
-    if (fs11.existsSync(candTemplates)) {
+    if (fs14.existsSync(candTemplates)) {
       cachedTemplatesDir = candTemplates;
       return candTemplates;
     }
@@ -357,7 +357,7 @@ function getTemplatesDir() {
 var templateCache = /* @__PURE__ */ new Map();
 function loadTemplate(relativePath) {
   const fullPath = path2.isAbsolute(relativePath) ? relativePath : path2.join(getTemplatesDir(), relativePath);
-  return fs11.readFileSync(fullPath, "utf-8");
+  return fs14.readFileSync(fullPath, "utf-8");
 }
 function renderTemplateFile(relativePath, context) {
   let compiled = templateCache.get(relativePath);
@@ -469,7 +469,7 @@ function generateInterfaceCode(ifaceName, kind = "abstractClass", entityName, me
   const idKey = `${entityKey}Id`;
   const listKey = `${entityKey}s`;
   const formattedCustomMethods = customMethods.map((m) => {
-    const params = m.params && m.params.length > 0 ? m.params.map((p19) => `${p19.name}: ${p19.type}`).join("; ") : "";
+    const params = m.params && m.params.length > 0 ? m.params.map((p22) => `${p22.name}: ${p22.type}`).join("; ") : "";
     const returnType = m.returnType ? `Promise<${m.returnType}>` : "Promise<void>";
     return {
       name: m.name,
@@ -730,7 +730,7 @@ function parseInterfaceMethodsAndImports(content, targetIfaceName) {
   };
 }
 function findInterfaceFile(projectRoot, ifaceName, featureName, customPath) {
-  if (customPath && fs11.existsSync(customPath)) {
+  if (customPath && fs14.existsSync(customPath)) {
     return { filePath: customPath, ifaceName };
   }
   const candidateNames = [
@@ -741,21 +741,21 @@ function findInterfaceFile(projectRoot, ifaceName, featureName, customPath) {
   const features = featureName ? [featureName, ...listExistingFeatures(projectRoot).filter((f) => f !== featureName)] : listExistingFeatures(projectRoot);
   for (const feat of features) {
     const domainDir = path2.join(resolveFeaturesDir(projectRoot), feat, "domain");
-    if (!fs11.existsSync(domainDir)) continue;
+    if (!fs14.existsSync(domainDir)) continue;
     for (const cand of candidateNames) {
       const p1 = path2.join(domainDir, `${cand}.ts`);
-      if (fs11.existsSync(p1)) {
+      if (fs14.existsSync(p1)) {
         return { filePath: p1, ifaceName: cand, feature: feat };
       }
     }
   }
   for (const cand of candidateNames) {
     const p1 = path2.join(projectRoot, "domain", `${cand}.ts`);
-    if (fs11.existsSync(p1)) return { filePath: p1, ifaceName: cand };
+    if (fs14.existsSync(p1)) return { filePath: p1, ifaceName: cand };
     const p22 = path2.join(projectRoot, "src", "domain", `${cand}.ts`);
-    if (fs11.existsSync(p22)) return { filePath: p22, ifaceName: cand };
+    if (fs14.existsSync(p22)) return { filePath: p22, ifaceName: cand };
     const p32 = path2.join(projectRoot, "interfaces", `${cand}.ts`);
-    if (fs11.existsSync(p32)) return { filePath: p32, ifaceName: cand };
+    if (fs14.existsSync(p32)) return { filePath: p32, ifaceName: cand };
   }
   return null;
 }
@@ -778,7 +778,7 @@ function loadInterfaceHierarchy(projectRoot, initialIfaceName, featureName, cust
   while (currentFile && !visited.has(currentFile)) {
     visited.add(currentFile);
     try {
-      const content = fs11.readFileSync(currentFile, "utf-8");
+      const content = fs14.readFileSync(currentFile, "utf-8");
       const parsed = parseInterfaceMethodsAndImports(content, currentName);
       for (const m of parsed.methods) {
         if (!allMethods.some((existing) => existing.name === m.name)) {
@@ -1050,22 +1050,22 @@ function generateUseCaseCode(useCaseName, dependencies = [], inputProps = [], ou
     from: /^I[A-Z]/.test(dep) ? `../domain/${dep}.js` : `./${dep}.js`
   }));
   const domainTypesToImport = new Set(domainImports);
-  for (const p19 of [...inputProps, ...outputProps]) {
-    const rawType = p19.type.trim();
+  for (const p22 of [...inputProps, ...outputProps]) {
+    const rawType = p22.type.trim();
     const baseType = rawType.replace(/\[\]$/, "").trim();
     if (!primitiveTypes.has(baseType) && /^[A-Z][A-Za-z0-9_]*$/.test(baseType) && !dependencies.includes(baseType)) {
       domainTypesToImport.add(baseType);
     }
   }
-  const formattedInputProps = inputProps.map((p19) => ({
-    name: p19.name,
-    optional: p19.optional,
-    type: p19.optional && !p19.type.includes("undefined") ? `${p19.type} | undefined` : p19.type
+  const formattedInputProps = inputProps.map((p22) => ({
+    name: p22.name,
+    optional: p22.optional,
+    type: p22.optional && !p22.type.includes("undefined") ? `${p22.type} | undefined` : p22.type
   }));
-  const formattedOutputProps = outputProps.map((p19) => ({
-    name: p19.name,
-    optional: p19.optional,
-    type: p19.optional && !p19.type.includes("undefined") ? `${p19.type} | undefined` : p19.type
+  const formattedOutputProps = outputProps.map((p22) => ({
+    name: p22.name,
+    optional: p22.optional,
+    type: p22.optional && !p22.type.includes("undefined") ? `${p22.type} | undefined` : p22.type
   }));
   const formattedDeps = dependencies.map((dep) => ({
     key: toCamelCase(dep),
@@ -1252,7 +1252,7 @@ function generateHttpHandler(options) {
   const pxDir = path2.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress");
   const handlersDir = path2.join(pxDir, "handlers");
   const pxIndexPath = path2.join(pxDir, "index.ts");
-  if (!fs11.existsSync(pxIndexPath)) {
+  if (!fs14.existsSync(pxIndexPath)) {
     const featurePath = options.routePrefix || `/${options.feature.toLowerCase()}`;
     const pxIndexContent = renderTemplate(expressIndexTemplate, {
       routePath: featurePath
@@ -1289,8 +1289,8 @@ function updateOrGenerateDiProvider(featureDir, featureName, bindings = [], opti
   const providerPath = path2.join(featureDir, "diProvider.ts");
   const pascalFeature = toPascalCase(featureName);
   const providerModuleName = `${pascalFeature}Provider`;
-  if (fs11.existsSync(providerPath) && !options.overwrite) {
-    let content = fs11.readFileSync(providerPath, "utf-8");
+  if (fs14.existsSync(providerPath) && !options.overwrite) {
+    let content = fs14.readFileSync(providerPath, "utf-8");
     content = content.replace(/\n*export\s+const\s+ScaffoldProvider\s*=[^;]+;?/g, "");
     for (const b of bindings) {
       const ifaceImp = b.ifaceImportPath || `./domain/${b.ifaceName}.js`;
@@ -1736,23 +1736,23 @@ var PromptCancelledError = class extends Error {
   }
 };
 function handleCancel(result) {
-  if (p16.isCancel(result)) {
-    p16.cancel("Operation cancelled.");
+  if (p19.isCancel(result)) {
+    p19.cancel("Operation cancelled.");
     throw new PromptCancelledError();
   }
   return result;
 }
 function printBanner() {
   console.log("");
-  p16.intro(pc16.bgCyan(pc16.black(" @solid-stack/mason ")));
+  p19.intro(pc13.bgCyan(pc13.black(" @solid-stack/mason ")));
 }
 async function promptProperties(options = {}) {
   const properties = options.defaults ? [...options.defaults] : [];
   if (properties.length > 0) {
-    const summary = properties.map((p19) => `${p19.name}: ${p19.type}${p19.optional ? "?" : ""}`).join(", ");
-    p16.log.info(pc16.dim(`Pre-configured fields: ${summary}`));
+    const summary = properties.map((p22) => `${p22.name}: ${p22.type}${p22.optional ? "?" : ""}`).join(", ");
+    p19.log.info(pc13.dim(`Pre-configured fields: ${summary}`));
     const addMore = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Would you like to add custom fields/properties?",
         initialValue: false
       })
@@ -1761,10 +1761,10 @@ async function promptProperties(options = {}) {
       return properties;
     }
   }
-  p16.log.info(pc16.cyan("Enter properties (leave name blank when finished):"));
+  p19.log.info(pc13.cyan("Enter properties (leave name blank when finished):"));
   while (true) {
     const name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Property name (or press Enter to finish):",
         placeholder: "e.g. title, email, status"
       })
@@ -1773,7 +1773,7 @@ async function promptProperties(options = {}) {
       break;
     }
     const type = handleCancel(
-      await p16.select({
+      await p19.select({
         message: `Type for property "${name.trim()}":`,
         options: [
           { value: "string", label: "string" },
@@ -1790,7 +1790,7 @@ async function promptProperties(options = {}) {
     let finalType = type;
     if (type === "custom") {
       finalType = handleCancel(
-        await p16.text({
+        await p19.text({
           message: `Enter custom type for "${name.trim()}":`,
           placeholder: "e.g. UserRole, string | null",
           validate: (val) => val && val.trim() ? void 0 : "Type cannot be empty"
@@ -1798,7 +1798,7 @@ async function promptProperties(options = {}) {
       );
     }
     const optional = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: `Is "${name.trim()}" optional?`,
         initialValue: false
       })
@@ -1808,8 +1808,8 @@ async function promptProperties(options = {}) {
       type: finalType.trim(),
       optional
     });
-    p16.log.success(
-      pc16.green(`Added: ${name.trim()}${optional ? "?" : ""}: ${finalType.trim()}`)
+    p19.log.success(
+      pc13.green(`Added: ${name.trim()}${optional ? "?" : ""}: ${finalType.trim()}`)
     );
   }
   return properties;
@@ -1825,7 +1825,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   }
   if (!name) {
     name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "What is the feature name?",
         placeholder: "e.g. users, auth, orders, billing",
         validate: (val) => {
@@ -1841,7 +1841,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   let targetDirRel = defaultDir;
   if (!flags.yes && !flags.target && !flags.dest) {
     targetDirRel = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Target directory for the feature:",
         initialValue: defaultDir,
         defaultValue: defaultDir
@@ -1863,14 +1863,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   const customUseCases = [];
   if (!flags.yes) {
     includeExpress = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Include Express Presentation layer (pxExpress routes & handlers)?",
         initialValue: true
       })
     );
     if (includeExpress) {
       routePath = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Express route prefix:",
           initialValue: `/${normalizedName}`,
           defaultValue: `/${normalizedName}`
@@ -1878,14 +1878,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       ).trim();
     }
     includeDomain = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Include Domain Entity/Entities?",
         initialValue: true
       })
     );
     if (includeDomain) {
       const domainInput = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Domain entity name(s) (comma-separated):",
           initialValue: defaultEntity,
           defaultValue: defaultEntity,
@@ -1904,21 +1904,21 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       entityNames = [defaultEntity];
     }
     includeInterface = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: `Include Domain Repository interface(s) for ${entityNames.join(", ")}?`,
         initialValue: true
       })
     );
     if (includeInterface) {
       includeInfra = handleCancel(
-        await p16.confirm({
+        await p19.confirm({
           message: `Include Infrastructure Stub implementation(s) for ${entityNames.join(", ")}?`,
           initialValue: true
         })
       );
     }
     includeUseCase = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Include Domain Use Cases?",
         initialValue: true
       })
@@ -1932,7 +1932,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
         { value: "delete", label: "Delete (Delete<Entity>)", hint: "DELETE /:id" }
       ];
       crudOperations = handleCancel(
-        await p16.multiselect({
+        await p19.multiselect({
           message: "Select standard CRUD use cases to generate:",
           options: crudChoices,
           initialValues: ["create", "read", "list", "update", "delete"],
@@ -1940,13 +1940,13 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
         })
       );
       includeTests = handleCancel(
-        await p16.confirm({
+        await p19.confirm({
           message: "Generate Vitest unit tests for use cases?",
           initialValue: true
         })
       );
       const wantCustom = handleCancel(
-        await p16.confirm({
+        await p19.confirm({
           message: "Do you want to add any custom use cases to this feature?",
           initialValue: false
         })
@@ -1956,7 +1956,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
         const availableIfaces = entityNames.map((e) => `I${e}Repository`);
         while (addMore) {
           const customName = handleCancel(
-            await p16.text({
+            await p19.text({
               message: "Custom Use Case name:",
               placeholder: "e.g. ResetPassword, VerifyEmail, AssignRole",
               validate: (v) => v && v.trim() ? void 0 : "Use Case name cannot be empty"
@@ -1966,7 +1966,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           let selectedDeps = [];
           if (availableIfaces.length > 0) {
             selectedDeps = handleCancel(
-              await p16.multiselect({
+              await p19.multiselect({
                 message: `Select domain interfaces to inject into ${customUcName}:`,
                 options: availableIfaces.map((i) => ({ value: i, label: i })),
                 required: false
@@ -1975,7 +1975,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           }
           let customInputProps = [];
           const hasInput = handleCancel(
-            await p16.confirm({
+            await p19.confirm({
               message: `Does ${customUcName} accept input arguments?`,
               initialValue: true
             })
@@ -1986,7 +1986,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           }
           let customOutputProps = [];
           const hasCustomOutput = handleCancel(
-            await p16.confirm({
+            await p19.confirm({
               message: `Does ${customUcName} return custom output data?`,
               initialValue: false
             })
@@ -1996,7 +1996,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
               });
           }
           const customIncludeTest = handleCancel(
-            await p16.confirm({
+            await p19.confirm({
               message: `Generate Vitest unit test for ${customUcName}?`,
               initialValue: true
             })
@@ -2006,14 +2006,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           let customHttpPath = `/${toKebabCase(customUcName)}`;
           if (includeExpress) {
             customCreateHttp = handleCancel(
-              await p16.confirm({
+              await p19.confirm({
                 message: `Generate a matching ExpressRoute HTTP handler for ${customUcName}?`,
                 initialValue: true
               })
             );
             if (customCreateHttp) {
               customHttpMethod = handleCancel(
-                await p16.select({
+                await p19.select({
                   message: "HTTP method for route:",
                   options: [
                     { value: "post", label: "POST" },
@@ -2026,7 +2026,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
                 })
               );
               customHttpPath = handleCancel(
-                await p16.text({
+                await p19.text({
                   message: "Route subpath (relative to feature prefix):",
                   initialValue: `/${toKebabCase(customUcName)}`,
                   defaultValue: `/${toKebabCase(customUcName)}`
@@ -2047,7 +2047,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
             validationFields: customInputProps
           });
           addMore = handleCancel(
-            await p16.confirm({
+            await p19.confirm({
               message: "Add another custom use case?",
               initialValue: false
             })
@@ -2056,7 +2056,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       }
     }
     includeDiProvider = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Generate / update feature DI provider (diProvider.ts)?",
         initialValue: true
       })
@@ -2068,8 +2068,8 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       entityNames = [defaultEntity];
     }
   }
-  const s = p16.spinner();
-  s.start(`Generating feature '${pc16.cyan(normalizedName)}'...`);
+  const s = p19.spinner();
+  s.start(`Generating feature '${pc13.cyan(normalizedName)}'...`);
   const options = {
     name: normalizedName,
     projectRoot,
@@ -2091,7 +2091,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   const files = generateFeature(options);
   if (isRegistry) {
     const registryPath = path2.join(targetDir, "registry.json");
-    if (!fs11.existsSync(registryPath)) {
+    if (!fs14.existsSync(registryPath)) {
       const manifest = {
         name: toKebabCase(normalizedName),
         type: "feature",
@@ -2115,8 +2115,8 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   }
   s.stop("Feature scaffolded successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p16.outro(
-    pc16.green(
+  p19.outro(
+    pc13.green(
       `\u2713 Feature '${normalizedName}' initialized in ${path2.relative(projectRoot, targetDir)} (uncommitted, unregistered)`
     )
   );
@@ -2230,7 +2230,7 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   }
   if (!name) {
     name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "What is the shared module name?",
         placeholder: "e.g. hasher, time, uuid, cache, logger",
         validate: (val) => {
@@ -2246,7 +2246,7 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   let targetDirRel = defaultDir;
   if (!flags.yes && !flags.target && !flags.dest) {
     targetDirRel = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Target directory for the shared module:",
         initialValue: defaultDir,
         defaultValue: defaultDir
@@ -2258,21 +2258,21 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   let includeStub = true;
   if (!flags.yes) {
     description = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Module description (optional):",
         placeholder: "e.g. In-memory caching and Redis port abstraction",
         initialValue: ""
       })
     ).trim();
     includeStub = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Include stub implementation in infrastructure/?",
         initialValue: true
       })
     );
   }
-  const s = p16.spinner();
-  s.start(`Generating shared module '${pc16.cyan(normalizedName)}'...`);
+  const s = p19.spinner();
+  s.start(`Generating shared module '${pc13.cyan(normalizedName)}'...`);
   const files = generateShared({
     name: normalizedName,
     description,
@@ -2285,8 +2285,8 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   });
   s.stop("Shared module generated successfully!");
   printGeneratedFiles(files, Boolean(flags.dryRun));
-  p16.outro(
-    pc16.green(
+  p19.outro(
+    pc13.green(
       `\u2713 Shared module '${normalizedName}' initialized in ${path2.relative(projectRoot, targetDir)} (uncommitted, unregistered)`
     )
   );
@@ -2300,14 +2300,14 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       const featureOptions = existingFeatures.map((f) => ({ value: f, label: f }));
       featureOptions.push({ value: "__custom__", label: "\u270F\uFE0F  Enter custom feature name..." });
       const selected = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p16.text({
+          await p19.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2317,7 +2317,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2328,7 +2328,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   let name = useCaseNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Use Case name:",
         placeholder: "e.g. CreateUser, GetUser, CancelOrder",
         validate: (v) => v && v.trim() ? void 0 : "Use Case name cannot be empty"
@@ -2344,7 +2344,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       label: i.name
     }));
     selectedDeps = handleCancel(
-      await p16.multiselect({
+      await p19.multiselect({
         message: "Select domain interfaces to inject into use case:",
         options: multiOptions,
         required: false
@@ -2359,7 +2359,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   let httpPath = "/";
   if (!flags.yes) {
     const hasInput = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Does this use case accept input arguments?",
         initialValue: true
       })
@@ -2369,7 +2369,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         });
     }
     const hasCustomOutput = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Does this use case return custom output data?",
         initialValue: false
       })
@@ -2379,20 +2379,20 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         });
     }
     includeTest = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Generate Vitest unit test skeleton (.test.ts)?",
         initialValue: true
       })
     );
     createHttp = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Generate a matching ExpressRoute HTTP handler?",
         initialValue: false
       })
     );
     if (createHttp) {
       httpMethod = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "HTTP method for route:",
           options: [
             { value: "post", label: "POST" },
@@ -2405,7 +2405,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         })
       );
       httpPath = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Route subpath (relative to feature prefix):",
           initialValue: "/",
           defaultValue: "/"
@@ -2413,8 +2413,8 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       ).trim();
     }
   }
-  const s = p16.spinner();
-  s.start(`Generating use case '${pc16.cyan(ucName)}'...`);
+  const s = p19.spinner();
+  s.start(`Generating use case '${pc13.cyan(ucName)}'...`);
   const options = {
     name: ucName,
     feature,
@@ -2446,7 +2446,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   }
   s.stop("Use case generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p16.outro(pc16.green(`Use case '${ucName}' created in feature '${feature}'!`));
+  p19.outro(pc13.green(`Use case '${ucName}' created in feature '${feature}'!`));
 }
 async function runDomainCommand(domainNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2457,14 +2457,14 @@ async function runDomainCommand(domainNameArg, flags = {}) {
       const featureOptions = existingFeatures.map((f) => ({ value: f, label: f }));
       featureOptions.push({ value: "__custom__", label: "\u270F\uFE0F  Enter custom feature name..." });
       const selected = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p16.text({
+          await p19.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2474,7 +2474,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2485,7 +2485,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   let name = domainNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Domain model / entity name:",
         placeholder: "e.g. User, Order, Product, Address",
         validate: (v) => v && v.trim() ? void 0 : "Domain name cannot be empty"
@@ -2497,7 +2497,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   let properties = [];
   if (!flags.yes) {
     kind = handleCancel(
-      await p16.select({
+      await p19.select({
         message: "Select domain model type:",
         options: [
           { value: "interface", label: "TypeScript Interface (pure data structure)" },
@@ -2516,8 +2516,8 @@ async function runDomainCommand(domainNameArg, flags = {}) {
       defaults: kind === "valueObject" ? [{ name: "value", type: "string" }] : defaultProps
     });
   }
-  const s = p16.spinner();
-  s.start(`Generating domain model '${pc16.cyan(entityName)}'...`);
+  const s = p19.spinner();
+  s.start(`Generating domain model '${pc13.cyan(entityName)}'...`);
   const options = {
     name: entityName,
     feature,
@@ -2530,7 +2530,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   const file = generateDomain(options);
   s.stop("Domain model generated successfully!");
   printGeneratedFiles([file], options.dryRun);
-  p16.outro(pc16.green(`Domain model '${entityName}' created in feature '${feature}'!`));
+  p19.outro(pc13.green(`Domain model '${entityName}' created in feature '${feature}'!`));
 }
 async function runInfrastructureCommand(classNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2539,7 +2539,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   let feature = flags.feature?.trim();
   if (!flags.yes && !flags.global && !flags.feature) {
     scope = handleCancel(
-      await p16.select({
+      await p19.select({
         message: "Where should this infrastructure implementation be placed?",
         options: [
           { value: "feature", label: "Feature-level (features/<feature>/infrastructure)" },
@@ -2554,14 +2554,14 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
       const featureOptions = existingFeatures.map((f) => ({ value: f, label: f }));
       featureOptions.push({ value: "__custom__", label: "\u270F\uFE0F  Enter custom feature name..." });
       const selected = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p16.text({
+          await p19.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2571,7 +2571,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2584,7 +2584,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   let name = classNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Infrastructure class name:",
         placeholder: "e.g. StubUserRepository, PostgresUserRepository, S3FileStorage",
         validate: (v) => v && v.trim() ? void 0 : "Class name cannot be empty"
@@ -2603,7 +2603,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
           (i) => className.toLowerCase().includes(removeInterfacePrefix(i.name).toLowerCase())
         );
         const ifaceChoice = handleCancel(
-          await p16.select({
+          await p19.select({
             message: "Does this class implement a domain interface or abstract class?",
             options: [
               ...interfaces.map((i) => ({ value: i.name, label: i.name })),
@@ -2615,7 +2615,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
         );
         if (ifaceChoice === "__custom__") {
           implementsInterface = handleCancel(
-            await p16.text({
+            await p19.text({
               message: "Enter interface or abstract class name:",
               placeholder: "e.g. IUserRepository, BaseStorageAdapter",
               validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2626,14 +2626,14 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
         }
       } else {
         const wantImpl = handleCancel(
-          await p16.confirm({
+          await p19.confirm({
             message: "Does this class implement a domain interface or abstract class?",
             initialValue: false
           })
         );
         if (wantImpl) {
           implementsInterface = handleCancel(
-            await p16.text({
+            await p19.text({
               message: "Enter interface or abstract class name:",
               placeholder: "e.g. IUserRepository, BaseStorageAdapter",
               validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2653,7 +2653,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
     const allInterfaces = listDomainInterfaces(projectRoot);
     if (allInterfaces.length > 0) {
       const ifaceChoice = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Does this class implement an interface or abstract class?",
           options: [
             ...allInterfaces.map((i) => ({ value: i.name, label: `${i.name} (${i.feature})` })),
@@ -2665,7 +2665,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
       );
       if (ifaceChoice === "__custom__") {
         implementsInterface = handleCancel(
-          await p16.text({
+          await p19.text({
             message: "Enter interface or abstract class name:",
             placeholder: "e.g. IAuthRepository",
             validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2678,7 +2678,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   }
   if (!flags.yes && !flags.kind) {
     kind = handleCancel(
-      await p16.select({
+      await p19.select({
         message: "Select implementation kind:",
         options: [
           { value: "stub", label: "In-Memory Stub (with in-memory store and test helper methods)" },
@@ -2689,7 +2689,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
     );
     if (scope === "feature" && feature && implementsInterface) {
       registerInProvider = handleCancel(
-        await p16.confirm({
+        await p19.confirm({
           message: "Register this implementation in feature diProvider.ts?",
           initialValue: true
         })
@@ -2698,8 +2698,8 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   } else if (flags.yes && scope === "feature" && feature && implementsInterface) {
     registerInProvider = !flags.noProvider;
   }
-  const s = p16.spinner();
-  s.start(`Generating infrastructure class '${pc16.cyan(className)}'...`);
+  const s = p19.spinner();
+  s.start(`Generating infrastructure class '${pc13.cyan(className)}'...`);
   const files = [];
   const options = {
     name: className,
@@ -2734,7 +2734,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   }
   s.stop("Infrastructure class generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p16.outro(pc16.green(`Infrastructure class '${className}' created!`));
+  p19.outro(pc13.green(`Infrastructure class '${className}' created!`));
 }
 async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2745,14 +2745,14 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       const featureOptions = existingFeatures.map((f) => ({ value: f, label: f }));
       featureOptions.push({ value: "__custom__", label: "\u270F\uFE0F  Enter custom feature name..." });
       const selected = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p16.text({
+          await p19.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2762,7 +2762,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2773,7 +2773,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   let name = interfaceNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Domain interface name:",
         placeholder: "e.g. IUserRepository, IPaymentService",
         validate: (v) => v && v.trim() ? void 0 : "Interface name cannot be empty"
@@ -2791,7 +2791,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   if (!flags.yes) {
     if (existingEntities.length > 0) {
       const selectedEntity = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Select domain entity associated with this interface:",
           options: [
             ...existingEntities.map((e) => ({ value: e.name, label: e.name })),
@@ -2802,7 +2802,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       );
       if (selectedEntity === "__custom__") {
         entityName = handleCancel(
-          await p16.text({
+          await p19.text({
             message: "Enter entity name:",
             defaultValue: removeInterfacePrefix(ifaceName).replace(/Repository$|Service$/, "")
           })
@@ -2812,7 +2812,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       }
     }
     kind = handleCancel(
-      await p16.select({
+      await p19.select({
         message: "Interface definition style:",
         options: [
           { value: "abstractClass", label: "Abstract Class (Recommended - acts as DI token & type)" },
@@ -2822,7 +2822,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       })
     );
     methodsPreset = handleCancel(
-      await p16.select({
+      await p19.select({
         message: "Method signature preset:",
         options: [
           { value: "crud", label: "Standard CRUD (GetById, List, Create, Update, Delete)" },
@@ -2832,22 +2832,22 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       })
     );
     generateStub = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Auto-generate Infrastructure Stub implementation?",
         initialValue: true
       })
     );
     if (generateStub) {
       registerInProvider = handleCancel(
-        await p16.confirm({
+        await p19.confirm({
           message: "Auto-register interface & stub in feature diProvider.ts?",
           initialValue: true
         })
       );
     }
   }
-  const s = p16.spinner();
-  s.start(`Generating interface '${pc16.cyan(ifaceName)}'...`);
+  const s = p19.spinner();
+  s.start(`Generating interface '${pc13.cyan(ifaceName)}'...`);
   const files = [];
   const options = {
     name: ifaceName,
@@ -2896,7 +2896,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   }
   s.stop("Interface generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p16.outro(pc16.green(`Interface '${ifaceName}' created in feature '${feature}'!`));
+  p19.outro(pc13.green(`Interface '${ifaceName}' created in feature '${feature}'!`));
 }
 async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2907,14 +2907,14 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
       const featureOptions = existingFeatures.map((f) => ({ value: f, label: f }));
       featureOptions.push({ value: "__custom__", label: "\u270F\uFE0F  Enter custom feature name..." });
       const selected = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p16.text({
+          await p19.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2924,7 +2924,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2935,7 +2935,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   let name = handlerNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "HTTP Route Handler class name:",
         placeholder: "e.g. CreateUserHttp, GetUserHttp, HealthHttp",
         validate: (v) => v && v.trim() ? void 0 : "Handler name cannot be empty"
@@ -2954,7 +2954,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   let validationFields = [];
   if (!flags.yes) {
     method = handleCancel(
-      await p16.select({
+      await p19.select({
         message: "HTTP Method:",
         options: [
           { value: "get", label: "GET" },
@@ -2968,7 +2968,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
     );
     const defaultPath = method === "get" ? "/" : "/";
     subPath = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Route subpath (relative to feature prefix):",
         initialValue: defaultPath,
         defaultValue: defaultPath
@@ -2979,7 +2979,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
       const ucOptions = useCases.map((u) => ({ value: u.name, label: u.name }));
       ucOptions.push({ value: "__none__", label: "None / Standalone Handler" });
       const chosenUc = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Connect this handler to a domain Use Case?",
           options: ucOptions,
           initialValue: ucOptions[0]?.value
@@ -2990,7 +2990,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
       }
     }
     includeValidation = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: "Include Zod inbound request validation?",
         initialValue: method !== "delete"
       })
@@ -2998,7 +2998,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
     if (includeValidation) {
       const defaultSource = method === "get" ? "query" : "body";
       validationSource = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "Validation data source:",
           options: [
             { value: "body", label: "req.body (for POST / PUT / PATCH payloads)" },
@@ -3012,8 +3012,8 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
         });
     }
   }
-  const s = p16.spinner();
-  s.start(`Generating HTTP handler '${pc16.cyan(className)}'...`);
+  const s = p19.spinner();
+  s.start(`Generating HTTP handler '${pc13.cyan(className)}'...`);
   const options = {
     name: className,
     feature,
@@ -3031,7 +3031,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   const files = generateHttpHandler(options);
   s.stop("HTTP handler generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p16.outro(pc16.green(`HTTP handler '${className}' created in feature '${feature}'!`));
+  p19.outro(pc13.green(`HTTP handler '${className}' created in feature '${feature}'!`));
 }
 function generateInjectableCode(className, dependencies = [], methods = [], implementsInterface) {
   const formattedDeps = dependencies.map((dep) => ({
@@ -3041,7 +3041,7 @@ function generateInjectableCode(className, dependencies = [], methods = [], impl
   const formattedMethods = methods.map((m) => {
     const isAsync = m.async !== false;
     const retType = m.returnType ? isAsync ? `Promise<${m.returnType}>` : m.returnType : isAsync ? "Promise<void>" : "void";
-    const params = m.params && m.params.length > 0 ? m.params.map((p19) => `${p19.name}: ${p19.type}`).join(", ") : "";
+    const params = m.params && m.params.length > 0 ? m.params.map((p22) => `${p22.name}: ${p22.type}`).join(", ") : "";
     return {
       name: m.name,
       isAsync,
@@ -3111,7 +3111,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let name = classNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p16.text({
+      await p19.text({
         message: "Injectable class name:",
         placeholder: "e.g. PasswordHasher, TokenService, UserTransformer",
         validate: (v) => v && v.trim() ? void 0 : "Class name cannot be empty"
@@ -3124,7 +3124,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let customPath;
   if (!flags.yes) {
     location = handleCancel(
-      await p16.select({
+      await p19.select({
         message: "Select target architectural location:",
         options: [
           { value: "feature-service", label: "Feature Service (features/<feature>/services/)" },
@@ -3142,14 +3142,14 @@ async function runInjectableCommand(classNameArg, flags = {}) {
           const featureOptions = existingFeatures.map((f) => ({ value: f, label: f }));
           featureOptions.push({ value: "__custom__", label: "\u270F\uFE0F  Enter custom feature name..." });
           const selected = handleCancel(
-            await p16.select({
+            await p19.select({
               message: "Select target feature:",
               options: featureOptions
             })
           );
           if (selected === "__custom__") {
             feature = handleCancel(
-              await p16.text({
+              await p19.text({
                 message: "Enter feature name:",
                 validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
               })
@@ -3159,7 +3159,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
           }
         } else {
           feature = handleCancel(
-            await p16.text({
+            await p19.text({
               message: "Enter target feature name:",
               validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
             })
@@ -3169,7 +3169,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
       feature = toCamelCase(feature);
     } else if (location === "custom") {
       customPath = handleCancel(
-        await p16.text({
+        await p19.text({
           message: "Enter destination directory path:",
           placeholder: "e.g. src/services or lib/utils",
           validate: (v) => v && v.trim() ? void 0 : "Path cannot be empty"
@@ -3180,14 +3180,14 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let generateInterface2 = false;
   if (!flags.yes) {
     generateInterface2 = handleCancel(
-      await p16.confirm({
+      await p19.confirm({
         message: `Generate abstract class interface (I${className}) as runtime DI token?`,
         initialValue: false
       })
     );
   }
-  const s = p16.spinner();
-  s.start(`Generating injectable '${pc16.cyan(className)}'...`);
+  const s = p19.spinner();
+  s.start(`Generating injectable '${pc13.cyan(className)}'...`);
   const options = {
     name: className,
     feature,
@@ -3201,17 +3201,17 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   const files = generateInjectable(options);
   s.stop("Injectable class generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p16.outro(pc16.green(`Injectable '${className}' created successfully!`));
+  p19.outro(pc13.green(`Injectable '${className}' created successfully!`));
 }
-async function runEnvCommand(flags = {}) {
+async function runEnvInit(flags = {}) {
   const projectRoot = flags.cwd || flags.targetDir || findProjectRoot();
-  const s = p16.spinner();
+  const s = p19.spinner();
   s.start("Scanning for .example environment files...");
-  const files = fs11.readdirSync(projectRoot);
+  const files = fs14.readdirSync(projectRoot);
   const exampleFiles = files.filter((file) => file.startsWith(".env") && file.endsWith(".example")).sort();
   if (exampleFiles.length === 0) {
     s.stop("No .example files found.");
-    p16.log.info(pc16.yellow(`No files matching '.env*.example' were found in ${projectRoot}`));
+    p19.log.info(pc13.yellow(`No files matching '.env*.example' were found in ${projectRoot}`));
     return [];
   }
   s.message(`Found ${exampleFiles.length} template(s). Generating...`);
@@ -3220,28 +3220,140 @@ async function runEnvCommand(flags = {}) {
     const sourcePath = path2.join(projectRoot, exampleFile);
     const targetFile = exampleFile.replace(/\.example$/, "");
     const targetPath = path2.join(projectRoot, targetFile);
-    const content = fs11.readFileSync(sourcePath, "utf-8");
+    let overwrite = flags.overwrite;
+    if (overwrite === void 0 && !flags.dryRun && !flags.yes && !process.env.VITEST && process.stdin.isTTY && fs14.existsSync(targetPath)) {
+      overwrite = await p19.confirm({
+        message: `${targetFile} already exists. Overwrite?`,
+        initialValue: false
+      });
+      if (p19.isCancel(overwrite)) {
+        p19.cancel("Operation cancelled.");
+        process.exit(0);
+      }
+    }
+    const content = fs14.readFileSync(sourcePath, "utf-8");
     const genFile = writeFileSafely(targetPath, content, {
       projectRoot,
       dryRun: Boolean(flags.dryRun),
-      overwrite: Boolean(flags.overwrite)
+      overwrite: Boolean(overwrite)
     });
     generatedFiles.push(genFile);
   }
   s.stop("Environment files processed!");
   printGeneratedFiles(generatedFiles, Boolean(flags.dryRun));
-  p16.outro(pc16.green("\u2713 Local environment files are ready!"));
+  p19.outro(pc13.green("\u2713 Local environment files are ready!"));
   return generatedFiles;
 }
-async function runEnvExamplesCommand(flags = {}) {
+var EnvEditor = class {
+  lines;
+  filePath;
+  constructor(filePath) {
+    this.filePath = filePath;
+    this.lines = fs14.existsSync(filePath) ? fs14.readFileSync(filePath, "utf-8").split(/\r?\n/) : [];
+  }
+  getLines() {
+    return [...this.lines];
+  }
+  getKeys() {
+    return this.lines.filter((line) => line.trim() && !line.trim().startsWith("#")).map((line) => {
+      const eqIdx = line.indexOf("=");
+      return eqIdx !== -1 ? line.substring(0, eqIdx).trim() : line.trim();
+    }).filter(Boolean);
+  }
+  getValue(key) {
+    const line = this.lines.find((l) => {
+      const trimmed = l.trim();
+      if (trimmed.startsWith("#") || !trimmed) return false;
+      const eqIdx = l.indexOf("=");
+      const k = eqIdx !== -1 ? l.substring(0, eqIdx).trim() : l.trim();
+      return k === key;
+    });
+    if (!line) return null;
+    const eqIndex = line.indexOf("=");
+    return eqIndex !== -1 ? line.substring(eqIndex + 1).trim() : "";
+  }
+  has(key) {
+    return this.getKeys().includes(key);
+  }
+  set(key, value) {
+    const newLine = `${key}=${value}`;
+    const index = this.lines.findIndex((l) => {
+      const trimmed = l.trim();
+      if (trimmed.startsWith("#") || !trimmed) return false;
+      const eqIdx = l.indexOf("=");
+      const k = eqIdx !== -1 ? l.substring(0, eqIdx).trim() : l.trim();
+      return k === key;
+    });
+    if (index !== -1) {
+      this.lines[index] = newLine;
+    } else {
+      if (this.lines.length > 0 && this.lines[this.lines.length - 1] !== "") {
+        this.lines.push("");
+      }
+      this.lines.push(newLine);
+    }
+  }
+  delete(key) {
+    const initialLen = this.lines.length;
+    this.lines = this.lines.filter((l) => {
+      const trimmed = l.trim();
+      if (trimmed.startsWith("#") || !trimmed) return true;
+      const eqIdx = l.indexOf("=");
+      const k = eqIdx !== -1 ? l.substring(0, eqIdx).trim() : l.trim();
+      return k !== key;
+    });
+    return this.lines.length !== initialLen;
+  }
+  redactAll() {
+    this.lines = this.lines.map((line) => {
+      const trimmed = line.trim();
+      if (trimmed.startsWith("#") || !trimmed) return line;
+      const eqIndex = line.indexOf("=");
+      return eqIndex !== -1 ? line.substring(0, eqIndex + 1) : line;
+    });
+  }
+  save() {
+    const dir = path2.dirname(this.filePath);
+    if (!fs14.existsSync(dir)) {
+      fs14.mkdirSync(dir, { recursive: true });
+    }
+    fs14.writeFileSync(this.filePath, this.lines.join("\n"), "utf-8");
+  }
+};
+function discoverEnvironments(projectRoot) {
+  if (!fs14.existsSync(projectRoot)) {
+    return ["local", "dev", "prod"];
+  }
+  const files = fs14.readdirSync(projectRoot);
+  const envs = /* @__PURE__ */ new Set();
+  for (const file of files) {
+    if (file.startsWith(".env")) {
+      const cleanName = file.replace(/\.example$/, "");
+      const match = cleanName.match(/^\.env\.([a-zA-Z0-9_-]+)$/);
+      if (match && match[1]) {
+        envs.add(match[1]);
+      } else if (cleanName === ".env") {
+        envs.add("local");
+      }
+    }
+  }
+  return envs.size > 0 ? Array.from(envs) : ["local", "dev", "prod"];
+}
+function resolveEnvFilename(envName, isExample = false) {
+  const base = envName === "local" ? ".env" : `.env.${envName}`;
+  return isExample ? `${base}.example` : base;
+}
+
+// src/commands/env/initExamples.ts
+async function runEnvInitExamples(flags = {}) {
   const projectRoot = flags.cwd || flags.targetDir || findProjectRoot();
-  const s = p16.spinner();
+  const s = p19.spinner();
   s.start("Scanning for local environment files...");
-  const files = fs11.readdirSync(projectRoot, { withFileTypes: true });
+  const files = fs14.readdirSync(projectRoot, { withFileTypes: true });
   const envFiles = files.filter((dirent) => dirent.isFile() && dirent.name.startsWith(".env") && !dirent.name.endsWith(".example")).map((dirent) => dirent.name).sort();
   if (envFiles.length === 0) {
     s.stop("No local .env files found.");
-    p16.log.info(pc16.yellow(`No files matching '.env*' were found in ${projectRoot}`));
+    p19.log.info(pc13.yellow(`No files matching '.env*' were found in ${projectRoot}`));
     return [];
   }
   s.message(`Found ${envFiles.length} local .env file(s). Generating templates...`);
@@ -3250,34 +3362,525 @@ async function runEnvExamplesCommand(flags = {}) {
     const sourcePath = path2.join(projectRoot, envFile);
     const targetFile = `${envFile}.example`;
     const targetPath = path2.join(projectRoot, targetFile);
-    const content = fs11.readFileSync(sourcePath, "utf-8");
-    const redactedContent = content.split(/\r?\n/).map((line) => {
-      const trimmed = line.trim();
-      if (trimmed.startsWith("#") || !trimmed) return line;
-      const eqIndex = line.indexOf("=");
-      if (eqIndex !== -1) {
-        return line.substring(0, eqIndex + 1);
+    let overwrite = flags.overwrite;
+    if (overwrite === void 0 && !flags.dryRun && !flags.yes && !process.env.VITEST && process.stdin.isTTY && fs14.existsSync(targetPath)) {
+      overwrite = await p19.confirm({
+        message: `${targetFile} already exists. Overwrite with redacted values?`,
+        initialValue: true
+      });
+      if (p19.isCancel(overwrite)) {
+        p19.cancel("Operation cancelled.");
+        process.exit(0);
       }
-      return line;
-    }).join("\n");
+    }
+    const editor = new EnvEditor(sourcePath);
+    editor.redactAll();
+    const redactedContent = editor.getLines().join("\n");
     const genFile = writeFileSafely(targetPath, redactedContent, {
       projectRoot,
       dryRun: Boolean(flags.dryRun),
-      overwrite: Boolean(flags.overwrite)
+      overwrite: Boolean(overwrite)
     });
     generatedFiles.push(genFile);
   }
   s.stop("Environment example templates generated!");
   printGeneratedFiles(generatedFiles, Boolean(flags.dryRun));
-  p16.outro(pc16.green("\u2713 .env*.example files are up to date and safely redacted!"));
+  p19.outro(pc13.green("\u2713 .env*.example files are up to date and safely redacted!"));
   return generatedFiles;
 }
+function isInteractive(flags) {
+  if (flags.yes || Boolean(flags.nonInteractive)) return false;
+  if (process.env.VITEST) return false;
+  return Boolean(process.stdin.isTTY);
+}
+function getAllExistingKeys(projectRoot, envs) {
+  const keys = /* @__PURE__ */ new Set();
+  for (const env of envs) {
+    const localPath = path2.join(projectRoot, resolveEnvFilename(env, false));
+    const examplePath = path2.join(projectRoot, resolveEnvFilename(env, true));
+    if (fs14.existsSync(localPath)) {
+      new EnvEditor(localPath).getKeys().forEach((k) => keys.add(k));
+    }
+    if (fs14.existsSync(examplePath)) {
+      new EnvEditor(examplePath).getKeys().forEach((k) => keys.add(k));
+    }
+  }
+  return Array.from(keys).sort();
+}
+async function runEnvAdd(key, value, flags = {}) {
+  const projectRoot = flags.cwd || flags.targetDir || findProjectRoot();
+  const allEnvs = discoverEnvironments(projectRoot);
+  let targetKey = key?.trim();
+  if (!targetKey) {
+    if (!isInteractive(flags)) {
+      throw new Error("Variable key is required for 'mason env add <key> [value]'");
+    }
+    targetKey = handleCancel(
+      await p19.text({
+        message: "Enter the variable key name:",
+        placeholder: "e.g. DATABASE_URL, STRIPE_KEY, PORT",
+        validate: (val) => {
+          if (!val || !val.trim()) return "Variable key name cannot be empty";
+          if (/\s/.test(val.trim())) return "Variable key cannot contain spaces";
+          if (val.includes("=")) return "Variable key cannot contain '='";
+          return void 0;
+        }
+      })
+    ).trim();
+  }
+  let targetEnvs = [];
+  if (flags.env) {
+    targetEnvs = String(flags.env).split(",").map((s) => s.trim()).filter(Boolean);
+  } else if (!isInteractive(flags)) {
+    targetEnvs = allEnvs;
+  } else {
+    targetEnvs = handleCancel(
+      await p19.multiselect({
+        message: `Which environments should receive ${pc13.bold(targetKey)}?`,
+        options: allEnvs.map((env) => ({
+          value: env,
+          label: env === "local" ? "local (.env)" : `${env} (.env.${env})`
+        })),
+        initialValues: allEnvs,
+        required: true
+      })
+    );
+  }
+  if (targetEnvs.length === 0) {
+    p19.log.warn("No environments selected. Nothing was changed.");
+    return { key: targetKey, environments: [] };
+  }
+  for (const env of targetEnvs) {
+    let envVal = value;
+    if (envVal === void 0) {
+      if (!isInteractive(flags)) {
+        envVal = "";
+      } else {
+        envVal = handleCancel(
+          await p19.text({
+            message: `Value for ${pc13.cyan(targetKey)} in ${pc13.bold(env)} (${resolveEnvFilename(env)})?`,
+            initialValue: "",
+            placeholder: "Leave empty for blank value"
+          })
+        );
+      }
+    } else if (isInteractive(flags) && !flags.yes) {
+      envVal = handleCancel(
+        await p19.text({
+          message: `Value for ${pc13.cyan(targetKey)} in ${pc13.bold(env)} (${resolveEnvFilename(env)})?`,
+          initialValue: value ?? "",
+          placeholder: "Leave empty for blank value"
+        })
+      );
+    }
+    const localPath = path2.join(projectRoot, resolveEnvFilename(env, false));
+    const examplePath = path2.join(projectRoot, resolveEnvFilename(env, true));
+    if (flags.dryRun) {
+      p19.log.info(
+        pc13.cyan(`[DRY RUN] Would set ${targetKey}=${envVal} in ${resolveEnvFilename(env, false)}`)
+      );
+      p19.log.info(
+        pc13.cyan(`[DRY RUN] Would add ${targetKey}= to ${resolveEnvFilename(env, true)}`)
+      );
+    } else {
+      const localEditor = new EnvEditor(localPath);
+      localEditor.set(targetKey, envVal);
+      localEditor.save();
+      const exampleEditor = new EnvEditor(examplePath);
+      exampleEditor.set(targetKey, "");
+      exampleEditor.save();
+    }
+  }
+  if (!flags.dryRun) {
+    p19.log.success(
+      pc13.green(
+        `\u2713 Added ${pc13.bold(targetKey)} to [${targetEnvs.join(", ")}] and updated .example templates.`
+      )
+    );
+  }
+  return { key: targetKey, environments: targetEnvs };
+}
+async function runEnvUpdate(key, value, flags = {}) {
+  const projectRoot = flags.cwd || flags.targetDir || findProjectRoot();
+  const allEnvs = discoverEnvironments(projectRoot);
+  const existingKeys = getAllExistingKeys(projectRoot, allEnvs);
+  let targetKey = key?.trim();
+  if (!targetKey) {
+    if (!isInteractive(flags)) {
+      throw new Error("Variable key is required for 'mason env update <key> [value]'");
+    }
+    if (existingKeys.length === 0) {
+      p19.log.error(pc13.red("No environment variables found to update."));
+      return { key: "", environments: [] };
+    }
+    targetKey = handleCancel(
+      await p19.select({
+        message: "Select a variable to update:",
+        options: existingKeys.map((k) => ({ value: k, label: k }))
+      })
+    );
+  }
+  const envsWithKey = allEnvs.filter((env) => {
+    const localPath = path2.join(projectRoot, resolveEnvFilename(env, false));
+    return fs14.existsSync(localPath) && new EnvEditor(localPath).has(targetKey);
+  });
+  let targetEnvs = [];
+  if (flags.env) {
+    targetEnvs = String(flags.env).split(",").map((s) => s.trim()).filter(Boolean);
+  } else if (!isInteractive(flags)) {
+    targetEnvs = envsWithKey.length > 0 ? envsWithKey : allEnvs;
+  } else {
+    targetEnvs = handleCancel(
+      await p19.multiselect({
+        message: `Which environments should be updated for ${pc13.bold(targetKey)}?`,
+        options: allEnvs.map((env) => ({
+          value: env,
+          label: env === "local" ? "local (.env)" : `${env} (.env.${env})`,
+          hint: envsWithKey.includes(env) ? "currently exists" : "not set"
+        })),
+        initialValues: envsWithKey.length > 0 ? envsWithKey : allEnvs,
+        required: true
+      })
+    );
+  }
+  if (targetEnvs.length === 0) {
+    p19.log.warn("No environments selected. Nothing was changed.");
+    return { key: targetKey, environments: [] };
+  }
+  for (const env of targetEnvs) {
+    const localPath = path2.join(projectRoot, resolveEnvFilename(env, false));
+    const localEditor = new EnvEditor(localPath);
+    const currentVal = localEditor.getValue(targetKey);
+    let newVal = value;
+    if (newVal === void 0) {
+      if (!isInteractive(flags)) {
+        newVal = currentVal ?? "";
+      } else {
+        newVal = handleCancel(
+          await p19.text({
+            message: `New value for ${pc13.cyan(targetKey)} in ${pc13.bold(env)}? (Current: "${currentVal ?? ""}")`,
+            initialValue: currentVal ?? ""
+          })
+        );
+      }
+    } else if (isInteractive(flags) && !flags.yes) {
+      newVal = handleCancel(
+        await p19.text({
+          message: `New value for ${pc13.cyan(targetKey)} in ${pc13.bold(env)}? (Current: "${currentVal ?? ""}")`,
+          initialValue: value ?? currentVal ?? ""
+        })
+      );
+    }
+    if (flags.dryRun) {
+      p19.log.info(
+        pc13.cyan(`[DRY RUN] Would update ${targetKey}=${newVal} in ${resolveEnvFilename(env, false)}`)
+      );
+    } else {
+      localEditor.set(targetKey, newVal);
+      localEditor.save();
+      const examplePath = path2.join(projectRoot, resolveEnvFilename(env, true));
+      const exampleEditor = new EnvEditor(examplePath);
+      if (!exampleEditor.has(targetKey)) {
+        exampleEditor.set(targetKey, "");
+        exampleEditor.save();
+      }
+    }
+  }
+  if (!flags.dryRun) {
+    p19.log.success(
+      pc13.green(`\u2713 Updated ${pc13.bold(targetKey)} in [${targetEnvs.join(", ")}].`)
+    );
+  }
+  return { key: targetKey, environments: targetEnvs };
+}
+async function runEnvDelete(key, flags = {}) {
+  const projectRoot = flags.cwd || flags.targetDir || findProjectRoot();
+  const allEnvs = discoverEnvironments(projectRoot);
+  const existingKeys = getAllExistingKeys(projectRoot, allEnvs);
+  let targetKey = key?.trim();
+  if (!targetKey) {
+    if (!isInteractive(flags)) {
+      throw new Error("Variable key is required for 'mason env delete <key>'");
+    }
+    if (existingKeys.length === 0) {
+      p19.log.error(pc13.red("No environment variables found to delete."));
+      return { key: "", environments: [] };
+    }
+    targetKey = handleCancel(
+      await p19.select({
+        message: "Select a variable to delete:",
+        options: existingKeys.map((k) => ({ value: k, label: k }))
+      })
+    );
+  }
+  const envsWithKey = allEnvs.filter((env) => {
+    const localPath = path2.join(projectRoot, resolveEnvFilename(env, false));
+    const examplePath = path2.join(projectRoot, resolveEnvFilename(env, true));
+    return fs14.existsSync(localPath) && new EnvEditor(localPath).has(targetKey) || fs14.existsSync(examplePath) && new EnvEditor(examplePath).has(targetKey);
+  });
+  let targetEnvs = [];
+  if (flags.env) {
+    targetEnvs = String(flags.env).split(",").map((s) => s.trim()).filter(Boolean);
+  } else if (!isInteractive(flags)) {
+    targetEnvs = envsWithKey.length > 0 ? envsWithKey : allEnvs;
+  } else {
+    targetEnvs = handleCancel(
+      await p19.multiselect({
+        message: `Which environments should remove ${pc13.bold(targetKey)}?`,
+        options: allEnvs.map((env) => ({
+          value: env,
+          label: env === "local" ? "local (.env)" : `${env} (.env.${env})`,
+          ...envsWithKey.includes(env) ? { hint: "currently present" } : {}
+        })),
+        initialValues: envsWithKey.length > 0 ? envsWithKey : allEnvs,
+        required: true
+      })
+    );
+  }
+  if (targetEnvs.length === 0) {
+    p19.log.warn("No environments selected. Nothing was deleted.");
+    return { key: targetKey, environments: [] };
+  }
+  if (isInteractive(flags) && !flags.yes) {
+    const confirm13 = handleCancel(
+      await p19.confirm({
+        message: `Are you sure you want to delete ${pc13.bold(targetKey)} from ${targetEnvs.join(", ")} and their .example templates?`,
+        initialValue: false
+      })
+    );
+    if (!confirm13) {
+      p19.log.warn("Operation cancelled.");
+      return { key: targetKey, environments: [] };
+    }
+  }
+  for (const env of targetEnvs) {
+    const localPath = path2.join(projectRoot, resolveEnvFilename(env, false));
+    const examplePath = path2.join(projectRoot, resolveEnvFilename(env, true));
+    if (flags.dryRun) {
+      p19.log.info(
+        pc13.cyan(`[DRY RUN] Would delete ${targetKey} from ${resolveEnvFilename(env, false)} and ${resolveEnvFilename(env, true)}`)
+      );
+    } else {
+      if (fs14.existsSync(localPath)) {
+        const localEditor = new EnvEditor(localPath);
+        localEditor.delete(targetKey);
+        localEditor.save();
+      }
+      if (fs14.existsSync(examplePath)) {
+        const exampleEditor = new EnvEditor(examplePath);
+        exampleEditor.delete(targetKey);
+        exampleEditor.save();
+      }
+    }
+  }
+  if (!flags.dryRun) {
+    p19.log.success(
+      pc13.green(`\u2713 Deleted ${pc13.bold(targetKey)} from [${targetEnvs.join(", ")}] and .example templates.`)
+    );
+  }
+  return { key: targetKey, environments: targetEnvs };
+}
+async function runEnvAudit(flags = {}) {
+  const projectRoot = flags.cwd || flags.targetDir || findProjectRoot();
+  const envs = discoverEnvironments(projectRoot);
+  p19.intro(pc13.bgCyan(pc13.black(" mason env audit ")));
+  const items = [];
+  let totalIssues = 0;
+  let hasDrift = false;
+  let hasErrors = false;
+  for (const env of envs) {
+    const localFile = resolveEnvFilename(env, false);
+    const exampleFile = resolveEnvFilename(env, true);
+    const localPath = path2.join(projectRoot, localFile);
+    const examplePath = path2.join(projectRoot, exampleFile);
+    const localExists = fs14.existsSync(localPath);
+    const exampleExists = fs14.existsSync(examplePath);
+    const localEditor = new EnvEditor(localPath);
+    const exampleEditor = new EnvEditor(examplePath);
+    const localKeys = localExists ? localEditor.getKeys() : [];
+    const exampleKeys = exampleExists ? exampleEditor.getKeys() : [];
+    const missingInLocal = exampleKeys.filter((k) => !localKeys.includes(k));
+    const missingInExample = localKeys.filter((k) => !exampleKeys.includes(k));
+    const emptyLocals = localKeys.filter((k) => {
+      const val = localEditor.getValue(k);
+      return val === "" || val === null;
+    });
+    const envIssues = (!localExists ? 1 : 0) + (!exampleExists ? 1 : 0) + missingInLocal.length + missingInExample.length + emptyLocals.length;
+    totalIssues += envIssues;
+    if (missingInExample.length > 0 || !exampleExists) hasDrift = true;
+    if (missingInLocal.length > 0 || !localExists) hasErrors = true;
+    items.push({
+      env,
+      localFile,
+      exampleFile,
+      localExists,
+      exampleExists,
+      missingInLocal,
+      missingInExample,
+      emptyLocals
+    });
+    if (!localExists && !exampleExists) {
+      p19.log.warn(
+        pc13.yellow(`\u25B2 ${pc13.bold(env)}: Neither '${localFile}' nor '${exampleFile}' exist.`)
+      );
+      continue;
+    }
+    if (!localExists) {
+      p19.log.error(
+        pc13.red(`\u2717 ${pc13.bold(env)}: Local file '${localFile}' is missing! Run 'mason env init' to create it.`)
+      );
+      continue;
+    }
+    if (!exampleExists) {
+      p19.log.warn(
+        pc13.yellow(`\u25B2 ${pc13.bold(env)}: Template '${exampleFile}' is missing! Run 'mason env init-examples' to generate it.`)
+      );
+      continue;
+    }
+    if (envIssues === 0) {
+      p19.log.success(
+        pc13.green(`\u2713 ${pc13.bold(env)} (${localFile} \u2194 ${exampleFile}): All ${localKeys.length} keys in sync!`)
+      );
+    } else {
+      p19.log.step(
+        pc13.bold(pc13.cyan(`Environment: ${env} (${localFile} \u2194 ${exampleFile})`))
+      );
+      if (missingInLocal.length > 0) {
+        p19.log.error(
+          pc13.red(`  \u25CF Missing locally (${missingInLocal.length} in template but missing in ${localFile}):`)
+        );
+        for (const k of missingInLocal) {
+          p19.log.message(pc13.red(`    - ${k}`));
+        }
+      }
+      if (missingInExample.length > 0) {
+        p19.log.warn(
+          pc13.yellow(`  \u25CF Template drift (${missingInExample.length} local keys missing in ${exampleFile}):`)
+        );
+        for (const k of missingInExample) {
+          p19.log.message(pc13.yellow(`    - ${k}`));
+        }
+      }
+      if (emptyLocals.length > 0) {
+        p19.log.info(
+          pc13.dim(`  \u25B2 Empty values (${emptyLocals.length} defined with blank value in ${localFile}):`)
+        );
+        for (const k of emptyLocals) {
+          p19.log.message(pc13.dim(`    - ${k}`));
+        }
+      }
+    }
+  }
+  if (totalIssues === 0) {
+    p19.outro(pc13.green("\u2713 All environment files are in sync! No drift detected."));
+  } else {
+    p19.outro(
+      pc13.yellow(`Found ${totalIssues} environment issue(s) across inspected environments.`)
+    );
+  }
+  return {
+    hasDrift,
+    hasErrors,
+    totalIssues,
+    items
+  };
+}
+
+// src/commands/env/index.ts
+async function runEnvMenu(flags = {}) {
+  const task = handleCancel(
+    await p19.select({
+      message: "What environment task do you want to run?",
+      options: [
+        {
+          value: "add",
+          label: "Add Variable",
+          hint: "Add a new key across selected environments and sync .example templates"
+        },
+        {
+          value: "update",
+          label: "Update Variable",
+          hint: "Update an existing variable value across environments"
+        },
+        {
+          value: "delete",
+          label: "Delete Variable",
+          hint: "Delete a variable from .env and .example files"
+        },
+        {
+          value: "audit",
+          label: "Audit Drift",
+          hint: "Scan for missing keys, uncommitted secrets, or template drift"
+        },
+        {
+          value: "init",
+          label: "Init Files (.env)",
+          hint: "Clone .env*.example templates to local .env files"
+        },
+        {
+          value: "init-examples",
+          label: "Init Templates (.env.example)",
+          hint: "Safely clone and redact local .env files to .example templates"
+        }
+      ]
+    })
+  );
+  switch (task) {
+    case "add":
+      return await runEnvAdd(void 0, void 0, flags);
+    case "update":
+      return await runEnvUpdate(void 0, void 0, flags);
+    case "delete":
+      return await runEnvDelete(void 0, flags);
+    case "audit":
+      return await runEnvAudit(flags);
+    case "init":
+      return await runEnvInit(flags);
+    case "init-examples":
+      return await runEnvInitExamples(flags);
+  }
+}
+async function handleEnv(subcommand, args = [], flags = {}) {
+  if (!subcommand) {
+    return await runEnvMenu(flags);
+  }
+  const normalized = subcommand.trim().toLowerCase();
+  switch (normalized) {
+    case "init":
+      return await runEnvInit(flags);
+    case "init-examples":
+    case "initexamples":
+      return await runEnvInitExamples(flags);
+    case "add":
+      return await runEnvAdd(args[0], args[1], flags);
+    case "update":
+      return await runEnvUpdate(args[0], args[1], flags);
+    case "delete":
+    case "remove":
+    case "rm":
+      return await runEnvDelete(args[0], flags);
+    case "audit":
+      return await runEnvAudit(flags);
+    default:
+      p19.log.error(
+        pc13.red(
+          `Unknown env subcommand: "${subcommand}". Allowed subcommands: init, init-examples, add, update, delete, audit.`
+        )
+      );
+      if (process.env.VITEST) {
+        throw new Error(
+          `Unknown env subcommand: "${subcommand}". Allowed subcommands: init, init-examples, add, update, delete, audit.`
+        );
+      }
+      process.exit(1);
+  }
+}
 
 // src/commands/menu.ts
 async function runInteractiveMenu(flags = {}) {
   printBanner();
   const choice = handleCancel(
-    await p16.select({
+    await p19.select({
       message: "What would you like to create in your architecture?",
       options: [
         {
@@ -3322,13 +3925,8 @@ async function runInteractiveMenu(flags = {}) {
         },
         {
           value: "env",
-          label: "Generate Env Files",
-          hint: "Clone .env*.example files to local .env equivalents (Setup)"
-        },
-        {
-          value: "envExamples",
-          label: "Sync Env Examples",
-          hint: "Safely clone and redact local .env files to .example templates (Sync)"
+          label: "Environment Variables",
+          hint: "Manage .env files, add/delete keys, and sync templates"
         }
       ]
     })
@@ -3359,10 +3957,7 @@ async function runInteractiveMenu(flags = {}) {
       await runInjectableCommand(void 0, flags);
       break;
     case "env":
-      await runEnvCommand(flags);
-      break;
-    case "envExamples":
-      await runEnvExamplesCommand({ ...flags, overwrite: flags.overwrite ?? true });
+      await runEnvMenu(flags);
       break;
   }
 }
@@ -3401,8 +3996,8 @@ async function handleCreate(type, name, flags = {}) {
       await runInjectableCommand(name, flags);
       break;
     default:
-      p16.log.error(
-        pc16.red(
+      p19.log.error(
+        pc13.red(
           `Unknown component type: "${type}". Allowed types: feature, shared, usecase, domain, infrastructure, interface, httpHandler, injectable.`
         )
       );
@@ -3434,7 +4029,7 @@ function findLocalRegistry(startDir = process.cwd()) {
   let current = path2.resolve(startDir);
   while (true) {
     const candidate = path2.join(current, "mason-registry");
-    if (fs11.existsSync(candidate) && fs11.existsSync(path2.join(candidate, "index.json"))) {
+    if (fs14.existsSync(candidate) && fs14.existsSync(path2.join(candidate, "index.json"))) {
       return candidate;
     }
     const parent = path2.dirname(current);
@@ -3456,9 +4051,9 @@ function getRegistryBase(projectRoot, override) {
     path2.join(process.cwd(), "mason.config.json")
   ];
   for (const configPath of configLocations) {
-    if (fs11.existsSync(configPath)) {
+    if (fs14.existsSync(configPath)) {
       try {
-        const config = JSON.parse(fs11.readFileSync(configPath, "utf-8"));
+        const config = JSON.parse(fs14.readFileSync(configPath, "utf-8"));
         if (config.registry && typeof config.registry === "string") {
           return normalizeRegistryUrl(config.registry.trim(), path2.dirname(configPath));
         }
@@ -3471,9 +4066,9 @@ function getRegistryBase(projectRoot, override) {
     path2.join(process.cwd(), "package.json")
   ];
   for (const pkgPath of pkgLocations) {
-    if (fs11.existsSync(pkgPath)) {
+    if (fs14.existsSync(pkgPath)) {
       try {
-        const pkg = JSON.parse(fs11.readFileSync(pkgPath, "utf-8"));
+        const pkg = JSON.parse(fs14.readFileSync(pkgPath, "utf-8"));
         if (pkg.mason?.registry && typeof pkg.mason.registry === "string") {
           return normalizeRegistryUrl(pkg.mason.registry.trim(), path2.dirname(pkgPath));
         }
@@ -3524,15 +4119,15 @@ async function fetchRegistryFile(registryBase, relPath) {
     baseDir = fileURLToPath(baseDir);
   }
   let filePath = path2.resolve(baseDir, cleanRelPath);
-  if (!fs11.existsSync(filePath)) {
+  if (!fs14.existsSync(filePath)) {
     const inSrcPath = path2.resolve(baseDir, "src", cleanRelPath);
-    if (fs11.existsSync(inSrcPath)) {
+    if (fs14.existsSync(inSrcPath)) {
       filePath = inSrcPath;
     } else {
       throw new Error(`Registry file not found at ${filePath}`);
     }
   }
-  return fs11.promises.readFile(filePath, "utf-8");
+  return fs14.promises.readFile(filePath, "utf-8");
 }
 async function fetchRegistryIndex(registryBase) {
   const content = await fetchRegistryFile(registryBase, "index.json");
@@ -3594,26 +4189,26 @@ function findClosestMatch(target, candidates) {
   return null;
 }
 function detectPackageManager(projectRoot) {
-  if (fs11.existsSync(path2.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs11.existsSync(path2.join(projectRoot, "yarn.lock"))) return "yarn";
-  if (fs11.existsSync(path2.join(projectRoot, "bun.lockb")) || fs11.existsSync(path2.join(projectRoot, "bun.lock"))) return "bun";
+  if (fs14.existsSync(path2.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs14.existsSync(path2.join(projectRoot, "yarn.lock"))) return "yarn";
+  if (fs14.existsSync(path2.join(projectRoot, "bun.lockb")) || fs14.existsSync(path2.join(projectRoot, "bun.lock"))) return "bun";
   return "npm";
 }
 function getMissingNpmPackages(projectRoot, requiredPackages) {
   if (!requiredPackages || requiredPackages.length === 0) return [];
   const pkgJsonPath = path2.join(projectRoot, "package.json");
-  if (!fs11.existsSync(pkgJsonPath)) {
+  if (!fs14.existsSync(pkgJsonPath)) {
     return requiredPackages;
   }
   try {
-    const pkg = JSON.parse(fs11.readFileSync(pkgJsonPath, "utf-8"));
+    const pkg = JSON.parse(fs14.readFileSync(pkgJsonPath, "utf-8"));
     const installed = /* @__PURE__ */ new Set([
       ...Object.keys(pkg.dependencies || {}),
       ...Object.keys(pkg.devDependencies || {}),
       ...Object.keys(pkg.peerDependencies || {})
     ]);
-    return requiredPackages.filter((p19) => {
-      const nameOnly = p19.startsWith("@") ? `@${p19.slice(1).split("@")[0] || ""}` : p19.split("@")[0] || p19;
+    return requiredPackages.filter((p22) => {
+      const nameOnly = p22.startsWith("@") ? `@${p22.slice(1).split("@")[0] || ""}` : p22.split("@")[0] || p22;
       return !installed.has(nameOnly);
     });
   } catch {
@@ -3638,15 +4233,15 @@ function installNpmPackages(projectRoot, packages, pm) {
       installCmd = `npm install ${packages.join(" ")}`;
       break;
   }
-  p16.log.info(`Installing missing dependencies with ${manager}: ${pc16.cyan(packages.join(", "))}`);
+  p19.log.info(`Installing missing dependencies with ${manager}: ${pc13.cyan(packages.join(", "))}`);
   execSync(installCmd, {
     cwd: projectRoot,
     stdio: "inherit"
   });
 }
 function getAllFiles(dir, baseDir = dir) {
-  if (!fs11.existsSync(dir)) return [];
-  const entries = fs11.readdirSync(dir, { withFileTypes: true });
+  if (!fs14.existsSync(dir)) return [];
+  const entries = fs14.readdirSync(dir, { withFileTypes: true });
   const files = [];
   for (const entry of entries) {
     const fullPath = path2.join(dir, entry.name);
@@ -3666,13 +4261,13 @@ function getAllFiles(dir, baseDir = dir) {
   return files.sort();
 }
 function computeDirectoryHash(dirPath, files) {
-  if (!fs11.existsSync(dirPath)) return "";
+  if (!fs14.existsSync(dirPath)) return "";
   const hash = createHash("sha256");
   const fileList = (getAllFiles(dirPath)).sort();
   for (const relativePath of fileList) {
     const absolutePath = path2.join(dirPath, relativePath);
-    if (!fs11.existsSync(absolutePath)) continue;
-    const content = fs11.readFileSync(absolutePath, "utf8");
+    if (!fs14.existsSync(absolutePath)) continue;
+    const content = fs14.readFileSync(absolutePath, "utf8");
     const normalizedContent = content.replace(/\r\n/g, "\n");
     hash.update(relativePath);
     hash.update(normalizedContent);
@@ -3682,9 +4277,9 @@ function computeDirectoryHash(dirPath, files) {
 
 // src/commands/import.ts
 var importPrompts = {
-  select: p16.select,
-  text: p16.text,
-  confirm: p16.confirm
+  select: p19.select,
+  text: p19.text,
+  confirm: p19.confirm
 };
 function isTestFile(filePath) {
   const normalized = filePath.replace(/\\/g, "/");
@@ -3716,11 +4311,11 @@ function getExistingModuleDir(projectRoot, modType, modName) {
   const folder = modType === "shared" ? "shared" : "features";
   const configuredDir = modType === "shared" ? getConfiguredSharedDir(projectRoot) : getConfiguredFeaturesDir(projectRoot);
   const inConfigured = path2.join(configuredDir, modName);
-  if (fs11.existsSync(inConfigured)) return inConfigured;
+  if (fs14.existsSync(inConfigured)) return inConfigured;
   const inSrc = path2.join(projectRoot, "src", folder, modName);
-  if (fs11.existsSync(inSrc)) return inSrc;
+  if (fs14.existsSync(inSrc)) return inSrc;
   const inRoot = path2.join(projectRoot, folder, modName);
-  if (fs11.existsSync(inRoot)) return inRoot;
+  if (fs14.existsSync(inRoot)) return inRoot;
   return null;
 }
 function checkModuleExists(projectRoot, modType, modName) {
@@ -3736,9 +4331,9 @@ function getAvailableLocalModules(projectRoot, modType) {
   ];
   const set = /* @__PURE__ */ new Set();
   for (const dir of dirs) {
-    if (fs11.existsSync(dir)) {
+    if (fs14.existsSync(dir)) {
       try {
-        const entries = fs11.readdirSync(dir, { withFileTypes: true });
+        const entries = fs14.readdirSync(dir, { withFileTypes: true });
         for (const e of entries) {
           if (e.isDirectory() && !e.name.startsWith(".")) {
             set.add(e.name);
@@ -3794,19 +4389,19 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     );
   }
   if (type !== "shared" && type !== "feature") {
-    p16.log.error(pc16.red(`Invalid module type: "${typeArg}". Must be "shared" or "feature".`));
+    p19.log.error(pc13.red(`Invalid module type: "${typeArg}". Must be "shared" or "feature".`));
     process.exit(1);
   }
   const registryBase = getRegistryBase(projectRoot, flags.registry);
-  const s = p16.spinner();
-  s.start(`Connecting to registry at ${pc16.dim(registryBase)}...`);
+  const s = p19.spinner();
+  s.start(`Connecting to registry at ${pc13.dim(registryBase)}...`);
   let index;
   try {
     index = await fetchRegistryIndex(registryBase);
     s.stop("Registry index loaded.");
   } catch (err) {
-    s.stop(pc16.red("Failed to load registry index."));
-    p16.log.error(pc16.red(err.message || String(err)));
+    s.stop(pc13.red("Failed to load registry index."));
+    p19.log.error(pc13.red(err.message || String(err)));
     process.exit(1);
   }
   const availableList = type === "shared" ? index.shared : index.features;
@@ -3814,7 +4409,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
   let name = nameArg?.trim();
   if (!name) {
     if (availableList.length === 0) {
-      p16.log.warn(`No ${type} modules available in the registry.`);
+      p19.log.warn(`No ${type} modules available in the registry.`);
       return;
     }
     name = handleCancel(
@@ -3830,9 +4425,9 @@ async function handleImport(typeArg, nameArg, flags = {}) {
   }
   if (!candidateNames.includes(name)) {
     const closest = findClosestMatch(name, candidateNames);
-    p16.log.error(pc16.red(`\u274C Module '${name}' not found in the ${type} registry.`));
+    p19.log.error(pc13.red(`\u274C Module '${name}' not found in the ${type} registry.`));
     if (closest) {
-      p16.log.info(pc16.yellow(`Did you mean '${pc16.cyan(closest)}'?`));
+      p19.log.info(pc13.yellow(`Did you mean '${pc13.cyan(closest)}'?`));
     }
     process.exit(1);
   }
@@ -3844,7 +4439,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     try {
       manifest = await fetchModuleManifest(registryBase, modType, modName);
     } catch (err) {
-      p16.log.error(pc16.red(`Failed to fetch manifest for ${modType} '${modName}': ${err.message}`));
+      p19.log.error(pc13.red(`Failed to fetch manifest for ${modType} '${modName}': ${err.message}`));
       process.exit(1);
     }
     nodes.set(key, {
@@ -3884,7 +4479,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
   buildTopologicalOrder(rootKey);
   const resolutions = /* @__PURE__ */ new Map();
   const globalAliasMap = /* @__PURE__ */ new Map();
-  p16.log.step(`Importing ${type}: ${pc16.cyan(name)}...`);
+  p19.log.step(`Importing ${type}: ${pc13.cyan(name)}...`);
   for (const key of orderedKeys) {
     const node = nodes.get(key);
     const { type: modType, name: registryName, manifest } = node;
@@ -3916,8 +4511,8 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     const programmaticPointTo = pointToMap[registryName] || pointToMap[`${modType}/${registryName}`];
     if (programmaticPointTo) {
       if (!checkModuleExists(projectRoot, modType, programmaticPointTo)) {
-        p16.log.error(
-          pc16.red(
+        p19.log.error(
+          pc13.red(
             `Module '${programmaticPointTo}' specified in --point-to does not exist in ${folder}.`
           )
         );
@@ -3925,7 +4520,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       }
       globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${programmaticPointTo}/`);
       globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${programmaticPointTo}`);
-      p16.log.step(`Pointing '${modType}/${registryName}' to existing '${folder}/${programmaticPointTo}'`);
+      p19.log.step(`Pointing '${modType}/${registryName}' to existing '${folder}/${programmaticPointTo}'`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -3941,7 +4536,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${programmaticAlias}`);
       const baseDir = getModuleBaseDir(projectRoot, modType);
       const displayDest = path2.relative(projectRoot, path2.join(baseDir, programmaticAlias));
-      p16.log.step(`Importing '${registryName}' into '${displayDest}'...`);
+      p19.log.step(`Importing '${registryName}' into '${displayDest}'...`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -3953,7 +4548,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     }
     const existingDir = getExistingModuleDir(projectRoot, modType, registryName);
     if (!existingDir) {
-      p16.log.info(`  \u21B3 Resolving required ${modType} dependency: ${pc16.cyan(registryName)}`);
+      p19.log.info(`  \u21B3 Resolving required ${modType} dependency: ${pc13.cyan(registryName)}`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -3969,7 +4564,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     const remoteIntegrity = manifest.integrity || entry?.integrity;
     const localHash = computeDirectoryHash(existingDir);
     if (remoteIntegrity && localHash === remoteIntegrity) {
-      p16.log.step(`\u2713 ${modType}/${registryName} is up to date (reusing existing)`);
+      p19.log.step(`\u2713 ${modType}/${registryName} is up to date (reusing existing)`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -3980,7 +4575,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       continue;
     }
     if (flags.overwrite) {
-      p16.log.step(`Overwriting '${modType}/${registryName}' with registry version (--overwrite)...`);
+      p19.log.step(`Overwriting '${modType}/${registryName}' with registry version (--overwrite)...`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -3991,7 +4586,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       continue;
     }
     if (flags.yes) {
-      p16.log.info(`Using existing '${modType}/${registryName}'`);
+      p19.log.info(`Using existing '${modType}/${registryName}'`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -4025,7 +4620,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       })
     );
     if (choice === "keep_existing" || choice === "use_existing") {
-      p16.log.step(`Skipping '${modType}/${registryName}' (keeping existing)`);
+      p19.log.step(`Skipping '${modType}/${registryName}' (keeping existing)`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -4097,7 +4692,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       chosenName = chosenName.replace(/^@\/(shared|features)\//, "").replace(/^(src\/)?(shared|features)\//, "").replace(/^\/+|\/+$/g, "").trim();
       globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${chosenName}/`);
       globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${chosenName}`);
-      p16.log.step(`Pointing '${modType}/${registryName}' to existing '${folder}/${chosenName}'`);
+      p19.log.step(`Pointing '${modType}/${registryName}' to existing '${folder}/${chosenName}'`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -4129,7 +4724,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${newName}`);
       const baseDir = getModuleBaseDir(projectRoot, modType);
       const displayDest = path2.relative(projectRoot, path2.join(baseDir, newName));
-      p16.log.step(`Importing '${registryName}' into '${displayDest}'...`);
+      p19.log.step(`Importing '${registryName}' into '${displayDest}'...`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -4140,7 +4735,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       continue;
     }
     if (choice === "overwrite") {
-      p16.log.step(`Overwriting '${modType}/${registryName}' with registry version...`);
+      p19.log.step(`Overwriting '${modType}/${registryName}' with registry version...`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -4183,17 +4778,17 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     const targetDir = path2.join(getModuleBaseDir(projectRoot, res.type), res.targetName);
     const isOverwrite = Boolean(flags.overwrite || res.action === "overwrite");
     if (key !== rootKey) {
-      p16.log.step(
-        `Importing ${res.type}: ${pc16.cyan(res.targetName)}${res.targetName !== res.registryName ? pc16.dim(` (from ${res.registryName})`) : ""}...`
+      p19.log.step(
+        `Importing ${res.type}: ${pc13.cyan(res.targetName)}${res.targetName !== res.registryName ? pc13.dim(` (from ${res.registryName})`) : ""}...`
       );
     }
     if (res.action === "overwrite" && !flags.dryRun) {
       const existingDir = getExistingModuleDir(projectRoot, res.type, res.targetName);
       if (existingDir && existingDir !== targetDir) {
-        fs11.rmSync(existingDir, { recursive: true, force: true });
+        fs14.rmSync(existingDir, { recursive: true, force: true });
       }
-      if (fs11.existsSync(targetDir)) {
-        fs11.rmSync(targetDir, { recursive: true, force: true });
+      if (fs14.existsSync(targetDir)) {
+        fs14.rmSync(targetDir, { recursive: true, force: true });
       }
     }
     for (const file of res.manifest.files || []) {
@@ -4201,32 +4796,32 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       if (!includeTests && isTestFile(file)) continue;
       const remoteFilePath = `${folder}/${res.registryName}/${file}`;
       const localFilePath = path2.join(targetDir, file);
-      if (fs11.existsSync(localFilePath) && !isOverwrite) {
-        p16.log.warn(
-          `  \u21B3 Skipping existing file: ${pc16.dim(path2.relative(projectRoot, localFilePath))} (use --overwrite to replace)`
+      if (fs14.existsSync(localFilePath) && !isOverwrite) {
+        p19.log.warn(
+          `  \u21B3 Skipping existing file: ${pc13.dim(path2.relative(projectRoot, localFilePath))} (use --overwrite to replace)`
         );
         continue;
       }
       let content = await fetchRegistryFile(registryBase, remoteFilePath);
       content = rewriteImports(content, globalAliasMap);
       if (!flags.dryRun) {
-        fs11.mkdirSync(path2.dirname(localFilePath), { recursive: true });
-        fs11.writeFileSync(localFilePath, content, "utf-8");
+        fs14.mkdirSync(path2.dirname(localFilePath), { recursive: true });
+        fs14.writeFileSync(localFilePath, content, "utf-8");
       }
       const displayPath = path2.relative(projectRoot, localFilePath);
       totalWrittenFiles.push(displayPath);
-      p16.log.message(`  ${pc16.green("+")} ${displayPath}`);
+      p19.log.message(`  ${pc13.green("+")} ${displayPath}`);
     }
   }
   const missingNpm = getMissingNpmPackages(projectRoot, Array.from(requiredNpmPackages));
   if (missingNpm.length > 0) {
     if (flags.skipInstall || flags.dryRun) {
-      p16.log.info(`Required npm dependencies to install: ${pc16.cyan(missingNpm.join(", "))}`);
+      p19.log.info(`Required npm dependencies to install: ${pc13.cyan(missingNpm.join(", "))}`);
     } else {
       try {
         installNpmPackages(projectRoot, missingNpm);
       } catch (err) {
-        p16.log.warn(
+        p19.log.warn(
           `Could not automatically install packages (${err.message}). Please run: npm install ${missingNpm.join(
             " "
           )}`
@@ -4235,13 +4830,13 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     }
   }
   if (flags.dryRun) {
-    p16.log.info(pc16.yellow("Dry run complete: No files were written to disk."));
+    p19.log.info(pc13.yellow("Dry run complete: No files were written to disk."));
   } else {
     const rootRes = resolutions.get(rootKey);
     const baseDir = getModuleBaseDir(projectRoot, type);
     const displayTarget = path2.relative(projectRoot, path2.join(baseDir, rootRes.targetName));
-    p16.log.success(
-      pc16.green(
+    p19.log.success(
+      pc13.green(
         `Successfully imported ${type} '${name}' (${totalWrittenFiles.length} file${totalWrittenFiles.length === 1 ? "" : "s"} placed in ${displayTarget})`
       )
     );
@@ -4263,8 +4858,8 @@ function isTestFile2(filePath, projectRoot) {
   return base.endsWith(".test.ts") || base.endsWith(".test.js") || base.endsWith(".spec.ts") || base.endsWith(".spec.js") || base.endsWith(".d.ts") || norm.includes("/__tests__/") || norm.startsWith("__tests__/") || /(?:^|\/)tests?\//.test(norm);
 }
 function scanDirFiles(dir, projectRoot) {
-  if (!fs11.existsSync(dir)) return [];
-  const entries = fs11.readdirSync(dir, { withFileTypes: true });
+  if (!fs14.existsSync(dir)) return [];
+  const entries = fs14.readdirSync(dir, { withFileTypes: true });
   const files = [];
   for (const entry of entries) {
     if (entry.name === "node_modules" || entry.name === "dist" || entry.name === "__tests__" || entry.name.startsWith(".")) {
@@ -4464,10 +5059,10 @@ var FeatureDependencyGraph = class {
             if (cycle) return cycle;
           } else if (inStack.has(next)) {
             const cycle = [next];
-            let p19 = curr;
-            while (p19 !== next) {
-              cycle.push(p19);
-              p19 = parent.get(p19) || next;
+            let p22 = curr;
+            while (p22 !== next) {
+              cycle.push(p22);
+              p22 = parent.get(p22) || next;
             }
             cycle.push(next);
             cycle.reverse();
@@ -4483,8 +5078,8 @@ var FeatureDependencyGraph = class {
 };
 function discoverAllFeatures(projectRoot) {
   const featuresBase = resolveFeaturesDir(projectRoot);
-  if (!fs11.existsSync(featuresBase)) return [];
-  const entries = fs11.readdirSync(featuresBase, { withFileTypes: true });
+  if (!fs14.existsSync(featuresBase)) return [];
+  const entries = fs14.readdirSync(featuresBase, { withFileTypes: true });
   return entries.filter((e) => e.isDirectory() && !e.name.startsWith(".") && e.name !== "__tests__" && e.name !== "tests").map((e) => ({
     name: e.name,
     dir: path2.join(featuresBase, e.name)
@@ -4875,7 +5470,7 @@ Code: ${v.code}`;
       const relPath = path2.relative(projectRoot, file).replace(/\\/g, "/");
       const { layer } = classifyFile(file, projectRoot);
       if (!layer) continue;
-      const content = fs11.readFileSync(file, "utf-8");
+      const content = fs14.readFileSync(file, "utf-8");
       const statements = extractImportStatements(content);
       const baseName = path2.basename(file);
       const isBarrel = baseName === "index.ts" || baseName === "index.js";
@@ -5369,15 +5964,15 @@ ${compiledDetails}
 // src/commands/lint.ts
 function formatViolation(v) {
   const lines = [];
-  lines.push(pc16.underline(pc16.cyan(v.relativePath)) + pc16.dim(":") + pc16.yellow(String(v.line)));
+  lines.push(pc13.underline(pc13.cyan(v.relativePath)) + pc13.dim(":") + pc13.yellow(String(v.line)));
   const gutter = `${String(v.line).padStart(4, " ")} | `;
-  lines.push(pc16.dim(gutter) + v.code);
+  lines.push(pc13.dim(gutter) + v.code);
   const categoryShort = v.category.replace(" Violation", "");
   lines.push(
-    "       " + pc16.red(pc16.bold("\u2716")) + " " + pc16.red(`[${categoryShort}]`) + " " + v.advice
+    "       " + pc13.red(pc13.bold("\u2716")) + " " + pc13.red(`[${categoryShort}]`) + " " + v.advice
   );
   if (v.fixExample?.good) {
-    lines.push("       " + pc16.dim("\u2192") + " " + pc16.dim(v.fixExample.good));
+    lines.push("       " + pc13.dim("\u2192") + " " + pc13.dim(v.fixExample.good));
   }
   return lines.join("\n");
 }
@@ -5402,7 +5997,7 @@ async function handleLint(flags = {}) {
           console.log("");
         }
         console.log(
-          pc16.red(
+          pc13.red(
             `\u2716 Dependency rules check failed with ${summary.totalViolations} error${summary.totalViolations > 1 ? "s" : ""} across ${summary.violatedFeatures} feature${summary.violatedFeatures > 1 ? "s" : ""} (${summary.totalFeatures} features scanned).`
           )
         );
@@ -5421,7 +6016,7 @@ ${compiledDetails}
     }
     if (!quiet) {
       console.log(
-        pc16.green(
+        pc13.green(
           `\u2714 Dependency rules verified across ${summary.totalFeatures} feature${summary.totalFeatures === 1 ? "" : "s"}.`
         )
       );
@@ -5436,7 +6031,7 @@ ${compiledDetails}
           console.log(formatViolation(v));
           console.log("");
         }
-        console.log(pc16.red(`\u2716 Dependency rules check failed (1 error).`));
+        console.log(pc13.red(`\u2716 Dependency rules check failed (1 error).`));
         console.log("");
       }
     }
@@ -5446,7 +6041,7 @@ ${compiledDetails}
 async function handleInit(type, flags = {}) {
   if (!type) {
     const choice = handleCancel(
-      await p16.select({
+      await p19.select({
         message: "What would you like to initialize?",
         options: [
           {
@@ -5463,20 +6058,20 @@ async function handleInit(type, flags = {}) {
       })
     );
     if (choice === "env") {
-      await runEnvCommand(flags);
+      await runEnvInit(flags);
     } else if (choice === "env-examples") {
-      await runEnvExamplesCommand(flags);
+      await runEnvInitExamples(flags);
     }
     return;
   }
   const normalized = type.trim().toLowerCase();
   if (normalized === "env") {
-    await runEnvCommand(flags);
+    await runEnvInit(flags);
   } else if (normalized === "env-examples" || normalized === "envexamples") {
-    await runEnvExamplesCommand(flags);
+    await runEnvInitExamples(flags);
   } else {
-    p16.log.error(
-      pc16.red(
+    p19.log.error(
+      pc13.red(
         `Unknown init target: "${type}". Allowed targets: env, env-examples.`
       )
     );
@@ -5492,8 +6087,8 @@ function createCli() {
   const cli = cac("mason");
   cli.command("[...args]", "Interactive scaffolding and import wizard").option("-d, --dry-run", "Preview changes without writing to disk").option("-o, --overwrite", "Overwrite existing files").option("-y, --yes", "Accept defaults and skip interactive prompts").option("--registry", "Run in registry mode").option("--point-to <mapping>", "Point a dependency to an existing local module (e.g. --point-to time:mytime)").option("--alias <mapping>", "Import a dependency fresh under an alias name (e.g. --alias time:time-mason)").option("--tests", "Include test files (use --no-tests to exclude)").action(async (args, flags) => {
     if (args && args.length > 0) {
-      p16.log.error(
-        pc16.red(
+      p19.log.error(
+        pc13.red(
           `Unknown command: "${args.join(" ")}". Use --help to list available commands.`
         )
       );
@@ -5504,7 +6099,7 @@ function createCli() {
       const mode = getEffectiveMode(projectRoot, flags);
       if (mode === "registry") {
         const choice2 = handleCancel(
-          await p16.select({
+          await p19.select({
             message: "\u{1F3DB}\uFE0F  Mason (Registry Mode): What would you like to scaffold?",
             options: [
               {
@@ -5547,7 +6142,7 @@ function createCli() {
         return;
       }
       const choice = handleCancel(
-        await p16.select({
+        await p19.select({
           message: "\u{1F9F1} Mason: What would you like to do?",
           options: [
             {
@@ -5566,9 +6161,9 @@ function createCli() {
               hint: "Scan codebase and verify Clean Architecture dependency rules"
             },
             {
-              value: "init",
-              label: "Initialize environment",
-              hint: "Generate local .env files from .env*.example templates"
+              value: "env",
+              label: "Environment variables",
+              hint: "Manage .env files, add/delete keys, and sync templates"
             }
           ]
         })
@@ -5579,8 +6174,8 @@ function createCli() {
         await handleImport(void 0, void 0, flags);
       } else if (choice === "lint") {
         await handleLint(flags);
-      } else if (choice === "init") {
-        await handleInit("env", flags);
+      } else if (choice === "env") {
+        await handleEnv(void 0, [], flags);
       }
     } catch (err) {
       handleCliError(err);
@@ -5628,10 +6223,20 @@ function createCli() {
       handleCliError(err);
     }
   });
+  cli.command(
+    "env [subcommand] [...args]",
+    "Environment variable management and template synchronization (init, init-examples, add, update, delete, audit)"
+  ).option("-d, --dry-run", "Preview changes without writing to disk").option("-o, --overwrite", "Overwrite existing files").option("-e, --env <environments>", "Comma-separated target environments (e.g. dev,prod)").example("mason env").example("mason env init").example("mason env init-examples").example("mason env add API_KEY secret123").example("mason env update API_KEY newsecret").example("mason env delete API_KEY").example("mason env audit").action(async (subcommand, args = [], flags = {}) => {
+    try {
+      await handleEnv(subcommand, args, flags);
+    } catch (err) {
+      handleCliError(err);
+    }
+  });
   cli.command(
     "init [type]",
-    "Initialize project configurations and resources (e.g. 'mason init env', 'mason init env-examples')"
-  ).option("-d, --dry-run", "Preview changes without writing to disk").option("-o, --overwrite", "Overwrite existing files").example("mason init env").example("mason init env --overwrite").example("mason init env --dry-run").example("mason init env-examples").example("mason init env-examples --overwrite").example("mason init env-examples --dry-run").action(async (type, flags = {}) => {
+    "Initialize project configurations (legacy shorthand: use 'mason env init')"
+  ).option("-d, --dry-run", "Preview changes without writing to disk").option("-o, --overwrite", "Overwrite existing files").example("mason init env").example("mason init env-examples").action(async (type, flags = {}) => {
     try {
       await handleInit(type, flags);
     } catch (err) {
@@ -5640,10 +6245,10 @@ function createCli() {
   });
   cli.command(
     "env-examples",
-    "Shorthand for 'mason init env-examples'"
+    "Shorthand for 'mason env init-examples'"
   ).option("-d, --dry-run", "Preview changes without writing to disk").option("-o, --overwrite", "Overwrite existing .env*.example files").action(async (flags = {}) => {
     try {
-      await handleInit("env-examples", flags);
+      await handleEnv("init-examples", [], flags);
     } catch (err) {
       handleCliError(err);
     }
@@ -5679,7 +6284,7 @@ function handleCliError(err) {
     process.exit(0);
   }
   const message = err instanceof Error ? err.message : String(err);
-  p16.log.error(pc16.red(`Error: ${message}`));
+  p19.log.error(pc13.red(`Error: ${message}`));
   if (process.env.VITEST) {
     throw err;
   }