@solid-stack/mason 1.0.15 → 1.0.17

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { cac } from 'cac';
-import * as p3 from '@clack/prompts';
+import * as p14 from '@clack/prompts';
 import pc14 from 'picocolors';
 import fs9 from 'fs';
 import path2 from 'path';
@@ -47,17 +47,17 @@ function writeFileSafely(absolutePath, content, options = {}) {
 function printGeneratedFiles(files, isDryRun = false) {
   console.log("");
   if (isDryRun) {
-    p3.log.warn(pc14.yellow(pc14.bold("[DRY RUN PREVIEW] No files were written to disk.")));
+    p14.log.warn(pc14.yellow(pc14.bold("[DRY RUN PREVIEW] No files were written to disk.")));
   }
   for (const f of files) {
     if (f.action === "created") {
-      p3.log.success(`${pc14.bold(f.relativePath)} ${pc14.dim("(created)")}`);
+      p14.log.success(`${pc14.bold(f.relativePath)} ${pc14.dim("(created)")}`);
     } else if (f.action === "overwritten") {
-      p3.log.warn(`${pc14.bold(f.relativePath)} ${pc14.dim("(overwritten)")}`);
+      p14.log.warn(`${pc14.bold(f.relativePath)} ${pc14.dim("(overwritten)")}`);
     } else if (f.action === "skipped") {
-      p3.log.info(`${pc14.dim(f.relativePath)} ${pc14.dim("(skipped - already exists, pass -o to overwrite)")}`);
+      p14.log.info(`${pc14.dim(f.relativePath)} ${pc14.dim("(skipped - already exists, pass -o to overwrite)")}`);
     } else {
-      p3.log.info(`${pc14.bold(f.relativePath)} ${pc14.dim("(preview)")}`);
+      p14.log.info(`${pc14.bold(f.relativePath)} ${pc14.dim("(preview)")}`);
     }
   }
 }
@@ -1730,23 +1730,23 @@ var PromptCancelledError = class extends Error {
   }
 };
 function handleCancel(result) {
-  if (p3.isCancel(result)) {
-    p3.cancel("Operation cancelled.");
+  if (p14.isCancel(result)) {
+    p14.cancel("Operation cancelled.");
     throw new PromptCancelledError();
   }
   return result;
 }
 function printBanner() {
   console.log("");
-  p3.intro(pc14.bgCyan(pc14.black(" @solid-stack/mason ")));
+  p14.intro(pc14.bgCyan(pc14.black(" @solid-stack/mason ")));
 }
 async function promptProperties(options = {}) {
   const properties = options.defaults ? [...options.defaults] : [];
   if (properties.length > 0) {
     const summary = properties.map((p16) => `${p16.name}: ${p16.type}${p16.optional ? "?" : ""}`).join(", ");
-    p3.log.info(pc14.dim(`Pre-configured fields: ${summary}`));
+    p14.log.info(pc14.dim(`Pre-configured fields: ${summary}`));
     const addMore = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Would you like to add custom fields/properties?",
         initialValue: false
       })
@@ -1755,10 +1755,10 @@ async function promptProperties(options = {}) {
       return properties;
     }
   }
-  p3.log.info(pc14.cyan("Enter properties (leave name blank when finished):"));
+  p14.log.info(pc14.cyan("Enter properties (leave name blank when finished):"));
   while (true) {
     const name = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Property name (or press Enter to finish):",
         placeholder: "e.g. title, email, status"
       })
@@ -1767,7 +1767,7 @@ async function promptProperties(options = {}) {
       break;
     }
     const type = handleCancel(
-      await p3.select({
+      await p14.select({
         message: `Type for property "${name.trim()}":`,
         options: [
           { value: "string", label: "string" },
@@ -1784,7 +1784,7 @@ async function promptProperties(options = {}) {
     let finalType = type;
     if (type === "custom") {
       finalType = handleCancel(
-        await p3.text({
+        await p14.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"
@@ -1792,7 +1792,7 @@ async function promptProperties(options = {}) {
       );
     }
     const optional = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: `Is "${name.trim()}" optional?`,
         initialValue: false
       })
@@ -1802,7 +1802,7 @@ async function promptProperties(options = {}) {
       type: finalType.trim(),
       optional
     });
-    p3.log.success(
+    p14.log.success(
       pc14.green(`Added: ${name.trim()}${optional ? "?" : ""}: ${finalType.trim()}`)
     );
   }
@@ -1819,7 +1819,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   }
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "What is the feature name?",
         placeholder: "e.g. users, auth, orders, billing",
         validate: (val) => {
@@ -1835,7 +1835,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   let targetDirRel = defaultDir;
   if (!flags.yes && !flags.target && !flags.dest) {
     targetDirRel = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Target directory for the feature:",
         initialValue: defaultDir,
         defaultValue: defaultDir
@@ -1857,14 +1857,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   const customUseCases = [];
   if (!flags.yes) {
     includeExpress = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Include Express Presentation layer (pxExpress routes & handlers)?",
         initialValue: true
       })
     );
     if (includeExpress) {
       routePath = handleCancel(
-        await p3.text({
+        await p14.text({
           message: "Express route prefix:",
           initialValue: `/${normalizedName}`,
           defaultValue: `/${normalizedName}`
@@ -1872,14 +1872,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       ).trim();
     }
     includeDomain = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Include Domain Entity/Entities?",
         initialValue: true
       })
     );
     if (includeDomain) {
       const domainInput = handleCancel(
-        await p3.text({
+        await p14.text({
           message: "Domain entity name(s) (comma-separated):",
           initialValue: defaultEntity,
           defaultValue: defaultEntity,
@@ -1898,21 +1898,21 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       entityNames = [defaultEntity];
     }
     includeInterface = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: `Include Domain Repository interface(s) for ${entityNames.join(", ")}?`,
         initialValue: true
       })
     );
     if (includeInterface) {
       includeInfra = handleCancel(
-        await p3.confirm({
+        await p14.confirm({
           message: `Include Infrastructure Stub implementation(s) for ${entityNames.join(", ")}?`,
           initialValue: true
         })
       );
     }
     includeUseCase = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Include Domain Use Cases?",
         initialValue: true
       })
@@ -1926,7 +1926,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
         { value: "delete", label: "Delete (Delete<Entity>)", hint: "DELETE /:id" }
       ];
       crudOperations = handleCancel(
-        await p3.multiselect({
+        await p14.multiselect({
           message: "Select standard CRUD use cases to generate:",
           options: crudChoices,
           initialValues: ["create", "read", "list", "update", "delete"],
@@ -1934,13 +1934,13 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
         })
       );
       includeTests = handleCancel(
-        await p3.confirm({
+        await p14.confirm({
           message: "Generate Vitest unit tests for use cases?",
           initialValue: true
         })
       );
       const wantCustom = handleCancel(
-        await p3.confirm({
+        await p14.confirm({
           message: "Do you want to add any custom use cases to this feature?",
           initialValue: false
         })
@@ -1950,7 +1950,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
         const availableIfaces = entityNames.map((e) => `I${e}Repository`);
         while (addMore) {
           const customName = handleCancel(
-            await p3.text({
+            await p14.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"
@@ -1960,7 +1960,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           let selectedDeps = [];
           if (availableIfaces.length > 0) {
             selectedDeps = handleCancel(
-              await p3.multiselect({
+              await p14.multiselect({
                 message: `Select domain interfaces to inject into ${customUcName}:`,
                 options: availableIfaces.map((i) => ({ value: i, label: i })),
                 required: false
@@ -1969,7 +1969,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           }
           let customInputProps = [];
           const hasInput = handleCancel(
-            await p3.confirm({
+            await p14.confirm({
               message: `Does ${customUcName} accept input arguments?`,
               initialValue: true
             })
@@ -1980,7 +1980,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           }
           let customOutputProps = [];
           const hasCustomOutput = handleCancel(
-            await p3.confirm({
+            await p14.confirm({
               message: `Does ${customUcName} return custom output data?`,
               initialValue: false
             })
@@ -1990,7 +1990,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
               });
           }
           const customIncludeTest = handleCancel(
-            await p3.confirm({
+            await p14.confirm({
               message: `Generate Vitest unit test for ${customUcName}?`,
               initialValue: true
             })
@@ -2000,14 +2000,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           let customHttpPath = `/${toKebabCase(customUcName)}`;
           if (includeExpress) {
             customCreateHttp = handleCancel(
-              await p3.confirm({
+              await p14.confirm({
                 message: `Generate a matching ExpressRoute HTTP handler for ${customUcName}?`,
                 initialValue: true
               })
             );
             if (customCreateHttp) {
               customHttpMethod = handleCancel(
-                await p3.select({
+                await p14.select({
                   message: "HTTP method for route:",
                   options: [
                     { value: "post", label: "POST" },
@@ -2020,7 +2020,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
                 })
               );
               customHttpPath = handleCancel(
-                await p3.text({
+                await p14.text({
                   message: "Route subpath (relative to feature prefix):",
                   initialValue: `/${toKebabCase(customUcName)}`,
                   defaultValue: `/${toKebabCase(customUcName)}`
@@ -2041,7 +2041,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
             validationFields: customInputProps
           });
           addMore = handleCancel(
-            await p3.confirm({
+            await p14.confirm({
               message: "Add another custom use case?",
               initialValue: false
             })
@@ -2050,7 +2050,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       }
     }
     includeDiProvider = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Generate / update feature DI provider (diProvider.ts)?",
         initialValue: true
       })
@@ -2062,7 +2062,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       entityNames = [defaultEntity];
     }
   }
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Generating feature '${pc14.cyan(normalizedName)}'...`);
   const options = {
     name: normalizedName,
@@ -2109,7 +2109,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   }
   s.stop("Feature scaffolded successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(
+  p14.outro(
     pc14.green(
       `\u2713 Feature '${normalizedName}' initialized in ${path2.relative(projectRoot, targetDir)} (uncommitted, unregistered)`
     )
@@ -2224,7 +2224,7 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   }
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "What is the shared module name?",
         placeholder: "e.g. hasher, time, uuid, cache, logger",
         validate: (val) => {
@@ -2240,7 +2240,7 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   let targetDirRel = defaultDir;
   if (!flags.yes && !flags.target && !flags.dest) {
     targetDirRel = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Target directory for the shared module:",
         initialValue: defaultDir,
         defaultValue: defaultDir
@@ -2252,20 +2252,20 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   let includeStub = true;
   if (!flags.yes) {
     description = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Module description (optional):",
         placeholder: "e.g. In-memory caching and Redis port abstraction",
         initialValue: ""
       })
     ).trim();
     includeStub = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Include stub implementation in infrastructure/?",
         initialValue: true
       })
     );
   }
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Generating shared module '${pc14.cyan(normalizedName)}'...`);
   const files = generateShared({
     name: normalizedName,
@@ -2279,7 +2279,7 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   });
   s.stop("Shared module generated successfully!");
   printGeneratedFiles(files, Boolean(flags.dryRun));
-  p3.outro(
+  p14.outro(
     pc14.green(
       `\u2713 Shared module '${normalizedName}' initialized in ${path2.relative(projectRoot, targetDir)} (uncommitted, unregistered)`
     )
@@ -2294,14 +2294,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 p3.select({
+        await p14.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p14.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2311,7 +2311,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p14.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2322,7 +2322,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   let name = useCaseNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Use Case name:",
         placeholder: "e.g. CreateUser, GetUser, CancelOrder",
         validate: (v) => v && v.trim() ? void 0 : "Use Case name cannot be empty"
@@ -2338,7 +2338,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       label: i.name
     }));
     selectedDeps = handleCancel(
-      await p3.multiselect({
+      await p14.multiselect({
         message: "Select domain interfaces to inject into use case:",
         options: multiOptions,
         required: false
@@ -2353,7 +2353,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   let httpPath = "/";
   if (!flags.yes) {
     const hasInput = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Does this use case accept input arguments?",
         initialValue: true
       })
@@ -2363,7 +2363,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         });
     }
     const hasCustomOutput = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Does this use case return custom output data?",
         initialValue: false
       })
@@ -2373,20 +2373,20 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         });
     }
     includeTest = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Generate Vitest unit test skeleton (.test.ts)?",
         initialValue: true
       })
     );
     createHttp = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Generate a matching ExpressRoute HTTP handler?",
         initialValue: false
       })
     );
     if (createHttp) {
       httpMethod = handleCancel(
-        await p3.select({
+        await p14.select({
           message: "HTTP method for route:",
           options: [
             { value: "post", label: "POST" },
@@ -2399,7 +2399,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         })
       );
       httpPath = handleCancel(
-        await p3.text({
+        await p14.text({
           message: "Route subpath (relative to feature prefix):",
           initialValue: "/",
           defaultValue: "/"
@@ -2407,7 +2407,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       ).trim();
     }
   }
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Generating use case '${pc14.cyan(ucName)}'...`);
   const options = {
     name: ucName,
@@ -2440,7 +2440,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   }
   s.stop("Use case generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc14.green(`Use case '${ucName}' created in feature '${feature}'!`));
+  p14.outro(pc14.green(`Use case '${ucName}' created in feature '${feature}'!`));
 }
 async function runDomainCommand(domainNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2451,14 +2451,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 p3.select({
+        await p14.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p14.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2468,7 +2468,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p14.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2479,7 +2479,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   let name = domainNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p14.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"
@@ -2491,7 +2491,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   let properties = [];
   if (!flags.yes) {
     kind = handleCancel(
-      await p3.select({
+      await p14.select({
         message: "Select domain model type:",
         options: [
           { value: "interface", label: "TypeScript Interface (pure data structure)" },
@@ -2510,7 +2510,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
       defaults: kind === "valueObject" ? [{ name: "value", type: "string" }] : defaultProps
     });
   }
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Generating domain model '${pc14.cyan(entityName)}'...`);
   const options = {
     name: entityName,
@@ -2524,7 +2524,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   const file = generateDomain(options);
   s.stop("Domain model generated successfully!");
   printGeneratedFiles([file], options.dryRun);
-  p3.outro(pc14.green(`Domain model '${entityName}' created in feature '${feature}'!`));
+  p14.outro(pc14.green(`Domain model '${entityName}' created in feature '${feature}'!`));
 }
 async function runInfrastructureCommand(classNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2533,7 +2533,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   let feature = flags.feature?.trim();
   if (!flags.yes && !flags.global && !flags.feature) {
     scope = handleCancel(
-      await p3.select({
+      await p14.select({
         message: "Where should this infrastructure implementation be placed?",
         options: [
           { value: "feature", label: "Feature-level (features/<feature>/infrastructure)" },
@@ -2548,14 +2548,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 p3.select({
+        await p14.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p14.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2565,7 +2565,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p14.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2578,7 +2578,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   let name = classNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Infrastructure class name:",
         placeholder: "e.g. StubUserRepository, PostgresUserRepository, S3FileStorage",
         validate: (v) => v && v.trim() ? void 0 : "Class name cannot be empty"
@@ -2597,7 +2597,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
           (i) => className.toLowerCase().includes(removeInterfacePrefix(i.name).toLowerCase())
         );
         const ifaceChoice = handleCancel(
-          await p3.select({
+          await p14.select({
             message: "Does this class implement a domain interface or abstract class?",
             options: [
               ...interfaces.map((i) => ({ value: i.name, label: i.name })),
@@ -2609,7 +2609,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
         );
         if (ifaceChoice === "__custom__") {
           implementsInterface = handleCancel(
-            await p3.text({
+            await p14.text({
               message: "Enter interface or abstract class name:",
               placeholder: "e.g. IUserRepository, BaseStorageAdapter",
               validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2620,14 +2620,14 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
         }
       } else {
         const wantImpl = handleCancel(
-          await p3.confirm({
+          await p14.confirm({
             message: "Does this class implement a domain interface or abstract class?",
             initialValue: false
           })
         );
         if (wantImpl) {
           implementsInterface = handleCancel(
-            await p3.text({
+            await p14.text({
               message: "Enter interface or abstract class name:",
               placeholder: "e.g. IUserRepository, BaseStorageAdapter",
               validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2647,7 +2647,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
     const allInterfaces = listDomainInterfaces(projectRoot);
     if (allInterfaces.length > 0) {
       const ifaceChoice = handleCancel(
-        await p3.select({
+        await p14.select({
           message: "Does this class implement an interface or abstract class?",
           options: [
             ...allInterfaces.map((i) => ({ value: i.name, label: `${i.name} (${i.feature})` })),
@@ -2659,7 +2659,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
       );
       if (ifaceChoice === "__custom__") {
         implementsInterface = handleCancel(
-          await p3.text({
+          await p14.text({
             message: "Enter interface or abstract class name:",
             placeholder: "e.g. IAuthRepository",
             validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2672,7 +2672,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   }
   if (!flags.yes && !flags.kind) {
     kind = handleCancel(
-      await p3.select({
+      await p14.select({
         message: "Select implementation kind:",
         options: [
           { value: "stub", label: "In-Memory Stub (with in-memory store and test helper methods)" },
@@ -2683,7 +2683,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
     );
     if (scope === "feature" && feature && implementsInterface) {
       registerInProvider = handleCancel(
-        await p3.confirm({
+        await p14.confirm({
           message: "Register this implementation in feature diProvider.ts?",
           initialValue: true
         })
@@ -2692,7 +2692,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   } else if (flags.yes && scope === "feature" && feature && implementsInterface) {
     registerInProvider = !flags.noProvider;
   }
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Generating infrastructure class '${pc14.cyan(className)}'...`);
   const files = [];
   const options = {
@@ -2728,7 +2728,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   }
   s.stop("Infrastructure class generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc14.green(`Infrastructure class '${className}' created!`));
+  p14.outro(pc14.green(`Infrastructure class '${className}' created!`));
 }
 async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2739,14 +2739,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 p3.select({
+        await p14.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p14.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2756,7 +2756,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p14.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2767,7 +2767,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   let name = interfaceNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Domain interface name:",
         placeholder: "e.g. IUserRepository, IPaymentService",
         validate: (v) => v && v.trim() ? void 0 : "Interface name cannot be empty"
@@ -2785,7 +2785,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   if (!flags.yes) {
     if (existingEntities.length > 0) {
       const selectedEntity = handleCancel(
-        await p3.select({
+        await p14.select({
           message: "Select domain entity associated with this interface:",
           options: [
             ...existingEntities.map((e) => ({ value: e.name, label: e.name })),
@@ -2796,7 +2796,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       );
       if (selectedEntity === "__custom__") {
         entityName = handleCancel(
-          await p3.text({
+          await p14.text({
             message: "Enter entity name:",
             defaultValue: removeInterfacePrefix(ifaceName).replace(/Repository$|Service$/, "")
           })
@@ -2806,7 +2806,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       }
     }
     kind = handleCancel(
-      await p3.select({
+      await p14.select({
         message: "Interface definition style:",
         options: [
           { value: "abstractClass", label: "Abstract Class (Recommended - acts as DI token & type)" },
@@ -2816,7 +2816,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       })
     );
     methodsPreset = handleCancel(
-      await p3.select({
+      await p14.select({
         message: "Method signature preset:",
         options: [
           { value: "crud", label: "Standard CRUD (GetById, List, Create, Update, Delete)" },
@@ -2826,21 +2826,21 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       })
     );
     generateStub = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Auto-generate Infrastructure Stub implementation?",
         initialValue: true
       })
     );
     if (generateStub) {
       registerInProvider = handleCancel(
-        await p3.confirm({
+        await p14.confirm({
           message: "Auto-register interface & stub in feature diProvider.ts?",
           initialValue: true
         })
       );
     }
   }
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Generating interface '${pc14.cyan(ifaceName)}'...`);
   const files = [];
   const options = {
@@ -2890,7 +2890,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   }
   s.stop("Interface generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc14.green(`Interface '${ifaceName}' created in feature '${feature}'!`));
+  p14.outro(pc14.green(`Interface '${ifaceName}' created in feature '${feature}'!`));
 }
 async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2901,14 +2901,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 p3.select({
+        await p14.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p14.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2918,7 +2918,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p14.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2929,7 +2929,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   let name = handlerNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p14.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"
@@ -2948,7 +2948,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   let validationFields = [];
   if (!flags.yes) {
     method = handleCancel(
-      await p3.select({
+      await p14.select({
         message: "HTTP Method:",
         options: [
           { value: "get", label: "GET" },
@@ -2962,7 +2962,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
     );
     const defaultPath = method === "get" ? "/" : "/";
     subPath = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Route subpath (relative to feature prefix):",
         initialValue: defaultPath,
         defaultValue: defaultPath
@@ -2973,7 +2973,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 p3.select({
+        await p14.select({
           message: "Connect this handler to a domain Use Case?",
           options: ucOptions,
           initialValue: ucOptions[0]?.value
@@ -2984,7 +2984,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
       }
     }
     includeValidation = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: "Include Zod inbound request validation?",
         initialValue: method !== "delete"
       })
@@ -2992,7 +2992,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
     if (includeValidation) {
       const defaultSource = method === "get" ? "query" : "body";
       validationSource = handleCancel(
-        await p3.select({
+        await p14.select({
           message: "Validation data source:",
           options: [
             { value: "body", label: "req.body (for POST / PUT / PATCH payloads)" },
@@ -3006,7 +3006,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
         });
     }
   }
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Generating HTTP handler '${pc14.cyan(className)}'...`);
   const options = {
     name: className,
@@ -3025,7 +3025,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   const files = generateHttpHandler(options);
   s.stop("HTTP handler generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc14.green(`HTTP handler '${className}' created in feature '${feature}'!`));
+  p14.outro(pc14.green(`HTTP handler '${className}' created in feature '${feature}'!`));
 }
 function generateInjectableCode(className, dependencies = [], methods = [], implementsInterface) {
   const formattedDeps = dependencies.map((dep) => ({
@@ -3105,7 +3105,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let name = classNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p14.text({
         message: "Injectable class name:",
         placeholder: "e.g. PasswordHasher, TokenService, UserTransformer",
         validate: (v) => v && v.trim() ? void 0 : "Class name cannot be empty"
@@ -3118,7 +3118,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let customPath;
   if (!flags.yes) {
     location = handleCancel(
-      await p3.select({
+      await p14.select({
         message: "Select target architectural location:",
         options: [
           { value: "feature-service", label: "Feature Service (features/<feature>/services/)" },
@@ -3136,14 +3136,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 p3.select({
+            await p14.select({
               message: "Select target feature:",
               options: featureOptions
             })
           );
           if (selected === "__custom__") {
             feature = handleCancel(
-              await p3.text({
+              await p14.text({
                 message: "Enter feature name:",
                 validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
               })
@@ -3153,7 +3153,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
           }
         } else {
           feature = handleCancel(
-            await p3.text({
+            await p14.text({
               message: "Enter target feature name:",
               validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
             })
@@ -3163,7 +3163,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
       feature = toCamelCase(feature);
     } else if (location === "custom") {
       customPath = handleCancel(
-        await p3.text({
+        await p14.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"
@@ -3174,13 +3174,13 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let generateInterface2 = false;
   if (!flags.yes) {
     generateInterface2 = handleCancel(
-      await p3.confirm({
+      await p14.confirm({
         message: `Generate abstract class interface (I${className}) as runtime DI token?`,
         initialValue: false
       })
     );
   }
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Generating injectable '${pc14.cyan(className)}'...`);
   const options = {
     name: className,
@@ -3195,12 +3195,12 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   const files = generateInjectable(options);
   s.stop("Injectable class generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc14.green(`Injectable '${className}' created successfully!`));
+  p14.outro(pc14.green(`Injectable '${className}' created successfully!`));
 }
 async function runInteractiveMenu(flags = {}) {
   printBanner();
   const choice = handleCancel(
-    await p3.select({
+    await p14.select({
       message: "What would you like to create in your architecture?",
       options: [
         {
@@ -3308,7 +3308,7 @@ async function handleCreate(type, name, flags = {}) {
       await runInjectableCommand(name, flags);
       break;
     default:
-      p3.log.error(
+      p14.log.error(
         pc14.red(
           `Unknown component type: "${type}". Allowed types: feature, shared, usecase, domain, infrastructure, interface, httpHandler, injectable.`
         )
@@ -3533,7 +3533,7 @@ function installNpmPackages(projectRoot, packages, pm) {
       installCmd = `npm install ${packages.join(" ")}`;
       break;
   }
-  p3.log.info(`Installing missing dependencies with ${manager}: ${pc14.cyan(packages.join(", "))}`);
+  p14.log.info(`Installing missing dependencies with ${manager}: ${pc14.cyan(packages.join(", "))}`);
   execSync(installCmd, {
     cwd: projectRoot,
     stdio: "inherit"
@@ -3577,8 +3577,8 @@ function computeDirectoryHash(dirPath, files) {
 
 // src/commands/import.ts
 var importPrompts = {
-  select: p3.select,
-  text: p3.text
+  select: p14.select,
+  text: p14.text
 };
 function rewriteImports(content, aliasMap) {
   if (aliasMap.size === 0) return content;
@@ -3607,125 +3607,47 @@ function getExistingModuleDir(projectRoot, modType, modName) {
 function checkModuleExists(projectRoot, modType, modName) {
   return getExistingModuleDir(projectRoot, modType, modName) !== null;
 }
-async function resolveDependency(depType, depName, aliasMap, projectRoot, flags, importModuleRecursive, importedModules, registryBase, index) {
-  const folder = depType === "shared" ? "shared" : "features";
-  const isAlreadyImportedThisRun = importedModules.has(`${depType}:${depName}`);
-  if (isAlreadyImportedThisRun) return;
-  const programmaticAlias = flags.alias?.[depName] || flags.alias?.[`${depType}/${depName}`];
-  if (programmaticAlias) {
-    aliasMap.set(`@/${folder}/${depName}/`, `@/${folder}/${programmaticAlias}/`);
-    const baseDir = getModuleBaseDir(projectRoot, depType);
-    const displayDest = path2.relative(
-      projectRoot,
-      path2.join(baseDir, programmaticAlias)
-    );
-    p3.log.step(`Importing '${depName}' into '${displayDest}'...`);
-    await importModuleRecursive(depType, depName, programmaticAlias);
-    return;
-  }
-  const existingDir = getExistingModuleDir(projectRoot, depType, depName);
-  if (!existingDir) {
-    p3.log.info(`  \u21B3 Resolving required ${depType} dependency: ${pc14.cyan(depName)}`);
-    await importModuleRecursive(depType, depName, depName);
-    return;
-  }
-  const entry = (depType === "shared" ? index?.shared : index?.features)?.find(
-    (item) => item.name === depName
-  );
-  let remoteIntegrity = entry?.integrity;
-  if (!remoteIntegrity) {
-    try {
-      const depManifest = await fetchModuleManifest(registryBase, depType, depName);
-      remoteIntegrity = depManifest.integrity;
-    } catch {
-    }
-  }
-  const localHash = computeDirectoryHash(existingDir);
-  if (remoteIntegrity && localHash === remoteIntegrity) {
-    p3.log.step(`\u2713 ${depType}/${depName} is up to date (reusing existing)`);
-    importedModules.add(`${depType}:${depName}`);
-    return;
-  }
-  if (flags.overwrite) {
-    p3.log.step(`Overwriting '${depType}/${depName}' with registry version (--overwrite)...`);
-    const baseDir = getModuleBaseDir(projectRoot, depType);
-    const targetDir = path2.join(baseDir, depName);
-    if (!flags.dryRun) {
-      if (existingDir !== targetDir) {
-        fs9.rmSync(existingDir, { recursive: true, force: true });
+function getAvailableLocalModules(projectRoot, modType) {
+  const folder = modType === "shared" ? "shared" : "features";
+  const dirs = [
+    path2.join(projectRoot, "src", folder),
+    path2.join(projectRoot, folder)
+  ];
+  const set = /* @__PURE__ */ new Set();
+  for (const dir of dirs) {
+    if (fs9.existsSync(dir)) {
+      try {
+        const entries = fs9.readdirSync(dir, { withFileTypes: true });
+        for (const e of entries) {
+          if (e.isDirectory() && !e.name.startsWith(".")) {
+            set.add(e.name);
+          }
+        }
+      } catch {
       }
-      fs9.rmSync(targetDir, { recursive: true, force: true });
     }
-    await importModuleRecursive(depType, depName, depName, { overwrite: true });
-    return;
-  }
-  if (flags.yes) {
-    p3.log.info(`Using existing '${depType}/${depName}'`);
-    importedModules.add(`${depType}:${depName}`);
-    return;
-  }
-  const choice = handleCancel(
-    await importPrompts.select({
-      message: `Local '${depType}/${depName}' differs from the registry version.`,
-      options: [
-        {
-          value: "keep_existing",
-          label: `Keep existing local version (Recommended)`
-        },
-        {
-          value: "rename",
-          label: "Import fresh copy under a new name (alias)"
-        },
-        {
-          value: "overwrite",
-          label: "Overwrite local version with registry version"
-        }
-      ]
-    })
-  );
-  if (choice === "keep_existing" || choice === "use_existing") {
-    p3.log.step(`Skipping '${depType}/${depName}' (keeping existing)`);
-    importedModules.add(`${depType}:${depName}`);
-    return;
   }
-  if (choice === "rename") {
-    const newName = handleCancel(
-      await importPrompts.text({
-        message: "What should we name the new copy?",
-        placeholder: `${depName}-copy`,
-        validate(val) {
-          const v = val?.trim();
-          if (!v) return "Name cannot be empty";
-          if (v === depName) return `Name must be different from '${depName}'`;
-          if (!/^[a-zA-Z0-9_-]+$/.test(v)) {
-            return "Name can only contain alphanumeric characters, dashes, and underscores";
-          }
-          if (checkModuleExists(projectRoot, depType, v)) {
-            return `'${v}' already exists in ${folder}, please choose another name`;
-          }
+  return Array.from(set).sort();
+}
+function parseMappingFlags(raw) {
+  if (!raw) return {};
+  if (typeof raw === "object" && !Array.isArray(raw)) return raw;
+  const result = {};
+  const entries = Array.isArray(raw) ? raw : [raw];
+  for (const entry of entries) {
+    if (typeof entry === "string") {
+      const idx = entry.indexOf(":");
+      if (idx !== -1) {
+        let key = entry.slice(0, idx).trim();
+        let val = entry.slice(idx + 1).trim();
+        val = val.replace(/^@\/(shared|features)\//, "").replace(/^(src\/)?(shared|features)\//, "").replace(/^\/+|\/+$/g, "").trim();
+        if (key && val) {
+          result[key] = val;
         }
-      })
-    ).trim();
-    aliasMap.set(`@/${folder}/${depName}/`, `@/${folder}/${newName}/`);
-    const baseDir = getModuleBaseDir(projectRoot, depType);
-    const displayDest = path2.relative(projectRoot, path2.join(baseDir, newName));
-    p3.log.step(`Importing '${depName}' into '${displayDest}'...`);
-    await importModuleRecursive(depType, depName, newName);
-    return;
-  }
-  if (choice === "overwrite") {
-    p3.log.step(`Overwriting '${depType}/${depName}' with registry version...`);
-    const baseDir = getModuleBaseDir(projectRoot, depType);
-    const targetDir = path2.join(baseDir, depName);
-    if (!flags.dryRun) {
-      if (existingDir !== targetDir) {
-        fs9.rmSync(existingDir, { recursive: true, force: true });
       }
-      fs9.rmSync(targetDir, { recursive: true, force: true });
     }
-    await importModuleRecursive(depType, depName, depName, { overwrite: true });
-    return;
   }
+  return result;
 }
 async function handleImport(typeArg, nameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -3751,11 +3673,11 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     );
   }
   if (type !== "shared" && type !== "feature") {
-    p3.log.error(pc14.red(`Invalid module type: "${typeArg}". Must be "shared" or "feature".`));
+    p14.log.error(pc14.red(`Invalid module type: "${typeArg}". Must be "shared" or "feature".`));
     process.exit(1);
   }
   const registryBase = getRegistryBase(projectRoot, flags.registry);
-  const s = p3.spinner();
+  const s = p14.spinner();
   s.start(`Connecting to registry at ${pc14.dim(registryBase)}...`);
   let index;
   try {
@@ -3763,7 +3685,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     s.stop("Registry index loaded.");
   } catch (err) {
     s.stop(pc14.red("Failed to load registry index."));
-    p3.log.error(pc14.red(err.message || String(err)));
+    p14.log.error(pc14.red(err.message || String(err)));
     process.exit(1);
   }
   const availableList = type === "shared" ? index.shared : index.features;
@@ -3771,7 +3693,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
   let name = nameArg?.trim();
   if (!name) {
     if (availableList.length === 0) {
-      p3.log.warn(`No ${type} modules available in the registry.`);
+      p14.log.warn(`No ${type} modules available in the registry.`);
       return;
     }
     name = handleCancel(
@@ -3787,108 +3709,400 @@ async function handleImport(typeArg, nameArg, flags = {}) {
   }
   if (!candidateNames.includes(name)) {
     const closest = findClosestMatch(name, candidateNames);
-    p3.log.error(pc14.red(`\u274C Module '${name}' not found in the ${type} registry.`));
+    p14.log.error(pc14.red(`\u274C Module '${name}' not found in the ${type} registry.`));
     if (closest) {
-      p3.log.info(pc14.yellow(`Did you mean '${pc14.cyan(closest)}'?`));
+      p14.log.info(pc14.yellow(`Did you mean '${pc14.cyan(closest)}'?`));
     }
     process.exit(1);
   }
-  const importedModules = /* @__PURE__ */ new Set();
-  const totalWrittenFiles = [];
-  const requiredNpmPackages = /* @__PURE__ */ new Set();
-  async function importModuleRecursive(modType, registryName, targetName = registryName, options) {
-    const modKey = `${modType}:${targetName}`;
-    if (importedModules.has(modKey)) return;
-    p3.log.step(
-      `Importing ${modType}: ${pc14.cyan(targetName)}${targetName !== registryName ? pc14.dim(` (from ${registryName})`) : ""}...`
-    );
+  const nodes = /* @__PURE__ */ new Map();
+  async function discoverGraph(modType, modName) {
+    const key = `${modType}:${modName}`;
+    if (nodes.has(key)) return;
     let manifest;
     try {
-      manifest = await fetchModuleManifest(registryBase, modType, registryName);
+      manifest = await fetchModuleManifest(registryBase, modType, modName);
     } catch (err) {
-      p3.log.error(pc14.red(`Failed to fetch manifest for ${modType} '${registryName}': ${err.message}`));
+      p14.log.error(pc14.red(`Failed to fetch manifest for ${modType} '${modName}': ${err.message}`));
       process.exit(1);
     }
-    const aliasMap = /* @__PURE__ */ new Map();
-    if (targetName !== registryName) {
-      const folder2 = modType === "shared" ? "shared" : "features";
-      aliasMap.set(`@/${folder2}/${registryName}/`, `@/${folder2}/${targetName}/`);
-    }
-    const sharedDeps = manifest.dependencies?.shared || [];
-    for (const dep of sharedDeps) {
-      await resolveDependency(
-        "shared",
-        dep,
-        aliasMap,
-        projectRoot,
-        flags,
-        importModuleRecursive,
-        importedModules,
-        registryBase,
-        index
-      );
+    nodes.set(key, {
+      type: modType,
+      name: modName,
+      manifest
+    });
+    for (const dep of manifest.dependencies?.shared || []) {
+      await discoverGraph("shared", dep);
     }
-    const featureDeps = manifest.dependencies?.features || [];
-    for (const dep of featureDeps) {
-      await resolveDependency(
-        "feature",
-        dep,
-        aliasMap,
-        projectRoot,
-        flags,
-        importModuleRecursive,
-        importedModules,
-        registryBase,
-        index
+    for (const dep of manifest.dependencies?.features || []) {
+      await discoverGraph("feature", dep);
+    }
+  }
+  await discoverGraph(type, name);
+  const orderedKeys = [];
+  const visiting = /* @__PURE__ */ new Set();
+  const visited = /* @__PURE__ */ new Set();
+  function buildTopologicalOrder(key) {
+    if (visited.has(key)) return;
+    if (visiting.has(key)) return;
+    visiting.add(key);
+    const node = nodes.get(key);
+    if (node) {
+      for (const dep of node.manifest.dependencies?.shared || []) {
+        buildTopologicalOrder(`shared:${dep}`);
+      }
+      for (const dep of node.manifest.dependencies?.features || []) {
+        buildTopologicalOrder(`feature:${dep}`);
+      }
+    }
+    visiting.delete(key);
+    visited.add(key);
+    orderedKeys.push(key);
+  }
+  const rootKey = `${type}:${name}`;
+  buildTopologicalOrder(rootKey);
+  const resolutions = /* @__PURE__ */ new Map();
+  const globalAliasMap = /* @__PURE__ */ new Map();
+  p14.log.step(`Importing ${type}: ${pc14.cyan(name)}...`);
+  for (const key of orderedKeys) {
+    const node = nodes.get(key);
+    const { type: modType, name: registryName, manifest } = node;
+    const folder = modType === "shared" ? "shared" : "features";
+    if (key === rootKey) {
+      const aliasMap2 = parseMappingFlags(flags.alias);
+      const programmaticAlias2 = aliasMap2[registryName] || aliasMap2[`${modType}/${registryName}`];
+      const targetName = programmaticAlias2 || registryName;
+      if (targetName !== registryName) {
+        globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${targetName}/`);
+        globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${targetName}`);
+      }
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName,
+        action: flags.overwrite ? "overwrite" : "download",
+        manifest
+      });
+      continue;
+    }
+    const aliasMap = parseMappingFlags(flags.alias);
+    const pointToMap = {
+      ...parseMappingFlags(flags.pointTo),
+      ...parseMappingFlags(flags["point-to"]),
+      ...parseMappingFlags(flags.useExisting),
+      ...parseMappingFlags(flags["use-existing"])
+    };
+    const programmaticPointTo = pointToMap[registryName] || pointToMap[`${modType}/${registryName}`];
+    if (programmaticPointTo) {
+      if (!checkModuleExists(projectRoot, modType, programmaticPointTo)) {
+        p14.log.error(
+          pc14.red(
+            `Module '${programmaticPointTo}' specified in --point-to does not exist in ${folder}.`
+          )
+        );
+        process.exit(1);
+      }
+      globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${programmaticPointTo}/`);
+      globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${programmaticPointTo}`);
+      p14.log.step(`Pointing '${modType}/${registryName}' to existing '${folder}/${programmaticPointTo}'`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: programmaticPointTo,
+        action: "reuse",
+        manifest
+      });
+      continue;
+    }
+    const programmaticAlias = aliasMap[registryName] || aliasMap[`${modType}/${registryName}`];
+    if (programmaticAlias) {
+      globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${programmaticAlias}/`);
+      globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${programmaticAlias}`);
+      const baseDir = getModuleBaseDir(projectRoot, modType);
+      const displayDest = path2.relative(projectRoot, path2.join(baseDir, programmaticAlias));
+      p14.log.step(`Importing '${registryName}' into '${displayDest}'...`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: programmaticAlias,
+        action: "alias",
+        manifest
+      });
+      continue;
+    }
+    const existingDir = getExistingModuleDir(projectRoot, modType, registryName);
+    if (!existingDir) {
+      p14.log.info(`  \u21B3 Resolving required ${modType} dependency: ${pc14.cyan(registryName)}`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: registryName,
+        action: "download",
+        manifest
+      });
+      continue;
+    }
+    const entry = (modType === "shared" ? index.shared : index.features)?.find(
+      (item) => item.name === registryName
+    );
+    const remoteIntegrity = manifest.integrity || entry?.integrity;
+    const localHash = computeDirectoryHash(existingDir);
+    if (remoteIntegrity && localHash === remoteIntegrity) {
+      p14.log.step(`\u2713 ${modType}/${registryName} is up to date (reusing existing)`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: registryName,
+        action: "reuse",
+        manifest
+      });
+      continue;
+    }
+    if (flags.overwrite) {
+      p14.log.step(`Overwriting '${modType}/${registryName}' with registry version (--overwrite)...`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: registryName,
+        action: "overwrite",
+        manifest
+      });
+      continue;
+    }
+    if (flags.yes) {
+      p14.log.info(`Using existing '${modType}/${registryName}'`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: registryName,
+        action: "reuse",
+        manifest
+      });
+      continue;
+    }
+    const choice = handleCancel(
+      await importPrompts.select({
+        message: `Local '${modType}/${registryName}' differs from the registry version.`,
+        options: [
+          {
+            value: "keep_existing",
+            label: `Keep existing local version (Recommended)`
+          },
+          {
+            value: "point_existing",
+            label: `Point to another existing ${modType} module`
+          },
+          {
+            value: "rename",
+            label: "Import fresh copy under a new name (alias)"
+          },
+          {
+            value: "overwrite",
+            label: "Overwrite local version with registry version"
+          }
+        ]
+      })
+    );
+    if (choice === "keep_existing" || choice === "use_existing") {
+      p14.log.step(`Skipping '${modType}/${registryName}' (keeping existing)`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: registryName,
+        action: "reuse",
+        manifest
+      });
+      continue;
+    }
+    if (choice === "point_existing" || choice === "point_to_existing") {
+      const candidates = getAvailableLocalModules(projectRoot, modType).filter(
+        (m) => m !== registryName
       );
+      let chosenName;
+      if (candidates.length > 0) {
+        const selection = handleCancel(
+          await importPrompts.select({
+            message: `Select an existing ${modType} module to point to:`,
+            options: [
+              ...candidates.map((m) => ({
+                value: m,
+                label: m
+              })),
+              {
+                value: "__custom__",
+                label: "Enter name manually..."
+              }
+            ]
+          })
+        );
+        if (selection === "__custom__") {
+          chosenName = handleCancel(
+            await importPrompts.text({
+              message: `Enter the name of the existing ${modType} module:`,
+              placeholder: `my${registryName}`,
+              validate(val) {
+                const v = val?.trim();
+                if (!v) return "Name cannot be empty";
+                if (v === registryName) {
+                  return `Name must be different from '${registryName}' (or select 'Keep existing local version')`;
+                }
+                if (!checkModuleExists(projectRoot, modType, v)) {
+                  return `'${v}' does not exist in ${folder}`;
+                }
+              }
+            })
+          ).trim();
+        } else {
+          chosenName = selection;
+        }
+      } else {
+        chosenName = handleCancel(
+          await importPrompts.text({
+            message: `Enter the name of the existing ${modType} module:`,
+            placeholder: `my${registryName}`,
+            validate(val) {
+              const v = val?.trim();
+              if (!v) return "Name cannot be empty";
+              if (v === registryName) {
+                return `Name must be different from '${registryName}' (or select 'Keep existing local version')`;
+              }
+              if (!checkModuleExists(projectRoot, modType, v)) {
+                return `'${v}' does not exist in ${folder}`;
+              }
+            }
+          })
+        ).trim();
+      }
+      chosenName = chosenName.replace(/^@\/(shared|features)\//, "").replace(/^(src\/)?(shared|features)\//, "").replace(/^\/+|\/+$/g, "").trim();
+      globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${chosenName}/`);
+      globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${chosenName}`);
+      p14.log.step(`Pointing '${modType}/${registryName}' to existing '${folder}/${chosenName}'`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: chosenName,
+        action: "reuse",
+        manifest
+      });
+      continue;
     }
-    for (const pkg of manifest.dependencies?.npm || []) {
+    if (choice === "rename") {
+      const newName = handleCancel(
+        await importPrompts.text({
+          message: "What should we name the new copy?",
+          placeholder: `${registryName}-copy`,
+          validate(val) {
+            const v = val?.trim();
+            if (!v) return "Name cannot be empty";
+            if (v === registryName) return `Name must be different from '${registryName}'`;
+            if (!/^[a-zA-Z0-9_-]+$/.test(v)) {
+              return "Name can only contain alphanumeric characters, dashes, and underscores";
+            }
+            if (checkModuleExists(projectRoot, modType, v)) {
+              return `'${v}' already exists in ${folder}, please choose another name`;
+            }
+          }
+        })
+      ).trim();
+      globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${newName}/`);
+      globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${newName}`);
+      const baseDir = getModuleBaseDir(projectRoot, modType);
+      const displayDest = path2.relative(projectRoot, path2.join(baseDir, newName));
+      p14.log.step(`Importing '${registryName}' into '${displayDest}'...`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: newName,
+        action: "alias",
+        manifest
+      });
+      continue;
+    }
+    if (choice === "overwrite") {
+      p14.log.step(`Overwriting '${modType}/${registryName}' with registry version...`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: registryName,
+        action: "overwrite",
+        manifest
+      });
+      continue;
+    }
+  }
+  const totalWrittenFiles = [];
+  const requiredNpmPackages = /* @__PURE__ */ new Set();
+  for (const node of nodes.values()) {
+    for (const pkg of node.manifest.dependencies?.npm || []) {
       requiredNpmPackages.add(pkg);
     }
-    const folder = modType === "shared" ? "shared" : "features";
-    const targetDir = path2.join(getModuleBaseDir(projectRoot, modType), targetName);
-    const isOverwrite = Boolean(flags.overwrite || options?.overwrite);
-    for (const file of manifest.files || []) {
+  }
+  for (const key of orderedKeys) {
+    const res = resolutions.get(key);
+    if (res.action === "reuse") {
+      continue;
+    }
+    const folder = res.type === "shared" ? "shared" : "features";
+    const targetDir = path2.join(getModuleBaseDir(projectRoot, res.type), res.targetName);
+    const isOverwrite = Boolean(flags.overwrite || res.action === "overwrite");
+    if (key !== rootKey) {
+      p14.log.step(
+        `Importing ${res.type}: ${pc14.cyan(res.targetName)}${res.targetName !== res.registryName ? pc14.dim(` (from ${res.registryName})`) : ""}...`
+      );
+    }
+    if (res.action === "overwrite" && !flags.dryRun) {
+      const existingDir = getExistingModuleDir(projectRoot, res.type, res.targetName);
+      if (existingDir && existingDir !== targetDir) {
+        fs9.rmSync(existingDir, { recursive: true, force: true });
+      }
+      if (fs9.existsSync(targetDir)) {
+        fs9.rmSync(targetDir, { recursive: true, force: true });
+      }
+    }
+    for (const file of res.manifest.files || []) {
       if (file === "registry.json") continue;
-      const remoteFilePath = `${folder}/${registryName}/${file}`;
+      const remoteFilePath = `${folder}/${res.registryName}/${file}`;
       const localFilePath = path2.join(targetDir, file);
       if (fs9.existsSync(localFilePath) && !isOverwrite) {
-        p3.log.warn(
+        p14.log.warn(
           `  \u21B3 Skipping existing file: ${pc14.dim(path2.relative(projectRoot, localFilePath))} (use --overwrite to replace)`
         );
         continue;
       }
       let content = await fetchRegistryFile(registryBase, remoteFilePath);
-      content = rewriteImports(content, aliasMap);
+      content = rewriteImports(content, globalAliasMap);
       if (!flags.dryRun) {
         fs9.mkdirSync(path2.dirname(localFilePath), { recursive: true });
         fs9.writeFileSync(localFilePath, content, "utf-8");
       }
       const displayPath = path2.relative(projectRoot, localFilePath);
       totalWrittenFiles.push(displayPath);
-      p3.log.message(`  ${pc14.green("+")} ${displayPath}`);
+      p14.log.message(`  ${pc14.green("+")} ${displayPath}`);
     }
-    importedModules.add(modKey);
   }
-  await importModuleRecursive(type, name, name);
   const missingNpm = getMissingNpmPackages(projectRoot, Array.from(requiredNpmPackages));
   if (missingNpm.length > 0) {
     if (flags.skipInstall || flags.dryRun) {
-      p3.log.info(`Required npm dependencies to install: ${pc14.cyan(missingNpm.join(", "))}`);
+      p14.log.info(`Required npm dependencies to install: ${pc14.cyan(missingNpm.join(", "))}`);
     } else {
       try {
         installNpmPackages(projectRoot, missingNpm);
       } catch (err) {
-        p3.log.warn(`Could not automatically install packages (${err.message}). Please run: npm install ${missingNpm.join(" ")}`);
+        p14.log.warn(
+          `Could not automatically install packages (${err.message}). Please run: npm install ${missingNpm.join(
+            " "
+          )}`
+        );
       }
     }
   }
   if (flags.dryRun) {
-    p3.log.info(pc14.yellow("Dry run complete: No files were written to disk."));
+    p14.log.info(pc14.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, name));
-    p3.log.success(
+    const displayTarget = path2.relative(projectRoot, path2.join(baseDir, rootRes.targetName));
+    p14.log.success(
       pc14.green(
         `Successfully imported ${type} '${name}' (${totalWrittenFiles.length} file${totalWrittenFiles.length === 1 ? "" : "s"} placed in ${displayTarget})`
       )
@@ -3899,9 +4113,9 @@ async function handleImport(typeArg, nameArg, flags = {}) {
 // src/cli.ts
 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").action(async (args, flags) => {
+  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)").action(async (args, flags) => {
     if (args && args.length > 0) {
-      p3.log.error(
+      p14.log.error(
         pc14.red(
           `Unknown command: "${args.join(" ")}". Use --help to list available commands.`
         )
@@ -3913,7 +4127,7 @@ function createCli() {
       const mode = getEffectiveMode(projectRoot, flags);
       if (mode === "registry") {
         const choice2 = handleCancel(
-          await p3.select({
+          await p14.select({
             message: "\u{1F3DB}\uFE0F  Mason (Registry Mode): What would you like to scaffold?",
             options: [
               {
@@ -3956,7 +4170,7 @@ function createCli() {
         return;
       }
       const choice = handleCancel(
-        await p3.select({
+        await p14.select({
           message: "\u{1F9F1} Mason: What would you like to do?",
           options: [
             {
@@ -3994,7 +4208,7 @@ function createCli() {
   cli.command(
     "import [type] [name]",
     "Import pre-built shared modules or features from the Solid Stack Registry"
-  ).option("-o, --overwrite", "Overwrite existing files").option("-d, --dry-run", "Preview changes without writing to disk").option("-y, --yes", "Accept defaults and skip interactive prompts").option("--registry <url>", "Registry base URL or local directory").option("--skip-install", "Skip automatic package manager dependency installation").example("mason import shared hasher").example("mason import feature authn").example("mason import shared").example("mason import feature").action(async (type, name, flags = {}) => {
+  ).option("-o, --overwrite", "Overwrite existing files").option("-d, --dry-run", "Preview changes without writing to disk").option("-y, --yes", "Accept defaults and skip interactive prompts").option("--registry <url>", "Registry base URL or local directory").option("--skip-install", "Skip automatic package manager dependency installation").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)").example("mason import shared hasher").example("mason import feature authn").example("mason import shared").example("mason import feature").action(async (type, name, flags = {}) => {
     try {
       await handleImport(type, name, flags);
     } catch (err) {
@@ -4024,7 +4238,7 @@ function createCli() {
     });
   }
   cli.help();
-  cli.version("1.0.14");
+  cli.version("1.0.17");
   return cli;
 }
 function handleCliError(err) {
@@ -4032,7 +4246,7 @@ function handleCliError(err) {
     process.exit(0);
   }
   const message = err instanceof Error ? err.message : String(err);
-  p3.log.error(pc14.red(`Error: ${message}`));
+  p14.log.error(pc14.red(`Error: ${message}`));
   process.exit(1);
 }
 async function runCli(argv = process.argv) {