@solid-stack/mason 1.0.11 → 1.0.13

package/dist/bin.js

@@ -1,17 +1,18 @@
 #!/usr/bin/env node
 import { cac } from 'cac';
-import * as p3 from '@clack/prompts';
-import pc13 from 'picocolors';
-import path6 from 'path';
-import fs7 from 'fs';
+import * as p15 from '@clack/prompts';
+import pc15 from 'picocolors';
+import fs12 from 'fs';
+import path2 from 'path';
 import { fileURLToPath } from 'url';
 import Handlebars from 'handlebars';
 import { execSync } from 'child_process';
+import { createHash } from 'crypto';
 
 function writeFileSafely(absolutePath, content, options = {}) {
   const projectRoot = options.projectRoot || process.cwd();
-  const relPath = path6.relative(projectRoot, absolutePath).replace(/\\/g, "/");
-  const existedBefore = fs7.existsSync(absolutePath);
+  const relPath = path2.relative(projectRoot, absolutePath).replace(/\\/g, "/");
+  const existedBefore = fs12.existsSync(absolutePath);
   if (options.dryRun) {
     return {
       relativePath: relPath,
@@ -30,11 +31,11 @@ function writeFileSafely(absolutePath, content, options = {}) {
       existedBefore: true
     };
   }
-  const dir = path6.dirname(absolutePath);
-  if (!fs7.existsSync(dir)) {
-    fs7.mkdirSync(dir, { recursive: true });
+  const dir = path2.dirname(absolutePath);
+  if (!fs12.existsSync(dir)) {
+    fs12.mkdirSync(dir, { recursive: true });
   }
-  fs7.writeFileSync(absolutePath, content, "utf-8");
+  fs12.writeFileSync(absolutePath, content, "utf-8");
   return {
     relativePath: relPath,
     absolutePath,
@@ -46,17 +47,17 @@ function writeFileSafely(absolutePath, content, options = {}) {
 function printGeneratedFiles(files, isDryRun = false) {
   console.log("");
   if (isDryRun) {
-    p3.log.warn(pc13.yellow(pc13.bold("[DRY RUN PREVIEW] No files were written to disk.")));
+    p15.log.warn(pc15.yellow(pc15.bold("[DRY RUN PREVIEW] No files were written to disk.")));
   }
   for (const f of files) {
     if (f.action === "created") {
-      p3.log.success(`${pc13.bold(f.relativePath)} ${pc13.dim("(created)")}`);
+      p15.log.success(`${pc15.bold(f.relativePath)} ${pc15.dim("(created)")}`);
     } else if (f.action === "overwritten") {
-      p3.log.warn(`${pc13.bold(f.relativePath)} ${pc13.dim("(overwritten)")}`);
+      p15.log.warn(`${pc15.bold(f.relativePath)} ${pc15.dim("(overwritten)")}`);
     } else if (f.action === "skipped") {
-      p3.log.info(`${pc13.dim(f.relativePath)} ${pc13.dim("(skipped - already exists, pass -o to overwrite)")}`);
+      p15.log.info(`${pc15.dim(f.relativePath)} ${pc15.dim("(skipped - already exists, pass -o to overwrite)")}`);
     } else {
-      p3.log.info(`${pc13.bold(f.relativePath)} ${pc13.dim("(preview)")}`);
+      p15.log.info(`${pc15.bold(f.relativePath)} ${pc15.dim("(preview)")}`);
     }
   }
 }
@@ -124,27 +125,90 @@ function toStubName(ifaceName) {
   }
   return `Stub${base}`;
 }
+function loadMasonConfig(startDir = process.cwd()) {
+  let current = path2.resolve(startDir);
+  while (true) {
+    const configPath = path2.join(current, "mason.config.json");
+    if (fs12.existsSync(configPath)) {
+      try {
+        return JSON.parse(fs12.readFileSync(configPath, "utf-8"));
+      } catch {
+        return null;
+      }
+    }
+    const parent = path2.dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return null;
+}
+function getEffectiveMode(projectRoot, flags) {
+  if (flags?.registry) return "registry";
+  const config = loadMasonConfig(projectRoot);
+  if (config?.mode) return config.mode;
+  if (fs12.existsSync(path2.join(projectRoot, "index.json")) && (fs12.existsSync(path2.join(projectRoot, "features")) || fs12.existsSync(path2.join(projectRoot, "shared"))) && !fs12.existsSync(path2.join(projectRoot, "src"))) {
+    return "registry";
+  }
+  return "app";
+}
+function getConfiguredFeaturesDir(projectRoot, flags) {
+  if (flags?.target) return path2.resolve(projectRoot, flags.target);
+  if (flags?.dest) return path2.resolve(projectRoot, flags.dest);
+  const config = loadMasonConfig(projectRoot);
+  if (config?.paths?.features) {
+    return path2.resolve(projectRoot, config.paths.features);
+  }
+  const mode = getEffectiveMode(projectRoot, flags);
+  if (mode === "registry") {
+    return path2.join(projectRoot, "features");
+  }
+  if (fs12.existsSync(path2.join(projectRoot, "src/features"))) {
+    return path2.join(projectRoot, "src/features");
+  }
+  return path2.join(projectRoot, "features");
+}
+function getConfiguredSharedDir(projectRoot, flags) {
+  if (flags?.target) return path2.resolve(projectRoot, flags.target);
+  if (flags?.dest) return path2.resolve(projectRoot, flags.dest);
+  const config = loadMasonConfig(projectRoot);
+  if (config?.paths?.shared) {
+    return path2.resolve(projectRoot, config.paths.shared);
+  }
+  const mode = getEffectiveMode(projectRoot, flags);
+  if (mode === "registry") {
+    return path2.join(projectRoot, "shared");
+  }
+  if (fs12.existsSync(path2.join(projectRoot, "src/shared"))) {
+    return path2.join(projectRoot, "src/shared");
+  }
+  return path2.join(projectRoot, "shared");
+}
+
+// src/utils/project.ts
 function findProjectRoot(startDir = process.cwd()) {
-  let current = path6.resolve(startDir);
+  let current = path2.resolve(startDir);
   while (true) {
-    if (fs7.existsSync(path6.join(current, "package.json"))) {
+    if (fs12.existsSync(path2.join(current, "package.json"))) {
       return current;
     }
-    const parent = path6.dirname(current);
+    const parent = path2.dirname(current);
     if (parent === current) {
-      return path6.resolve(startDir);
+      return path2.resolve(startDir);
     }
     current = parent;
   }
 }
-function resolveFeaturesDir(projectRoot) {
-  return path6.join(projectRoot, "features");
+function resolveFeaturesDir(projectRoot, flags) {
+  return getConfiguredFeaturesDir(projectRoot, flags);
+}
+function resolveSharedDir(projectRoot, flags) {
+  return getConfiguredSharedDir(projectRoot, flags);
 }
 function listExistingFeatures(projectRoot) {
   const featuresDir = resolveFeaturesDir(projectRoot);
-  if (!fs7.existsSync(featuresDir)) return [];
+  if (!fs12.existsSync(featuresDir)) return [];
   try {
-    const entries = fs7.readdirSync(featuresDir, { withFileTypes: true });
+    const entries = fs12.readdirSync(featuresDir, { withFileTypes: true });
     return entries.filter((e) => e.isDirectory()).map((e) => e.name).sort();
   } catch {
     return [];
@@ -154,14 +218,14 @@ function listDomainInterfaces(projectRoot, featureName) {
   const results = [];
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
-    const domainDir = path6.join(resolveFeaturesDir(projectRoot), feat, "domain");
-    if (!fs7.existsSync(domainDir)) continue;
+    const domainDir = path2.join(resolveFeaturesDir(projectRoot), feat, "domain");
+    if (!fs12.existsSync(domainDir)) continue;
     try {
-      const files = fs7.readdirSync(domainDir);
+      const files = fs12.readdirSync(domainDir);
       for (const file of files) {
         if (file.endsWith(".ts") && !file.endsWith(".test.ts") && !file.endsWith(".d.ts")) {
           const name = file.replace(/\.ts$/, "");
-          const fullPath = path6.join(domainDir, file);
+          const fullPath = path2.join(domainDir, file);
           if (/^I[A-Z]/.test(name)) {
             results.push({
               name,
@@ -170,7 +234,7 @@ function listDomainInterfaces(projectRoot, featureName) {
             });
           } else {
             try {
-              const content = fs7.readFileSync(fullPath, "utf-8");
+              const content = fs12.readFileSync(fullPath, "utf-8");
               if (/export\s+(?:abstract\s+class|interface)\s+(\w+)/.test(content)) {
                 results.push({
                   name,
@@ -192,17 +256,17 @@ function listDomainEntities(projectRoot, featureName) {
   const results = [];
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
-    const domainDir = path6.join(resolveFeaturesDir(projectRoot), feat, "domain");
-    if (!fs7.existsSync(domainDir)) continue;
+    const domainDir = path2.join(resolveFeaturesDir(projectRoot), feat, "domain");
+    if (!fs12.existsSync(domainDir)) continue;
     try {
-      const files = fs7.readdirSync(domainDir);
+      const files = fs12.readdirSync(domainDir);
       for (const file of files) {
         if (file.endsWith(".ts") && !file.endsWith(".test.ts") && !file.endsWith(".d.ts")) {
           const name = file.replace(/\.ts$/, "");
           if (!/^I[A-Z]/.test(name)) {
             results.push({
               name,
-              fullPath: path6.join(domainDir, file),
+              fullPath: path2.join(domainDir, file),
               feature: feat
             });
           }
@@ -217,16 +281,16 @@ function listUseCases(projectRoot, featureName) {
   const results = [];
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
-    const useCasesDir = path6.join(resolveFeaturesDir(projectRoot), feat, "useCases");
-    if (!fs7.existsSync(useCasesDir)) continue;
+    const useCasesDir = path2.join(resolveFeaturesDir(projectRoot), feat, "useCases");
+    if (!fs12.existsSync(useCasesDir)) continue;
     try {
-      const files = fs7.readdirSync(useCasesDir);
+      const files = fs12.readdirSync(useCasesDir);
       for (const file of files) {
         if (file.endsWith(".ts") && !file.endsWith(".test.ts") && !file.endsWith(".d.ts")) {
           const name = file.replace(/\.ts$/, "");
           results.push({
             name,
-            fullPath: path6.join(useCasesDir, file),
+            fullPath: path2.join(useCasesDir, file),
             feature: feat
           });
         }
@@ -252,33 +316,33 @@ hbs.registerHelper("join", (arr, sep) => {
 });
 var cachedTemplatesDir = null;
 function getTemplatesDir() {
-  if (cachedTemplatesDir && fs7.existsSync(cachedTemplatesDir)) {
+  if (cachedTemplatesDir && fs12.existsSync(cachedTemplatesDir)) {
     return cachedTemplatesDir;
   }
-  const currentDir = typeof __dirname !== "undefined" ? __dirname : path6.dirname(fileURLToPath(import.meta.url));
-  const cand1 = path6.resolve(currentDir, "../../templates");
-  if (fs7.existsSync(cand1)) {
+  const currentDir = typeof __dirname !== "undefined" ? __dirname : path2.dirname(fileURLToPath(import.meta.url));
+  const cand1 = path2.resolve(currentDir, "../../templates");
+  if (fs12.existsSync(cand1)) {
     cachedTemplatesDir = cand1;
     return cand1;
   }
-  const cand2 = path6.resolve(currentDir, "../templates");
-  if (fs7.existsSync(cand2)) {
+  const cand2 = path2.resolve(currentDir, "../templates");
+  if (fs12.existsSync(cand2)) {
     cachedTemplatesDir = cand2;
     return cand2;
   }
-  const cand3 = path6.resolve(currentDir, "templates");
-  if (fs7.existsSync(cand3)) {
+  const cand3 = path2.resolve(currentDir, "templates");
+  if (fs12.existsSync(cand3)) {
     cachedTemplatesDir = cand3;
     return cand3;
   }
   let curr = currentDir;
   while (true) {
-    const candTemplates = path6.join(curr, "templates");
-    if (fs7.existsSync(candTemplates)) {
+    const candTemplates = path2.join(curr, "templates");
+    if (fs12.existsSync(candTemplates)) {
       cachedTemplatesDir = candTemplates;
       return candTemplates;
     }
-    const parent = path6.dirname(curr);
+    const parent = path2.dirname(curr);
     if (parent === curr) break;
     curr = parent;
   }
@@ -286,8 +350,8 @@ function getTemplatesDir() {
 }
 var templateCache = /* @__PURE__ */ new Map();
 function loadTemplate(relativePath) {
-  const fullPath = path6.isAbsolute(relativePath) ? relativePath : path6.join(getTemplatesDir(), relativePath);
-  return fs7.readFileSync(fullPath, "utf-8");
+  const fullPath = path2.isAbsolute(relativePath) ? relativePath : path2.join(getTemplatesDir(), relativePath);
+  return fs12.readFileSync(fullPath, "utf-8");
 }
 function renderTemplateFile(relativePath, context) {
   let compiled = templateCache.get(relativePath);
@@ -374,8 +438,8 @@ function generateDomainEntityCode(name, kind = "interface", properties = []) {
 function generateDomain(options) {
   const projectRoot = options.projectRoot || findProjectRoot();
   const entityName = toPascalCase(options.name);
-  const targetDir = options.targetDir || path6.join(resolveFeaturesDir(projectRoot), options.feature, "domain");
-  const filePath = path6.join(targetDir, `${entityName}.ts`);
+  const targetDir = options.targetDir || path2.join(resolveFeaturesDir(projectRoot), options.feature, "domain");
+  const filePath = path2.join(targetDir, `${entityName}.ts`);
   const code = generateDomainEntityCode(
     entityName,
     options.kind || "interface",
@@ -399,7 +463,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((p15) => `${p15.name}: ${p15.type}`).join("; ") : "";
+    const params = m.params && m.params.length > 0 ? m.params.map((p17) => `${p17.name}: ${p17.type}`).join("; ") : "";
     const returnType = m.returnType ? `Promise<${m.returnType}>` : "Promise<void>";
     return {
       name: m.name,
@@ -424,8 +488,8 @@ function generateInterfaceCode(ifaceName, kind = "abstractClass", entityName, me
 function generateInterface(options) {
   const projectRoot = options.projectRoot || findProjectRoot();
   const ifaceName = ensureInterfacePrefix(options.name);
-  const targetDir = options.targetDir || path6.join(resolveFeaturesDir(projectRoot), options.feature, "domain");
-  const filePath = path6.join(targetDir, `${ifaceName}.ts`);
+  const targetDir = options.targetDir || path2.join(resolveFeaturesDir(projectRoot), options.feature, "domain");
+  const filePath = path2.join(targetDir, `${ifaceName}.ts`);
   const code = generateInterfaceCode(
     ifaceName,
     options.kind || "abstractClass",
@@ -660,7 +724,7 @@ function parseInterfaceMethodsAndImports(content, targetIfaceName) {
   };
 }
 function findInterfaceFile(projectRoot, ifaceName, featureName, customPath) {
-  if (customPath && fs7.existsSync(customPath)) {
+  if (customPath && fs12.existsSync(customPath)) {
     return { filePath: customPath, ifaceName };
   }
   const candidateNames = [
@@ -670,22 +734,22 @@ 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 = path6.join(resolveFeaturesDir(projectRoot), feat, "domain");
-    if (!fs7.existsSync(domainDir)) continue;
+    const domainDir = path2.join(resolveFeaturesDir(projectRoot), feat, "domain");
+    if (!fs12.existsSync(domainDir)) continue;
     for (const cand of candidateNames) {
-      const p1 = path6.join(domainDir, `${cand}.ts`);
-      if (fs7.existsSync(p1)) {
+      const p1 = path2.join(domainDir, `${cand}.ts`);
+      if (fs12.existsSync(p1)) {
         return { filePath: p1, ifaceName: cand, feature: feat };
       }
     }
   }
   for (const cand of candidateNames) {
-    const p1 = path6.join(projectRoot, "domain", `${cand}.ts`);
-    if (fs7.existsSync(p1)) return { filePath: p1, ifaceName: cand };
-    const p22 = path6.join(projectRoot, "src", "domain", `${cand}.ts`);
-    if (fs7.existsSync(p22)) return { filePath: p22, ifaceName: cand };
-    const p32 = path6.join(projectRoot, "interfaces", `${cand}.ts`);
-    if (fs7.existsSync(p32)) return { filePath: p32, ifaceName: cand };
+    const p1 = path2.join(projectRoot, "domain", `${cand}.ts`);
+    if (fs12.existsSync(p1)) return { filePath: p1, ifaceName: cand };
+    const p22 = path2.join(projectRoot, "src", "domain", `${cand}.ts`);
+    if (fs12.existsSync(p22)) return { filePath: p22, ifaceName: cand };
+    const p32 = path2.join(projectRoot, "interfaces", `${cand}.ts`);
+    if (fs12.existsSync(p32)) return { filePath: p32, ifaceName: cand };
   }
   return null;
 }
@@ -708,7 +772,7 @@ function loadInterfaceHierarchy(projectRoot, initialIfaceName, featureName, cust
   while (currentFile && !visited.has(currentFile)) {
     visited.add(currentFile);
     try {
-      const content = fs7.readFileSync(currentFile, "utf-8");
+      const content = fs12.readFileSync(currentFile, "utf-8");
       const parsed = parseInterfaceMethodsAndImports(content, currentName);
       for (const m of parsed.methods) {
         if (!allMethods.some((existing) => existing.name === m.name)) {
@@ -784,7 +848,7 @@ function generateStubCode(stubClassName, ifaceName, entityName, featureName, met
   const entitiesVar = `${entityVar}s`;
   const idKey = `${entityVar}Id`;
   const impPath = ifaceImportPath || `../domain/${ifaceName}.js`;
-  const entityImportPath = ifaceImportPath ? `${path6.dirname(ifaceImportPath)}/${baseEntity}.js` : `../domain/${baseEntity}.js`;
+  const entityImportPath = ifaceImportPath ? `${path2.dirname(ifaceImportPath)}/${baseEntity}.js` : `../domain/${baseEntity}.js`;
   const importsByFrom = /* @__PURE__ */ new Map();
   for (const imp of domainImports) {
     if (imp.name === ifaceName || imp.name === baseEntity) continue;
@@ -833,7 +897,7 @@ function generateConcreteInfraCode(className, ifaceName, dependencies = [], meth
     if (baseEntity) {
       finalMethods = synthesizeCrudMethods(baseEntity);
       if (!finalDomainImports.some((imp) => imp.name === baseEntity)) {
-        const importPath = ifaceImportPath ? `${path6.dirname(ifaceImportPath)}/${baseEntity}.js` : `../domain/${baseEntity}.js`;
+        const importPath = ifaceImportPath ? `${path2.dirname(ifaceImportPath)}/${baseEntity}.js` : `../domain/${baseEntity}.js`;
         finalDomainImports.push({
           name: baseEntity,
           from: importPath,
@@ -878,8 +942,8 @@ function generateInfrastructure(options) {
   const projectRoot = options.projectRoot || findProjectRoot();
   const className = toPascalCase(options.name);
   const isFeatureScope = options.scope !== "global" && Boolean(options.feature);
-  const targetDir = options.targetDir || (isFeatureScope ? path6.join(resolveFeaturesDir(projectRoot), options.feature, "infrastructure") : path6.join(projectRoot, "infrastructure"));
-  const filePath = path6.join(targetDir, `${className}.ts`);
+  const targetDir = options.targetDir || (isFeatureScope ? path2.join(resolveFeaturesDir(projectRoot), options.feature, "infrastructure") : path2.join(projectRoot, "infrastructure"));
+  const filePath = path2.join(targetDir, `${className}.ts`);
   let code;
   if (options.implementsInterface) {
     const rawIfaceName = options.implementsInterface;
@@ -893,7 +957,7 @@ function generateInfrastructure(options) {
     const ifaceFilePath = hierarchy.ifaceFilePath;
     let ifaceImportPath;
     if (ifaceFilePath) {
-      let rel = path6.relative(targetDir, ifaceFilePath).replace(/\\/g, "/").replace(/\.ts$/, ".js");
+      let rel = path2.relative(targetDir, ifaceFilePath).replace(/\\/g, "/").replace(/\.ts$/, ".js");
       if (!rel.startsWith(".")) rel = "./" + rel;
       ifaceImportPath = rel;
     } else if (isFeatureScope) {
@@ -906,8 +970,8 @@ function generateInfrastructure(options) {
         if (new RegExp(`\\b${item.name}\\b`).test(allSignatures)) {
           let fromPath;
           if (imp.specifier.startsWith(".") && ifaceFilePath) {
-            const absTarget = path6.resolve(path6.dirname(ifaceFilePath), imp.specifier);
-            let rel = path6.relative(targetDir, absTarget).replace(/\\/g, "/");
+            const absTarget = path2.resolve(path2.dirname(ifaceFilePath), imp.specifier);
+            let rel = path2.relative(targetDir, absTarget).replace(/\\/g, "/");
             if (!rel.startsWith(".")) rel = "./" + rel;
             fromPath = rel;
           } else {
@@ -980,22 +1044,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 p15 of [...inputProps, ...outputProps]) {
-    const rawType = p15.type.trim();
+  for (const p17 of [...inputProps, ...outputProps]) {
+    const rawType = p17.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((p15) => ({
-    name: p15.name,
-    optional: p15.optional,
-    type: p15.optional && !p15.type.includes("undefined") ? `${p15.type} | undefined` : p15.type
+  const formattedInputProps = inputProps.map((p17) => ({
+    name: p17.name,
+    optional: p17.optional,
+    type: p17.optional && !p17.type.includes("undefined") ? `${p17.type} | undefined` : p17.type
   }));
-  const formattedOutputProps = outputProps.map((p15) => ({
-    name: p15.name,
-    optional: p15.optional,
-    type: p15.optional && !p15.type.includes("undefined") ? `${p15.type} | undefined` : p15.type
+  const formattedOutputProps = outputProps.map((p17) => ({
+    name: p17.name,
+    optional: p17.optional,
+    type: p17.optional && !p17.type.includes("undefined") ? `${p17.type} | undefined` : p17.type
   }));
   const formattedDeps = dependencies.map((dep) => ({
     key: toCamelCase(dep),
@@ -1094,8 +1158,8 @@ function generateUseCase(options) {
   const files = [];
   const projectRoot = options.projectRoot || findProjectRoot();
   const ucName = toPascalCase(options.name);
-  const targetDir = options.targetDir || path6.join(resolveFeaturesDir(projectRoot), options.feature, "useCases");
-  const filePath = path6.join(targetDir, `${ucName}.ts`);
+  const targetDir = options.targetDir || path2.join(resolveFeaturesDir(projectRoot), options.feature, "useCases");
+  const filePath = path2.join(targetDir, `${ucName}.ts`);
   const code = generateUseCaseCode(
     ucName,
     options.dependencies || [],
@@ -1111,7 +1175,7 @@ function generateUseCase(options) {
     })
   );
   if (options.includeTest) {
-    const testPath = path6.join(targetDir, `${ucName}.test.ts`);
+    const testPath = path2.join(targetDir, `${ucName}.test.ts`);
     const testCode = generateUseCaseTestCode(ucName, options.dependencies || []);
     files.push(
       writeFileSafely(testPath, testCode, {
@@ -1179,10 +1243,10 @@ function generateHttpHandler(options) {
   const files = [];
   const projectRoot = options.projectRoot || findProjectRoot();
   const className = toPascalCase(options.name);
-  const pxDir = path6.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress");
-  const handlersDir = path6.join(pxDir, "handlers");
-  const pxIndexPath = path6.join(pxDir, "index.ts");
-  if (!fs7.existsSync(pxIndexPath)) {
+  const pxDir = path2.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress");
+  const handlersDir = path2.join(pxDir, "handlers");
+  const pxIndexPath = path2.join(pxDir, "index.ts");
+  if (!fs12.existsSync(pxIndexPath)) {
     const featurePath = options.routePrefix || `/${options.feature.toLowerCase()}`;
     const pxIndexContent = renderTemplate(expressIndexTemplate, {
       routePath: featurePath
@@ -1195,7 +1259,7 @@ function generateHttpHandler(options) {
       })
     );
   }
-  const handlerFilePath = path6.join(handlersDir, `${className}.ts`);
+  const handlerFilePath = path2.join(handlersDir, `${className}.ts`);
   const code = generateHttpHandlerCode(
     className,
     options.method || "get",
@@ -1216,11 +1280,11 @@ function generateHttpHandler(options) {
   return files;
 }
 function updateOrGenerateDiProvider(featureDir, featureName, bindings = [], options = {}) {
-  const providerPath = path6.join(featureDir, "diProvider.ts");
+  const providerPath = path2.join(featureDir, "diProvider.ts");
   const pascalFeature = toPascalCase(featureName);
   const providerModuleName = `${pascalFeature}Provider`;
-  if (fs7.existsSync(providerPath) && !options.overwrite) {
-    let content = fs7.readFileSync(providerPath, "utf-8");
+  if (fs12.existsSync(providerPath) && !options.overwrite) {
+    let content = fs12.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`;
@@ -1279,7 +1343,7 @@ function generateFeature(options) {
   const projectRoot = options.projectRoot || findProjectRoot();
   const rawName = options.name.trim();
   const featureName = toCamelCase(rawName);
-  const targetDir = options.targetDir || path6.join(resolveFeaturesDir(projectRoot), featureName);
+  const targetDir = options.targetDir || path2.join(resolveFeaturesDir(projectRoot), featureName);
   const routePath = options.routePath || `/${featureName}`;
   const rawEntities = [];
   if (options.entityNames && options.entityNames.length > 0) {
@@ -1300,7 +1364,7 @@ function generateFeature(options) {
       const domainFile = generateDomain({
         name: ent,
         feature: featureName,
-        targetDir: path6.join(targetDir, "domain"),
+        targetDir: path2.join(targetDir, "domain"),
         projectRoot,
         dryRun: options.dryRun,
         overwrite: options.overwrite,
@@ -1320,7 +1384,7 @@ function generateFeature(options) {
       const ifaceFile = generateInterface({
         name: ifaceName,
         feature: featureName,
-        targetDir: path6.join(targetDir, "domain"),
+        targetDir: path2.join(targetDir, "domain"),
         entityName: ent,
         projectRoot,
         dryRun: options.dryRun,
@@ -1337,7 +1401,7 @@ function generateFeature(options) {
       const stubFile = generateInfrastructure({
         name: stubName,
         feature: featureName,
-        targetDir: path6.join(targetDir, "infrastructure"),
+        targetDir: path2.join(targetDir, "infrastructure"),
         kind: "stub",
         implementsInterface: ifaceName,
         entityName: ent,
@@ -1379,7 +1443,7 @@ function generateFeature(options) {
       const ucFiles = generateUseCase({
         name: ucName,
         feature: featureName,
-        targetDir: path6.join(targetDir, "useCases"),
+        targetDir: path2.join(targetDir, "useCases"),
         dependencies: options.includeInterface !== false ? [ifaceName] : [],
         inputProperties: [{ name: idParam, type: "string" }],
         outputProperties: [{ name: entVar, type: primaryEntity }],
@@ -1424,7 +1488,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path2.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [{ name: entVar, type: ent }],
             outputProperties: [{ name: entVar, type: ent }],
@@ -1457,7 +1521,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path2.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [{ name: idParam, type: "string" }],
             outputProperties: [{ name: entVar, type: ent }],
@@ -1490,7 +1554,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path2.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [
               { name: "page", type: "number", optional: true },
@@ -1534,7 +1598,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path2.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [{ name: entVar, type: ent }],
             outputProperties: [{ name: entVar, type: ent }],
@@ -1567,7 +1631,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path2.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [{ name: idParam, type: "string" }],
             outputProperties: [{ name: "success", type: "boolean" }],
@@ -1604,7 +1668,7 @@ function generateFeature(options) {
       const ucFiles = generateUseCase({
         name: ucName,
         feature: featureName,
-        targetDir: path6.join(targetDir, "useCases"),
+        targetDir: path2.join(targetDir, "useCases"),
         dependencies: customUc.dependencies || [],
         inputProperties: customUc.inputProperties || [],
         outputProperties: customUc.outputProperties || [],
@@ -1636,8 +1700,8 @@ function generateFeature(options) {
     }
   }
   if (options.includeExpress !== false) {
-    const pxDir = path6.join(targetDir, "pxExpress");
-    const pxIndexPath = path6.join(pxDir, "index.ts");
+    const pxDir = path2.join(targetDir, "pxExpress");
+    const pxIndexPath = path2.join(pxDir, "index.ts");
     if (!files.some((f) => f.absolutePath === pxIndexPath)) {
       const pxIndexContent = renderTemplate(expressIndexTemplate, { routePath });
       files.push(
@@ -1666,23 +1730,23 @@ var PromptCancelledError = class extends Error {
   }
 };
 function handleCancel(result) {
-  if (p3.isCancel(result)) {
-    p3.cancel("Operation cancelled.");
+  if (p15.isCancel(result)) {
+    p15.cancel("Operation cancelled.");
     throw new PromptCancelledError();
   }
   return result;
 }
 function printBanner() {
   console.log("");
-  p3.intro(pc13.bgCyan(pc13.black(" @solid-stack/mason ")));
+  p15.intro(pc15.bgCyan(pc15.black(" @solid-stack/mason ")));
 }
 async function promptProperties(options = {}) {
   const properties = options.defaults ? [...options.defaults] : [];
   if (properties.length > 0) {
-    const summary = properties.map((p15) => `${p15.name}: ${p15.type}${p15.optional ? "?" : ""}`).join(", ");
-    p3.log.info(pc13.dim(`Pre-configured fields: ${summary}`));
+    const summary = properties.map((p17) => `${p17.name}: ${p17.type}${p17.optional ? "?" : ""}`).join(", ");
+    p15.log.info(pc15.dim(`Pre-configured fields: ${summary}`));
     const addMore = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Would you like to add custom fields/properties?",
         initialValue: false
       })
@@ -1691,10 +1755,10 @@ async function promptProperties(options = {}) {
       return properties;
     }
   }
-  p3.log.info(pc13.cyan("Enter properties (leave name blank when finished):"));
+  p15.log.info(pc15.cyan("Enter properties (leave name blank when finished):"));
   while (true) {
     const name = handleCancel(
-      await p3.text({
+      await p15.text({
         message: "Property name (or press Enter to finish):",
         placeholder: "e.g. title, email, status"
       })
@@ -1703,7 +1767,7 @@ async function promptProperties(options = {}) {
       break;
     }
     const type = handleCancel(
-      await p3.select({
+      await p15.select({
         message: `Type for property "${name.trim()}":`,
         options: [
           { value: "string", label: "string" },
@@ -1720,7 +1784,7 @@ async function promptProperties(options = {}) {
     let finalType = type;
     if (type === "custom") {
       finalType = handleCancel(
-        await p3.text({
+        await p15.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"
@@ -1728,7 +1792,7 @@ async function promptProperties(options = {}) {
       );
     }
     const optional = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: `Is "${name.trim()}" optional?`,
         initialValue: false
       })
@@ -1738,8 +1802,8 @@ async function promptProperties(options = {}) {
       type: finalType.trim(),
       optional
     });
-    p3.log.success(
-      pc13.green(`Added: ${name.trim()}${optional ? "?" : ""}: ${finalType.trim()}`)
+    p15.log.success(
+      pc15.green(`Added: ${name.trim()}${optional ? "?" : ""}: ${finalType.trim()}`)
     );
   }
   return properties;
@@ -1748,13 +1812,14 @@ async function promptProperties(options = {}) {
 // src/commands/feature.ts
 async function runFeatureCommand(featureNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
+  const isRegistry = getEffectiveMode(projectRoot, flags) === "registry";
   let name = featureNameArg?.trim();
   if (!name && flags.yes) {
     name = "feature";
   }
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p15.text({
         message: "What is the feature name?",
         placeholder: "e.g. users, auth, orders, billing",
         validate: (val) => {
@@ -1765,18 +1830,19 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
     ).trim();
   }
   const normalizedName = toCamelCase(name);
-  const defaultDir = path6.relative(projectRoot, path6.join(resolveFeaturesDir(projectRoot), normalizedName));
+  const baseFeaturesDir = resolveFeaturesDir(projectRoot, flags);
+  const defaultDir = path2.relative(projectRoot, path2.join(baseFeaturesDir, normalizedName));
   let targetDirRel = defaultDir;
-  if (!flags.yes && !flags.target) {
+  if (!flags.yes && !flags.target && !flags.dest) {
     targetDirRel = handleCancel(
-      await p3.text({
+      await p15.text({
         message: "Target directory for the feature:",
         initialValue: defaultDir,
         defaultValue: defaultDir
       })
     ).trim();
   }
-  const targetDir = flags.target ? path6.resolve(projectRoot, flags.target) : path6.resolve(projectRoot, targetDirRel);
+  const targetDir = flags.dest ? path2.resolve(projectRoot, flags.dest) : flags.target ? path2.resolve(projectRoot, flags.target) : path2.resolve(projectRoot, targetDirRel);
   let includeExpress = flags.express !== void 0 ? Boolean(flags.express) : true;
   let routePath = `/${normalizedName}`;
   let includeDomain = true;
@@ -1791,14 +1857,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   const customUseCases = [];
   if (!flags.yes) {
     includeExpress = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Include Express Presentation layer (pxExpress routes & handlers)?",
         initialValue: true
       })
     );
     if (includeExpress) {
       routePath = handleCancel(
-        await p3.text({
+        await p15.text({
           message: "Express route prefix:",
           initialValue: `/${normalizedName}`,
           defaultValue: `/${normalizedName}`
@@ -1806,14 +1872,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       ).trim();
     }
     includeDomain = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Include Domain Entity/Entities?",
         initialValue: true
       })
     );
     if (includeDomain) {
       const domainInput = handleCancel(
-        await p3.text({
+        await p15.text({
           message: "Domain entity name(s) (comma-separated):",
           initialValue: defaultEntity,
           defaultValue: defaultEntity,
@@ -1832,21 +1898,21 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       entityNames = [defaultEntity];
     }
     includeInterface = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: `Include Domain Repository interface(s) for ${entityNames.join(", ")}?`,
         initialValue: true
       })
     );
     if (includeInterface) {
       includeInfra = handleCancel(
-        await p3.confirm({
+        await p15.confirm({
           message: `Include Infrastructure Stub implementation(s) for ${entityNames.join(", ")}?`,
           initialValue: true
         })
       );
     }
     includeUseCase = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Include Domain Use Cases?",
         initialValue: true
       })
@@ -1860,7 +1926,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
         { value: "delete", label: "Delete (Delete<Entity>)", hint: "DELETE /:id" }
       ];
       crudOperations = handleCancel(
-        await p3.multiselect({
+        await p15.multiselect({
           message: "Select standard CRUD use cases to generate:",
           options: crudChoices,
           initialValues: ["create", "read", "list", "update", "delete"],
@@ -1868,13 +1934,13 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
         })
       );
       includeTests = handleCancel(
-        await p3.confirm({
+        await p15.confirm({
           message: "Generate Vitest unit tests for use cases?",
           initialValue: true
         })
       );
       const wantCustom = handleCancel(
-        await p3.confirm({
+        await p15.confirm({
           message: "Do you want to add any custom use cases to this feature?",
           initialValue: false
         })
@@ -1884,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 p15.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"
@@ -1894,7 +1960,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           let selectedDeps = [];
           if (availableIfaces.length > 0) {
             selectedDeps = handleCancel(
-              await p3.multiselect({
+              await p15.multiselect({
                 message: `Select domain interfaces to inject into ${customUcName}:`,
                 options: availableIfaces.map((i) => ({ value: i, label: i })),
                 required: false
@@ -1903,7 +1969,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           }
           let customInputProps = [];
           const hasInput = handleCancel(
-            await p3.confirm({
+            await p15.confirm({
               message: `Does ${customUcName} accept input arguments?`,
               initialValue: true
             })
@@ -1914,7 +1980,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           }
           let customOutputProps = [];
           const hasCustomOutput = handleCancel(
-            await p3.confirm({
+            await p15.confirm({
               message: `Does ${customUcName} return custom output data?`,
               initialValue: false
             })
@@ -1924,7 +1990,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
               });
           }
           const customIncludeTest = handleCancel(
-            await p3.confirm({
+            await p15.confirm({
               message: `Generate Vitest unit test for ${customUcName}?`,
               initialValue: true
             })
@@ -1934,14 +2000,14 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
           let customHttpPath = `/${toKebabCase(customUcName)}`;
           if (includeExpress) {
             customCreateHttp = handleCancel(
-              await p3.confirm({
+              await p15.confirm({
                 message: `Generate a matching ExpressRoute HTTP handler for ${customUcName}?`,
                 initialValue: true
               })
             );
             if (customCreateHttp) {
               customHttpMethod = handleCancel(
-                await p3.select({
+                await p15.select({
                   message: "HTTP method for route:",
                   options: [
                     { value: "post", label: "POST" },
@@ -1954,7 +2020,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
                 })
               );
               customHttpPath = handleCancel(
-                await p3.text({
+                await p15.text({
                   message: "Route subpath (relative to feature prefix):",
                   initialValue: `/${toKebabCase(customUcName)}`,
                   defaultValue: `/${toKebabCase(customUcName)}`
@@ -1975,7 +2041,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
             validationFields: customInputProps
           });
           addMore = handleCancel(
-            await p3.confirm({
+            await p15.confirm({
               message: "Add another custom use case?",
               initialValue: false
             })
@@ -1984,7 +2050,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       }
     }
     includeDiProvider = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Generate / update feature DI provider (diProvider.ts)?",
         initialValue: true
       })
@@ -1996,8 +2062,8 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       entityNames = [defaultEntity];
     }
   }
-  const s = p3.spinner();
-  s.start(`Generating feature '${pc13.cyan(normalizedName)}'...`);
+  const s = p15.spinner();
+  s.start(`Generating feature '${pc15.cyan(normalizedName)}'...`);
   const options = {
     name: normalizedName,
     projectRoot,
@@ -2017,9 +2083,207 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
     includeDiProvider
   };
   const files = generateFeature(options);
+  if (isRegistry) {
+    const registryPath = path2.join(targetDir, "registry.json");
+    if (!fs12.existsSync(registryPath)) {
+      const manifest = {
+        name: toKebabCase(normalizedName),
+        type: "feature",
+        description: flags.description || `${normalizedName} feature module`,
+        version: "1.0.0",
+        dependencies: {
+          npm: includeExpress ? ["@solid-stack/agnos-express", "express"] : [],
+          shared: [],
+          features: []
+        },
+        files: []
+      };
+      const content = JSON.stringify(manifest, null, 2) + "\n";
+      const genFile = writeFileSafely(registryPath, content, {
+        projectRoot,
+        overwrite: options.overwrite,
+        dryRun: options.dryRun
+      });
+      files.push(genFile);
+    }
+  }
   s.stop("Feature scaffolded successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc13.green(`Feature '${normalizedName}' ready to use!`));
+  p15.outro(
+    pc15.green(
+      `\u2713 Feature '${normalizedName}' initialized in ${path2.relative(projectRoot, targetDir)} (uncommitted, unregistered)`
+    )
+  );
+}
+function generateShared(options) {
+  const files = [];
+  const projectRoot = options.projectRoot || findProjectRoot();
+  const rawName = options.name.trim();
+  const pascalName = toPascalCase(rawName);
+  const camelName = toCamelCase(rawName);
+  const kebabName = toKebabCase(rawName);
+  const targetDir = options.targetDir || path2.join(resolveSharedDir(projectRoot), kebabName);
+  const fileDefs = [];
+  const facadeContent = `import { MakeInjectable, type DepsType } from "@solid-stack/di";
+import { I${pascalName}Engine } from "./ports/I${pascalName}Engine.js";
+
+@MakeInjectable
+export class ${pascalName} {
+  public static deps = { ${camelName}Engine: I${pascalName}Engine };
+  constructor(public readonly deps: DepsType<typeof ${pascalName}.deps>) {}
+}
+`;
+  fileDefs.push({
+    absolutePath: path2.join(targetDir, `${pascalName}.ts`),
+    content: facadeContent
+  });
+  const portContent = `export abstract class I${pascalName}Engine {
+  // Define abstract port contracts for ${pascalName} here
+}
+`;
+  fileDefs.push({
+    absolutePath: path2.join(targetDir, "ports", `I${pascalName}Engine.ts`),
+    content: portContent
+  });
+  const concreteContent = `import { MakeInjectable } from "@solid-stack/di";
+import { I${pascalName}Engine } from "../ports/I${pascalName}Engine.js";
+
+@MakeInjectable
+export class Default${pascalName}Engine implements I${pascalName}Engine {
+  // Default concrete implementation for production
+}
+`;
+  fileDefs.push({
+    absolutePath: path2.join(targetDir, "infrastructure", `Default${pascalName}Engine.ts`),
+    content: concreteContent
+  });
+  if (options.includeStub !== false) {
+    const stubContent = `import { MakeInjectable } from "@solid-stack/di";
+import { I${pascalName}Engine } from "../ports/I${pascalName}Engine.js";
+
+@MakeInjectable
+export class Stub${pascalName}Engine implements I${pascalName}Engine {
+  // In-memory or stub implementation for testing
+}
+`;
+    fileDefs.push({
+      absolutePath: path2.join(targetDir, "infrastructure", `Stub${pascalName}Engine.ts`),
+      content: stubContent
+    });
+  }
+  const providerContent = `import type { Container } from "@solid-stack/di";
+import { I${pascalName}Engine } from "./ports/I${pascalName}Engine.js";
+import { Default${pascalName}Engine } from "./infrastructure/Default${pascalName}Engine.js";
+
+export const diProvider = (c: Container): void => {
+  c.provide(I${pascalName}Engine, Default${pascalName}Engine);
+};
+
+export default diProvider;
+`;
+  fileDefs.push({
+    absolutePath: path2.join(targetDir, "diProvider.ts"),
+    content: providerContent
+  });
+  if (options.isRegistry) {
+    const registryManifest = {
+      name: kebabName,
+      type: "shared",
+      description: options.description || `${kebabName} shared module`,
+      version: "1.0.0",
+      dependencies: {
+        npm: [],
+        shared: [],
+        features: []
+      },
+      files: []
+    };
+    fileDefs.push({
+      absolutePath: path2.join(targetDir, "registry.json"),
+      content: JSON.stringify(registryManifest, null, 2) + "\n"
+    });
+  }
+  for (const def of fileDefs) {
+    const genFile = writeFileSafely(def.absolutePath, def.content, {
+      projectRoot,
+      overwrite: options.overwrite,
+      dryRun: options.dryRun
+    });
+    files.push(genFile);
+  }
+  return files;
+}
+
+// src/commands/shared.ts
+async function runSharedCommand(sharedNameArg, flags = {}) {
+  const projectRoot = findProjectRoot();
+  const isRegistry = getEffectiveMode(projectRoot, flags) === "registry";
+  let name = sharedNameArg?.trim();
+  if (!name && flags.yes) {
+    name = "shared";
+  }
+  if (!name) {
+    name = handleCancel(
+      await p15.text({
+        message: "What is the shared module name?",
+        placeholder: "e.g. hasher, time, uuid, cache, logger",
+        validate: (val) => {
+          if (!val || !val.trim()) return "Shared module name cannot be empty.";
+          return void 0;
+        }
+      })
+    ).trim();
+  }
+  const normalizedName = toKebabCase(name);
+  const baseSharedDir = resolveSharedDir(projectRoot, flags);
+  const defaultDir = path2.relative(projectRoot, path2.join(baseSharedDir, normalizedName));
+  let targetDirRel = defaultDir;
+  if (!flags.yes && !flags.target && !flags.dest) {
+    targetDirRel = handleCancel(
+      await p15.text({
+        message: "Target directory for the shared module:",
+        initialValue: defaultDir,
+        defaultValue: defaultDir
+      })
+    ).trim();
+  }
+  const targetDir = flags.dest ? path2.resolve(projectRoot, flags.dest) : flags.target ? path2.resolve(projectRoot, flags.target) : path2.resolve(projectRoot, targetDirRel);
+  let description = flags.description || "";
+  let includeStub = true;
+  if (!flags.yes) {
+    description = handleCancel(
+      await p15.text({
+        message: "Module description (optional):",
+        placeholder: "e.g. In-memory caching and Redis port abstraction",
+        initialValue: ""
+      })
+    ).trim();
+    includeStub = handleCancel(
+      await p15.confirm({
+        message: "Include stub implementation in infrastructure/?",
+        initialValue: true
+      })
+    );
+  }
+  const s = p15.spinner();
+  s.start(`Generating shared module '${pc15.cyan(normalizedName)}'...`);
+  const files = generateShared({
+    name: normalizedName,
+    description,
+    projectRoot,
+    targetDir,
+    dryRun: Boolean(flags.dryRun),
+    overwrite: Boolean(flags.overwrite),
+    includeStub,
+    isRegistry
+  });
+  s.stop("Shared module generated successfully!");
+  printGeneratedFiles(files, Boolean(flags.dryRun));
+  p15.outro(
+    pc15.green(
+      `\u2713 Shared module '${normalizedName}' initialized in ${path2.relative(projectRoot, targetDir)} (uncommitted, unregistered)`
+    )
+  );
 }
 async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2030,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 p15.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p15.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2047,7 +2311,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p15.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2058,7 +2322,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   let name = useCaseNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p15.text({
         message: "Use Case name:",
         placeholder: "e.g. CreateUser, GetUser, CancelOrder",
         validate: (v) => v && v.trim() ? void 0 : "Use Case name cannot be empty"
@@ -2074,7 +2338,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       label: i.name
     }));
     selectedDeps = handleCancel(
-      await p3.multiselect({
+      await p15.multiselect({
         message: "Select domain interfaces to inject into use case:",
         options: multiOptions,
         required: false
@@ -2089,7 +2353,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   let httpPath = "/";
   if (!flags.yes) {
     const hasInput = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Does this use case accept input arguments?",
         initialValue: true
       })
@@ -2099,7 +2363,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         });
     }
     const hasCustomOutput = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Does this use case return custom output data?",
         initialValue: false
       })
@@ -2109,20 +2373,20 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         });
     }
     includeTest = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Generate Vitest unit test skeleton (.test.ts)?",
         initialValue: true
       })
     );
     createHttp = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Generate a matching ExpressRoute HTTP handler?",
         initialValue: false
       })
     );
     if (createHttp) {
       httpMethod = handleCancel(
-        await p3.select({
+        await p15.select({
           message: "HTTP method for route:",
           options: [
             { value: "post", label: "POST" },
@@ -2135,7 +2399,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
         })
       );
       httpPath = handleCancel(
-        await p3.text({
+        await p15.text({
           message: "Route subpath (relative to feature prefix):",
           initialValue: "/",
           defaultValue: "/"
@@ -2143,8 +2407,8 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
       ).trim();
     }
   }
-  const s = p3.spinner();
-  s.start(`Generating use case '${pc13.cyan(ucName)}'...`);
+  const s = p15.spinner();
+  s.start(`Generating use case '${pc15.cyan(ucName)}'...`);
   const options = {
     name: ucName,
     feature,
@@ -2176,7 +2440,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   }
   s.stop("Use case generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc13.green(`Use case '${ucName}' created in feature '${feature}'!`));
+  p15.outro(pc15.green(`Use case '${ucName}' created in feature '${feature}'!`));
 }
 async function runDomainCommand(domainNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2187,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 p15.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p15.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2204,7 +2468,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p15.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2215,7 +2479,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   let name = domainNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p15.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"
@@ -2227,7 +2491,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   let properties = [];
   if (!flags.yes) {
     kind = handleCancel(
-      await p3.select({
+      await p15.select({
         message: "Select domain model type:",
         options: [
           { value: "interface", label: "TypeScript Interface (pure data structure)" },
@@ -2246,8 +2510,8 @@ async function runDomainCommand(domainNameArg, flags = {}) {
       defaults: kind === "valueObject" ? [{ name: "value", type: "string" }] : defaultProps
     });
   }
-  const s = p3.spinner();
-  s.start(`Generating domain model '${pc13.cyan(entityName)}'...`);
+  const s = p15.spinner();
+  s.start(`Generating domain model '${pc15.cyan(entityName)}'...`);
   const options = {
     name: entityName,
     feature,
@@ -2260,7 +2524,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   const file = generateDomain(options);
   s.stop("Domain model generated successfully!");
   printGeneratedFiles([file], options.dryRun);
-  p3.outro(pc13.green(`Domain model '${entityName}' created in feature '${feature}'!`));
+  p15.outro(pc15.green(`Domain model '${entityName}' created in feature '${feature}'!`));
 }
 async function runInfrastructureCommand(classNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2269,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 p15.select({
         message: "Where should this infrastructure implementation be placed?",
         options: [
           { value: "feature", label: "Feature-level (features/<feature>/infrastructure)" },
@@ -2284,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 p15.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p15.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2301,7 +2565,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p15.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2314,7 +2578,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   let name = classNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p15.text({
         message: "Infrastructure class name:",
         placeholder: "e.g. StubUserRepository, PostgresUserRepository, S3FileStorage",
         validate: (v) => v && v.trim() ? void 0 : "Class name cannot be empty"
@@ -2333,7 +2597,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
           (i) => className.toLowerCase().includes(removeInterfacePrefix(i.name).toLowerCase())
         );
         const ifaceChoice = handleCancel(
-          await p3.select({
+          await p15.select({
             message: "Does this class implement a domain interface or abstract class?",
             options: [
               ...interfaces.map((i) => ({ value: i.name, label: i.name })),
@@ -2345,7 +2609,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
         );
         if (ifaceChoice === "__custom__") {
           implementsInterface = handleCancel(
-            await p3.text({
+            await p15.text({
               message: "Enter interface or abstract class name:",
               placeholder: "e.g. IUserRepository, BaseStorageAdapter",
               validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2356,14 +2620,14 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
         }
       } else {
         const wantImpl = handleCancel(
-          await p3.confirm({
+          await p15.confirm({
             message: "Does this class implement a domain interface or abstract class?",
             initialValue: false
           })
         );
         if (wantImpl) {
           implementsInterface = handleCancel(
-            await p3.text({
+            await p15.text({
               message: "Enter interface or abstract class name:",
               placeholder: "e.g. IUserRepository, BaseStorageAdapter",
               validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2383,7 +2647,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
     const allInterfaces = listDomainInterfaces(projectRoot);
     if (allInterfaces.length > 0) {
       const ifaceChoice = handleCancel(
-        await p3.select({
+        await p15.select({
           message: "Does this class implement an interface or abstract class?",
           options: [
             ...allInterfaces.map((i) => ({ value: i.name, label: `${i.name} (${i.feature})` })),
@@ -2395,7 +2659,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
       );
       if (ifaceChoice === "__custom__") {
         implementsInterface = handleCancel(
-          await p3.text({
+          await p15.text({
             message: "Enter interface or abstract class name:",
             placeholder: "e.g. IAuthRepository",
             validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
@@ -2408,7 +2672,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   }
   if (!flags.yes && !flags.kind) {
     kind = handleCancel(
-      await p3.select({
+      await p15.select({
         message: "Select implementation kind:",
         options: [
           { value: "stub", label: "In-Memory Stub (with in-memory store and test helper methods)" },
@@ -2419,7 +2683,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
     );
     if (scope === "feature" && feature && implementsInterface) {
       registerInProvider = handleCancel(
-        await p3.confirm({
+        await p15.confirm({
           message: "Register this implementation in feature diProvider.ts?",
           initialValue: true
         })
@@ -2428,8 +2692,8 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   } else if (flags.yes && scope === "feature" && feature && implementsInterface) {
     registerInProvider = !flags.noProvider;
   }
-  const s = p3.spinner();
-  s.start(`Generating infrastructure class '${pc13.cyan(className)}'...`);
+  const s = p15.spinner();
+  s.start(`Generating infrastructure class '${pc15.cyan(className)}'...`);
   const files = [];
   const options = {
     name: className,
@@ -2444,7 +2708,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   const infraFile = generateInfrastructure(options);
   files.push(infraFile);
   if (registerInProvider && scope === "feature" && feature && implementsInterface) {
-    const featureDir = path6.join(resolveFeaturesDir(projectRoot), feature);
+    const featureDir = path2.join(resolveFeaturesDir(projectRoot), feature);
     const providerFile = updateOrGenerateDiProvider(
       featureDir,
       feature,
@@ -2464,7 +2728,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   }
   s.stop("Infrastructure class generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc13.green(`Infrastructure class '${className}' created!`));
+  p15.outro(pc15.green(`Infrastructure class '${className}' created!`));
 }
 async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2475,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 p15.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p15.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2492,7 +2756,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p15.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2503,7 +2767,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   let name = interfaceNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p15.text({
         message: "Domain interface name:",
         placeholder: "e.g. IUserRepository, IPaymentService",
         validate: (v) => v && v.trim() ? void 0 : "Interface name cannot be empty"
@@ -2521,7 +2785,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   if (!flags.yes) {
     if (existingEntities.length > 0) {
       const selectedEntity = handleCancel(
-        await p3.select({
+        await p15.select({
           message: "Select domain entity associated with this interface:",
           options: [
             ...existingEntities.map((e) => ({ value: e.name, label: e.name })),
@@ -2532,7 +2796,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       );
       if (selectedEntity === "__custom__") {
         entityName = handleCancel(
-          await p3.text({
+          await p15.text({
             message: "Enter entity name:",
             defaultValue: removeInterfacePrefix(ifaceName).replace(/Repository$|Service$/, "")
           })
@@ -2542,7 +2806,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       }
     }
     kind = handleCancel(
-      await p3.select({
+      await p15.select({
         message: "Interface definition style:",
         options: [
           { value: "abstractClass", label: "Abstract Class (Recommended - acts as DI token & type)" },
@@ -2552,7 +2816,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       })
     );
     methodsPreset = handleCancel(
-      await p3.select({
+      await p15.select({
         message: "Method signature preset:",
         options: [
           { value: "crud", label: "Standard CRUD (GetById, List, Create, Update, Delete)" },
@@ -2562,22 +2826,22 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
       })
     );
     generateStub = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Auto-generate Infrastructure Stub implementation?",
         initialValue: true
       })
     );
     if (generateStub) {
       registerInProvider = handleCancel(
-        await p3.confirm({
+        await p15.confirm({
           message: "Auto-register interface & stub in feature diProvider.ts?",
           initialValue: true
         })
       );
     }
   }
-  const s = p3.spinner();
-  s.start(`Generating interface '${pc13.cyan(ifaceName)}'...`);
+  const s = p15.spinner();
+  s.start(`Generating interface '${pc15.cyan(ifaceName)}'...`);
   const files = [];
   const options = {
     name: ifaceName,
@@ -2606,7 +2870,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
     files.push(stubFile);
   }
   if (registerInProvider && generateStub) {
-    const featureDir = path6.join(resolveFeaturesDir(projectRoot), feature);
+    const featureDir = path2.join(resolveFeaturesDir(projectRoot), feature);
     const providerFile = updateOrGenerateDiProvider(
       featureDir,
       feature,
@@ -2626,7 +2890,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   }
   s.stop("Interface generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc13.green(`Interface '${ifaceName}' created in feature '${feature}'!`));
+  p15.outro(pc15.green(`Interface '${ifaceName}' created in feature '${feature}'!`));
 }
 async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2637,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 p15.select({
           message: "Select target feature:",
           options: featureOptions
         })
       );
       if (selected === "__custom__") {
         feature = handleCancel(
-          await p3.text({
+          await p15.text({
             message: "Enter feature name:",
             validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
           })
@@ -2654,7 +2918,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
       }
     } else {
       feature = handleCancel(
-        await p3.text({
+        await p15.text({
           message: "Enter target feature name:",
           validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
         })
@@ -2665,7 +2929,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   let name = handlerNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p15.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"
@@ -2684,7 +2948,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   let validationFields = [];
   if (!flags.yes) {
     method = handleCancel(
-      await p3.select({
+      await p15.select({
         message: "HTTP Method:",
         options: [
           { value: "get", label: "GET" },
@@ -2698,7 +2962,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
     );
     const defaultPath = method === "get" ? "/" : "/";
     subPath = handleCancel(
-      await p3.text({
+      await p15.text({
         message: "Route subpath (relative to feature prefix):",
         initialValue: defaultPath,
         defaultValue: defaultPath
@@ -2709,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 p15.select({
           message: "Connect this handler to a domain Use Case?",
           options: ucOptions,
           initialValue: ucOptions[0]?.value
@@ -2720,7 +2984,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
       }
     }
     includeValidation = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: "Include Zod inbound request validation?",
         initialValue: method !== "delete"
       })
@@ -2728,7 +2992,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
     if (includeValidation) {
       const defaultSource = method === "get" ? "query" : "body";
       validationSource = handleCancel(
-        await p3.select({
+        await p15.select({
           message: "Validation data source:",
           options: [
             { value: "body", label: "req.body (for POST / PUT / PATCH payloads)" },
@@ -2742,8 +3006,8 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
         });
     }
   }
-  const s = p3.spinner();
-  s.start(`Generating HTTP handler '${pc13.cyan(className)}'...`);
+  const s = p15.spinner();
+  s.start(`Generating HTTP handler '${pc15.cyan(className)}'...`);
   const options = {
     name: className,
     feature,
@@ -2761,7 +3025,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   const files = generateHttpHandler(options);
   s.stop("HTTP handler generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc13.green(`HTTP handler '${className}' created in feature '${feature}'!`));
+  p15.outro(pc15.green(`HTTP handler '${className}' created in feature '${feature}'!`));
 }
 function generateInjectableCode(className, dependencies = [], methods = [], implementsInterface) {
   const formattedDeps = dependencies.map((dep) => ({
@@ -2771,7 +3035,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((p15) => `${p15.name}: ${p15.type}`).join(", ") : "";
+    const params = m.params && m.params.length > 0 ? m.params.map((p17) => `${p17.name}: ${p17.type}`).join(", ") : "";
     return {
       name: m.name,
       isAsync,
@@ -2794,21 +3058,21 @@ function generateInjectable(options) {
   const className = toPascalCase(options.name);
   let targetDir = "";
   if (options.customPath) {
-    targetDir = path6.isAbsolute(options.customPath) ? options.customPath : path6.join(projectRoot, options.customPath);
+    targetDir = path2.isAbsolute(options.customPath) ? options.customPath : path2.join(projectRoot, options.customPath);
   } else if (options.location === "feature-service" && options.feature) {
-    targetDir = path6.join(resolveFeaturesDir(projectRoot), options.feature, "services");
+    targetDir = path2.join(resolveFeaturesDir(projectRoot), options.feature, "services");
   } else if (options.location === "feature-transformer" && options.feature) {
-    targetDir = path6.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress", "transformers");
+    targetDir = path2.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress", "transformers");
   } else if (options.location === "module") {
-    targetDir = path6.join(projectRoot, "modules", className);
+    targetDir = path2.join(projectRoot, "modules", className);
   } else {
-    targetDir = options.feature ? path6.join(resolveFeaturesDir(projectRoot), options.feature, "services") : path6.join(projectRoot, "shared", className.toLowerCase());
+    targetDir = options.feature ? path2.join(resolveFeaturesDir(projectRoot), options.feature, "services") : path2.join(projectRoot, "shared", className.toLowerCase());
   }
-  const filePath = path6.join(targetDir, `${className}.ts`);
+  const filePath = path2.join(targetDir, `${className}.ts`);
   let ifaceName;
   if (options.generateInterface) {
     ifaceName = `I${className}`;
-    const ifacePath = path6.join(targetDir, `${ifaceName}.ts`);
+    const ifacePath = path2.join(targetDir, `${ifaceName}.ts`);
     const ifaceContent = renderTemplate(injectableInterfaceTemplate, { ifaceName });
     files.push(
       writeFileSafely(ifacePath, ifaceContent, {
@@ -2841,7 +3105,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let name = classNameArg?.trim();
   if (!name) {
     name = handleCancel(
-      await p3.text({
+      await p15.text({
         message: "Injectable class name:",
         placeholder: "e.g. PasswordHasher, TokenService, UserTransformer",
         validate: (v) => v && v.trim() ? void 0 : "Class name cannot be empty"
@@ -2854,7 +3118,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let customPath;
   if (!flags.yes) {
     location = handleCancel(
-      await p3.select({
+      await p15.select({
         message: "Select target architectural location:",
         options: [
           { value: "feature-service", label: "Feature Service (features/<feature>/services/)" },
@@ -2872,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 p15.select({
               message: "Select target feature:",
               options: featureOptions
             })
           );
           if (selected === "__custom__") {
             feature = handleCancel(
-              await p3.text({
+              await p15.text({
                 message: "Enter feature name:",
                 validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
               })
@@ -2889,7 +3153,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
           }
         } else {
           feature = handleCancel(
-            await p3.text({
+            await p15.text({
               message: "Enter target feature name:",
               validate: (v) => v && v.trim() ? void 0 : "Feature name cannot be empty"
             })
@@ -2899,7 +3163,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
       feature = toCamelCase(feature);
     } else if (location === "custom") {
       customPath = handleCancel(
-        await p3.text({
+        await p15.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"
@@ -2910,14 +3174,14 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   let generateInterface2 = false;
   if (!flags.yes) {
     generateInterface2 = handleCancel(
-      await p3.confirm({
+      await p15.confirm({
         message: `Generate abstract class interface (I${className}) as runtime DI token?`,
         initialValue: false
       })
     );
   }
-  const s = p3.spinner();
-  s.start(`Generating injectable '${pc13.cyan(className)}'...`);
+  const s = p15.spinner();
+  s.start(`Generating injectable '${pc15.cyan(className)}'...`);
   const options = {
     name: className,
     feature,
@@ -2931,12 +3195,12 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   const files = generateInjectable(options);
   s.stop("Injectable class generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p3.outro(pc13.green(`Injectable '${className}' created successfully!`));
+  p15.outro(pc15.green(`Injectable '${className}' created successfully!`));
 }
 async function runInteractiveMenu(flags = {}) {
   printBanner();
   const choice = handleCancel(
-    await p3.select({
+    await p15.select({
       message: "What would you like to create in your architecture?",
       options: [
         {
@@ -2944,6 +3208,11 @@ async function runInteractiveMenu(flags = {}) {
           label: "Feature",
           hint: "Complete vertical slice (domain, infra, usecase, pxExpress, diProvider)"
         },
+        {
+          value: "shared",
+          label: "Shared Module",
+          hint: "Foundational utility or port with ports, infrastructure & diProvider"
+        },
         {
           value: "usecase",
           label: "Use Case",
@@ -2981,6 +3250,9 @@ async function runInteractiveMenu(flags = {}) {
     case "feature":
       await runFeatureCommand(void 0, flags);
       break;
+    case "shared":
+      await runSharedCommand(void 0, flags);
+      break;
     case "usecase":
       await runUseCaseCommand(void 0, flags);
       break;
@@ -3013,6 +3285,9 @@ async function handleCreate(type, name, flags = {}) {
     case "feature":
       await runFeatureCommand(name, flags);
       break;
+    case "shared":
+      await runSharedCommand(name, flags);
+      break;
     case "usecase":
       await runUseCaseCommand(name, flags);
       break;
@@ -3033,49 +3308,114 @@ async function handleCreate(type, name, flags = {}) {
       await runInjectableCommand(name, flags);
       break;
     default:
-      p3.log.error(
-        pc13.red(
-          `Unknown component type: "${type}". Allowed types: feature, usecase, domain, infrastructure, interface, httpHandler, injectable.`
+      p15.log.error(
+        pc15.red(
+          `Unknown component type: "${type}". Allowed types: feature, shared, usecase, domain, infrastructure, interface, httpHandler, injectable.`
         )
       );
       process.exit(1);
   }
 }
 var DEFAULT_REGISTRY_BASE = "https://raw.githubusercontent.com/solid-stack-digital/mason-registry/main";
+function normalizeRegistryUrl(urlOrPath, baseDir) {
+  let trimmed = urlOrPath.trim();
+  const gitSshRegex = /^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/;
+  const sshMatch = trimmed.match(gitSshRegex);
+  if (sshMatch && sshMatch[1] && sshMatch[2]) {
+    return `https://raw.githubusercontent.com/${sshMatch[1]}/${sshMatch[2]}/main`;
+  }
+  const githubWebRegex = /^https?:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?(?:\/tree\/([^/]+))?\/?$/;
+  const webMatch = trimmed.match(githubWebRegex);
+  if (webMatch && webMatch[1] && webMatch[2]) {
+    const owner = webMatch[1];
+    const repo = webMatch[2];
+    const branch = webMatch[3] || "main";
+    return `https://raw.githubusercontent.com/${owner}/${repo}/${branch}`;
+  }
+  if (baseDir && (trimmed.startsWith("./") || trimmed.startsWith("../") || trimmed === "." || trimmed === "..")) {
+    return path2.resolve(baseDir, trimmed);
+  }
+  return trimmed;
+}
+function findLocalRegistry(startDir = process.cwd()) {
+  let current = path2.resolve(startDir);
+  while (true) {
+    const candidate = path2.join(current, "mason-registry");
+    if (fs12.existsSync(candidate) && fs12.existsSync(path2.join(candidate, "index.json"))) {
+      return candidate;
+    }
+    const parent = path2.dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return null;
+}
 function getRegistryBase(projectRoot, override) {
+  const rootDir = projectRoot ? path2.resolve(projectRoot) : process.cwd();
   if (override && override.trim()) {
-    return override.trim();
+    return normalizeRegistryUrl(override.trim(), rootDir);
   }
   if (process.env.MASON_REGISTRY_URL && process.env.MASON_REGISTRY_URL.trim()) {
-    return process.env.MASON_REGISTRY_URL.trim();
+    return normalizeRegistryUrl(process.env.MASON_REGISTRY_URL.trim(), rootDir);
   }
-  if (projectRoot) {
-    const configPath = path6.join(projectRoot, "mason.config.json");
-    if (fs7.existsSync(configPath)) {
+  const configLocations = [
+    path2.join(rootDir, "mason.config.json"),
+    path2.join(process.cwd(), "mason.config.json")
+  ];
+  for (const configPath of configLocations) {
+    if (fs12.existsSync(configPath)) {
       try {
-        const config = JSON.parse(fs7.readFileSync(configPath, "utf-8"));
+        const config = JSON.parse(fs12.readFileSync(configPath, "utf-8"));
         if (config.registry && typeof config.registry === "string") {
-          return config.registry.trim();
+          return normalizeRegistryUrl(config.registry.trim(), path2.dirname(configPath));
         }
       } catch {
       }
     }
   }
-  if (projectRoot) {
-    const siblingRegistry = path6.resolve(projectRoot, "../mason-registry");
-    if (fs7.existsSync(siblingRegistry) && fs7.existsSync(path6.join(siblingRegistry, "index.json"))) {
-      return siblingRegistry;
+  const pkgLocations = [
+    path2.join(rootDir, "package.json"),
+    path2.join(process.cwd(), "package.json")
+  ];
+  for (const pkgPath of pkgLocations) {
+    if (fs12.existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(fs12.readFileSync(pkgPath, "utf-8"));
+        if (pkg.mason?.registry && typeof pkg.mason.registry === "string") {
+          return normalizeRegistryUrl(pkg.mason.registry.trim(), path2.dirname(pkgPath));
+        }
+      } catch {
+      }
     }
   }
+  const localRegistry = findLocalRegistry(rootDir);
+  if (localRegistry) {
+    return localRegistry;
+  }
   return DEFAULT_REGISTRY_BASE;
 }
 async function fetchRegistryFile(registryBase, relPath) {
   const cleanRelPath = relPath.replace(/^\/+/, "");
   if (registryBase.startsWith("http://") || registryBase.startsWith("https://")) {
     const url = `${registryBase.replace(/\/+$/, "")}/${cleanRelPath}`;
-    const res = await fetch(url);
+    const headers = {};
+    const token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+    if (token) {
+      headers["Authorization"] = `Bearer ${token}`;
+    }
+    const res = await fetch(url, { headers });
     if (!res.ok) {
-      throw new Error(`Failed to fetch ${cleanRelPath} from ${url} (HTTP ${res.status}: ${res.statusText})`);
+      let extraHint = "";
+      if (res.status === 404) {
+        extraHint = `
+  Possible reasons:
+  \u2022 If using a private GitHub repository, ensure GITHUB_TOKEN is set in your environment.
+  \u2022 If your registry has not yet been pushed to GitHub, point to your local directory:
+    - CLI flag:      mason import ... --registry /path/to/mason-registry
+    - Environment:   export MASON_REGISTRY_URL=/path/to/mason-registry
+    - Config file:   Create mason.config.json with { "registry": "/path/to/mason-registry" }`;
+      }
+      throw new Error(`Failed to fetch ${cleanRelPath} from ${url} (HTTP ${res.status}: ${res.statusText})${extraHint}`);
     }
     return await res.text();
   }
@@ -3083,11 +3423,11 @@ async function fetchRegistryFile(registryBase, relPath) {
   if (baseDir.startsWith("file://")) {
     baseDir = fileURLToPath(baseDir);
   }
-  const filePath = path6.resolve(baseDir, cleanRelPath);
-  if (!fs7.existsSync(filePath)) {
+  const filePath = path2.resolve(baseDir, cleanRelPath);
+  if (!fs12.existsSync(filePath)) {
     throw new Error(`Registry file not found at ${filePath}`);
   }
-  return fs7.promises.readFile(filePath, "utf-8");
+  return fs12.promises.readFile(filePath, "utf-8");
 }
 async function fetchRegistryIndex(registryBase) {
   const content = await fetchRegistryFile(registryBase, "index.json");
@@ -3149,26 +3489,26 @@ function findClosestMatch(target, candidates) {
   return null;
 }
 function detectPackageManager(projectRoot) {
-  if (fs7.existsSync(path6.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs7.existsSync(path6.join(projectRoot, "yarn.lock"))) return "yarn";
-  if (fs7.existsSync(path6.join(projectRoot, "bun.lockb")) || fs7.existsSync(path6.join(projectRoot, "bun.lock"))) return "bun";
+  if (fs12.existsSync(path2.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs12.existsSync(path2.join(projectRoot, "yarn.lock"))) return "yarn";
+  if (fs12.existsSync(path2.join(projectRoot, "bun.lockb")) || fs12.existsSync(path2.join(projectRoot, "bun.lock"))) return "bun";
   return "npm";
 }
 function getMissingNpmPackages(projectRoot, requiredPackages) {
   if (!requiredPackages || requiredPackages.length === 0) return [];
-  const pkgJsonPath = path6.join(projectRoot, "package.json");
-  if (!fs7.existsSync(pkgJsonPath)) {
+  const pkgJsonPath = path2.join(projectRoot, "package.json");
+  if (!fs12.existsSync(pkgJsonPath)) {
     return requiredPackages;
   }
   try {
-    const pkg = JSON.parse(fs7.readFileSync(pkgJsonPath, "utf-8"));
+    const pkg = JSON.parse(fs12.readFileSync(pkgJsonPath, "utf-8"));
     const installed = /* @__PURE__ */ new Set([
       ...Object.keys(pkg.dependencies || {}),
       ...Object.keys(pkg.devDependencies || {}),
       ...Object.keys(pkg.peerDependencies || {})
     ]);
-    return requiredPackages.filter((p15) => {
-      const nameOnly = p15.startsWith("@") ? `@${p15.slice(1).split("@")[0] || ""}` : p15.split("@")[0] || p15;
+    return requiredPackages.filter((p17) => {
+      const nameOnly = p17.startsWith("@") ? `@${p17.slice(1).split("@")[0] || ""}` : p17.split("@")[0] || p17;
       return !installed.has(nameOnly);
     });
   } catch {
@@ -3193,21 +3533,207 @@ function installNpmPackages(projectRoot, packages, pm) {
       installCmd = `npm install ${packages.join(" ")}`;
       break;
   }
-  p3.log.info(`Installing missing dependencies with ${manager}: ${pc13.cyan(packages.join(", "))}`);
+  p15.log.info(`Installing missing dependencies with ${manager}: ${pc15.cyan(packages.join(", "))}`);
   execSync(installCmd, {
     cwd: projectRoot,
     stdio: "inherit"
   });
 }
+function getAllFiles(dir, baseDir = dir) {
+  if (!fs12.existsSync(dir)) return [];
+  const entries = fs12.readdirSync(dir, { withFileTypes: true });
+  const files = [];
+  for (const entry of entries) {
+    const fullPath = path2.join(dir, entry.name);
+    const relPath = path2.relative(baseDir, fullPath).replace(/\\/g, "/");
+    if (entry.isDirectory()) {
+      if (entry.name === "__tests__" || entry.name.startsWith(".")) {
+        continue;
+      }
+      files.push(...getAllFiles(fullPath, baseDir));
+    } else if (entry.isFile()) {
+      if (entry.name === "registry.json" || entry.name.endsWith(".test.ts") || entry.name.endsWith(".spec.ts") || entry.name.startsWith(".")) {
+        continue;
+      }
+      files.push(relPath);
+    }
+  }
+  return files.sort();
+}
+function computeDirectoryHash(dirPath, files) {
+  if (!fs12.existsSync(dirPath)) return "";
+  const hash = createHash("sha256");
+  const fileList = (files ?? getAllFiles(dirPath)).sort();
+  for (const relativePath of fileList) {
+    const absolutePath = path2.join(dirPath, relativePath);
+    if (!fs12.existsSync(absolutePath)) continue;
+    const content = fs12.readFileSync(absolutePath, "utf8");
+    const normalizedContent = content.replace(/\r\n/g, "\n");
+    hash.update(relativePath);
+    hash.update(normalizedContent);
+  }
+  return `sha256-${hash.digest("hex")}`;
+}
 
 // src/commands/import.ts
+var importPrompts = {
+  select: p15.select,
+  text: p15.text
+};
+function rewriteImports(content, aliasMap) {
+  if (aliasMap.size === 0) return content;
+  let rewritten = content;
+  for (const [oldImport, newImport] of aliasMap.entries()) {
+    const rawOld = oldImport.endsWith("/") ? oldImport.slice(0, -1) : oldImport;
+    const rawNew = newImport.endsWith("/") ? newImport.slice(0, -1) : newImport;
+    const escaped = rawOld.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const regex = new RegExp(`${escaped}(?=[\\/'"\`]|$)`, "g");
+    rewritten = rewritten.replace(regex, rawNew);
+  }
+  return rewritten;
+}
+function getModuleBaseDir(projectRoot, modType) {
+  const folder = modType === "shared" ? "shared" : "features";
+  return path2.join(projectRoot, "src", folder);
+}
+function getExistingModuleDir(projectRoot, modType, modName) {
+  const folder = modType === "shared" ? "shared" : "features";
+  const inSrc = path2.join(projectRoot, "src", folder, modName);
+  if (fs12.existsSync(inSrc)) return inSrc;
+  const inRoot = path2.join(projectRoot, folder, modName);
+  if (fs12.existsSync(inRoot)) return inRoot;
+  return null;
+}
+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)
+    );
+    p15.log.step(`Importing '${depName}' into '${displayDest}'...`);
+    await importModuleRecursive(depType, depName, programmaticAlias);
+    return;
+  }
+  const existingDir = getExistingModuleDir(projectRoot, depType, depName);
+  if (!existingDir) {
+    p15.log.info(`  \u21B3 Resolving required ${depType} dependency: ${pc15.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) {
+    p15.log.step(`\u2713 ${depType}/${depName} is up to date (reusing existing)`);
+    importedModules.add(`${depType}:${depName}`);
+    return;
+  }
+  if (flags.overwrite) {
+    p15.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) {
+        fs12.rmSync(existingDir, { recursive: true, force: true });
+      }
+      fs12.rmSync(targetDir, { recursive: true, force: true });
+    }
+    await importModuleRecursive(depType, depName, depName, { overwrite: true });
+    return;
+  }
+  if (flags.yes) {
+    p15.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") {
+    p15.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`;
+          }
+        }
+      })
+    ).trim();
+    aliasMap.set(`@/${folder}/${depName}/`, `@/${folder}/${newName}/`);
+    const baseDir = getModuleBaseDir(projectRoot, depType);
+    const displayDest = path2.relative(projectRoot, path2.join(baseDir, newName));
+    p15.log.step(`Importing '${depName}' into '${displayDest}'...`);
+    await importModuleRecursive(depType, depName, newName);
+    return;
+  }
+  if (choice === "overwrite") {
+    p15.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) {
+        fs12.rmSync(existingDir, { recursive: true, force: true });
+      }
+      fs12.rmSync(targetDir, { recursive: true, force: true });
+    }
+    await importModuleRecursive(depType, depName, depName, { overwrite: true });
+    return;
+  }
+}
 async function handleImport(typeArg, nameArg, flags = {}) {
   const projectRoot = findProjectRoot();
   let type = typeArg?.trim().toLowerCase();
   if (type === "features") type = "feature";
   if (!type) {
     type = handleCancel(
-      await p3.select({
+      await importPrompts.select({
         message: "What kind of module would you like to import?",
         options: [
           {
@@ -3225,19 +3751,19 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     );
   }
   if (type !== "shared" && type !== "feature") {
-    p3.log.error(pc13.red(`Invalid module type: "${typeArg}". Must be "shared" or "feature".`));
+    p15.log.error(pc15.red(`Invalid module type: "${typeArg}". Must be "shared" or "feature".`));
     process.exit(1);
   }
   const registryBase = getRegistryBase(projectRoot, flags.registry);
-  const s = p3.spinner();
-  s.start(`Connecting to registry at ${pc13.dim(registryBase)}...`);
+  const s = p15.spinner();
+  s.start(`Connecting to registry at ${pc15.dim(registryBase)}...`);
   let index;
   try {
     index = await fetchRegistryIndex(registryBase);
     s.stop("Registry index loaded.");
   } catch (err) {
-    s.stop(pc13.red("Failed to load registry index."));
-    p3.log.error(pc13.red(err.message || String(err)));
+    s.stop(pc15.red("Failed to load registry index."));
+    p15.log.error(pc15.red(err.message || String(err)));
     process.exit(1);
   }
   const availableList = type === "shared" ? index.shared : index.features;
@@ -3245,11 +3771,11 @@ 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.`);
+      p15.log.warn(`No ${type} modules available in the registry.`);
       return;
     }
     name = handleCancel(
-      await p3.select({
+      await importPrompts.select({
         message: `Select a ${type} to import:`,
         options: availableList.map((item) => ({
           value: item.name,
@@ -3261,122 +3787,769 @@ async function handleImport(typeArg, nameArg, flags = {}) {
   }
   if (!candidateNames.includes(name)) {
     const closest = findClosestMatch(name, candidateNames);
-    p3.log.error(pc13.red(`\u274C Module '${name}' not found in the ${type} registry.`));
+    p15.log.error(pc15.red(`\u274C Module '${name}' not found in the ${type} registry.`));
     if (closest) {
-      p3.log.info(pc13.yellow(`Did you mean '${pc13.cyan(closest)}'?`));
+      p15.log.info(pc15.yellow(`Did you mean '${pc15.cyan(closest)}'?`));
     }
     process.exit(1);
   }
   const importedModules = /* @__PURE__ */ new Set();
   const totalWrittenFiles = [];
   const requiredNpmPackages = /* @__PURE__ */ new Set();
-  async function importModuleRecursive(modType, modName) {
-    const modKey = `${modType}:${modName}`;
+  async function importModuleRecursive(modType, registryName, targetName = registryName, options) {
+    const modKey = `${modType}:${targetName}`;
     if (importedModules.has(modKey)) return;
-    p3.log.step(`Importing ${modType}: ${pc13.cyan(modName)}...`);
+    p15.log.step(
+      `Importing ${modType}: ${pc15.cyan(targetName)}${targetName !== registryName ? pc15.dim(` (from ${registryName})`) : ""}...`
+    );
     let manifest;
     try {
-      manifest = await fetchModuleManifest(registryBase, modType, modName);
+      manifest = await fetchModuleManifest(registryBase, modType, registryName);
     } catch (err) {
-      p3.log.error(pc13.red(`Failed to fetch manifest for ${modType} '${modName}': ${err.message}`));
+      p15.log.error(pc15.red(`Failed to fetch manifest for ${modType} '${registryName}': ${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) {
-      const depPath = path6.join(projectRoot, "src", "shared", dep);
-      if (!fs7.existsSync(depPath) && !importedModules.has(`shared:${dep}`)) {
-        p3.log.info(`  \u21B3 Resolving required shared dependency: ${pc13.cyan(dep)}`);
-        await importModuleRecursive("shared", dep);
-      }
+      await resolveDependency(
+        "shared",
+        dep,
+        aliasMap,
+        projectRoot,
+        flags,
+        importModuleRecursive,
+        importedModules,
+        registryBase,
+        index
+      );
     }
     const featureDeps = manifest.dependencies?.features || [];
     for (const dep of featureDeps) {
-      const depPath = path6.join(projectRoot, "src", "features", dep);
-      if (!fs7.existsSync(depPath) && !importedModules.has(`feature:${dep}`)) {
-        p3.log.info(`  \u21B3 Resolving required feature dependency: ${pc13.cyan(dep)}`);
-        await importModuleRecursive("feature", dep);
-      }
+      await resolveDependency(
+        "feature",
+        dep,
+        aliasMap,
+        projectRoot,
+        flags,
+        importModuleRecursive,
+        importedModules,
+        registryBase,
+        index
+      );
     }
     for (const pkg of manifest.dependencies?.npm || []) {
       requiredNpmPackages.add(pkg);
     }
     const folder = modType === "shared" ? "shared" : "features";
-    const targetDir = path6.join(projectRoot, "src", folder, modName);
+    const targetDir = path2.join(getModuleBaseDir(projectRoot, modType), targetName);
+    const isOverwrite = Boolean(flags.overwrite || options?.overwrite);
     for (const file of manifest.files || []) {
       if (file === "registry.json") continue;
-      const remoteFilePath = `${folder}/${modName}/${file}`;
-      const localFilePath = path6.join(targetDir, file);
-      if (fs7.existsSync(localFilePath) && !flags.overwrite) {
-        p3.log.warn(`  \u21B3 Skipping existing file: ${pc13.dim(path6.relative(projectRoot, localFilePath))} (use --overwrite to replace)`);
+      const remoteFilePath = `${folder}/${registryName}/${file}`;
+      const localFilePath = path2.join(targetDir, file);
+      if (fs12.existsSync(localFilePath) && !isOverwrite) {
+        p15.log.warn(
+          `  \u21B3 Skipping existing file: ${pc15.dim(path2.relative(projectRoot, localFilePath))} (use --overwrite to replace)`
+        );
         continue;
       }
-      const content = await fetchRegistryFile(registryBase, remoteFilePath);
+      let content = await fetchRegistryFile(registryBase, remoteFilePath);
+      content = rewriteImports(content, aliasMap);
       if (!flags.dryRun) {
-        fs7.mkdirSync(path6.dirname(localFilePath), { recursive: true });
-        fs7.writeFileSync(localFilePath, content, "utf-8");
+        fs12.mkdirSync(path2.dirname(localFilePath), { recursive: true });
+        fs12.writeFileSync(localFilePath, content, "utf-8");
       }
-      const displayPath = path6.relative(projectRoot, localFilePath);
+      const displayPath = path2.relative(projectRoot, localFilePath);
       totalWrittenFiles.push(displayPath);
-      p3.log.message(`  ${pc13.green("+")} ${displayPath}`);
+      p15.log.message(`  ${pc15.green("+")} ${displayPath}`);
     }
     importedModules.add(modKey);
   }
-  await importModuleRecursive(type, name);
+  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: ${pc13.cyan(missingNpm.join(", "))}`);
+      p15.log.info(`Required npm dependencies to install: ${pc15.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(" ")}`);
+        p15.log.warn(`Could not automatically install packages (${err.message}). Please run: npm install ${missingNpm.join(" ")}`);
       }
     }
   }
   if (flags.dryRun) {
-    p3.log.info(pc13.yellow("Dry run complete: No files were written to disk."));
+    p15.log.info(pc15.yellow("Dry run complete: No files were written to disk."));
   } else {
-    p3.log.success(
-      pc13.green(
-        `Successfully imported ${type} '${name}' (${totalWrittenFiles.length} file${totalWrittenFiles.length === 1 ? "" : "s"} placed in src/${type === "shared" ? "shared" : "features"}/${name})`
+    const baseDir = getModuleBaseDir(projectRoot, type);
+    const displayTarget = path2.relative(projectRoot, path2.join(baseDir, name));
+    p15.log.success(
+      pc15.green(
+        `Successfully imported ${type} '${name}' (${totalWrittenFiles.length} file${totalWrittenFiles.length === 1 ? "" : "s"} placed in ${displayTarget})`
       )
     );
   }
 }
+function loadMasterIndex(projectRoot) {
+  const indexPath = path2.join(projectRoot, "index.json");
+  if (!fs12.existsSync(indexPath)) {
+    const initialIndex = { shared: [], features: [] };
+    fs12.writeFileSync(indexPath, JSON.stringify(initialIndex, null, 2) + "\n", "utf-8");
+    return initialIndex;
+  }
+  return JSON.parse(fs12.readFileSync(indexPath, "utf-8"));
+}
+function saveMasterIndex(projectRoot, index) {
+  const indexPath = path2.join(projectRoot, "index.json");
+  index.shared.sort((a, b) => a.name.localeCompare(b.name));
+  index.features.sort((a, b) => a.name.localeCompare(b.name));
+  fs12.writeFileSync(indexPath, JSON.stringify(index, null, 2) + "\n", "utf-8");
+}
+function discoverDiskModules(projectRoot) {
+  const results = [];
+  const sharedDir = resolveSharedDir(projectRoot);
+  if (fs12.existsSync(sharedDir)) {
+    const entries = fs12.readdirSync(sharedDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory() && !entry.name.startsWith(".")) {
+        results.push({ name: entry.name, type: "shared", dir: path2.join(sharedDir, entry.name) });
+      }
+    }
+  }
+  const featuresDir = resolveFeaturesDir(projectRoot);
+  if (fs12.existsSync(featuresDir)) {
+    const entries = fs12.readdirSync(featuresDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory() && !entry.name.startsWith(".")) {
+        results.push({ name: entry.name, type: "feature", dir: path2.join(featuresDir, entry.name) });
+      }
+    }
+  }
+  return results;
+}
+function checkGitStatusForDir(projectRoot, dirPath) {
+  try {
+    const relPath = path2.relative(projectRoot, dirPath);
+    const output = execSync(`git status --porcelain -- "${relPath}"`, {
+      cwd: projectRoot,
+      stdio: ["ignore", "pipe", "ignore"],
+      encoding: "utf-8"
+    }).trim();
+    if (!output) {
+      return { hasChanges: false, filesCount: 0 };
+    }
+    const lines = output.split("\n").filter((l) => l.trim().length > 0);
+    return { hasChanges: true, filesCount: lines.length };
+  } catch {
+    return { hasChanges: false, filesCount: 0 };
+  }
+}
+function getRegistryDiff(projectRoot) {
+  const index = loadMasterIndex(projectRoot);
+  const diskModules = discoverDiskModules(projectRoot);
+  const diskMap = /* @__PURE__ */ new Map();
+  for (const mod of diskModules) {
+    diskMap.set(`${mod.type}:${mod.name}`, mod);
+  }
+  const allKeys = /* @__PURE__ */ new Set();
+  for (const item of index.shared) {
+    allKeys.add(`shared:${item.name}`);
+  }
+  for (const item of index.features) {
+    allKeys.add(`feature:${item.name}`);
+  }
+  for (const mod of diskModules) {
+    allKeys.add(`${mod.type}:${mod.name}`);
+  }
+  const statuses = [];
+  for (const key of allKeys) {
+    const [typeStr, name] = key.split(":");
+    const type = typeStr;
+    const registeredEntry = (type === "shared" ? index.shared : index.features).find(
+      (e) => e.name === name
+    );
+    const isRegistered = Boolean(registeredEntry);
+    const diskInfo = diskMap.get(key);
+    const existsOnDisk = Boolean(diskInfo && fs12.existsSync(diskInfo.dir));
+    let hasUncommittedGitChanges = false;
+    let uncommittedFilesCount = 0;
+    let hasIntegrityDrift = false;
+    let localIntegrity;
+    if (existsOnDisk && diskInfo) {
+      const git = checkGitStatusForDir(projectRoot, diskInfo.dir);
+      hasUncommittedGitChanges = git.hasChanges;
+      uncommittedFilesCount = git.filesCount;
+      localIntegrity = computeDirectoryHash(diskInfo.dir);
+      if (isRegistered && registeredEntry?.integrity) {
+        hasIntegrityDrift = localIntegrity !== registeredEntry.integrity;
+      }
+    }
+    statuses.push({
+      name,
+      type,
+      isRegistered,
+      existsOnDisk,
+      hasUncommittedGitChanges,
+      uncommittedFilesCount,
+      hasIntegrityDrift,
+      localIntegrity,
+      registeredIntegrity: registeredEntry?.integrity
+    });
+  }
+  return statuses.sort((a, b) => a.type.localeCompare(b.type) || a.name.localeCompare(b.name));
+}
+async function registerModule(typeArg, nameArg, flags = {}) {
+  const projectRoot = findProjectRoot();
+  const index = loadMasterIndex(projectRoot);
+  let type = typeArg?.trim();
+  if (!type) {
+    type = handleCancel(
+      await p15.select({
+        message: "Module type to register:",
+        options: [
+          { value: "feature", label: "Feature" },
+          { value: "shared", label: "Shared Module" }
+        ]
+      })
+    );
+  }
+  const diskModules = discoverDiskModules(projectRoot).filter((m) => m.type === type);
+  const registeredNames = new Set((type === "shared" ? index.shared : index.features).map((m) => m.name));
+  const unregistered = diskModules.filter((m) => !registeredNames.has(m.name));
+  let name = nameArg?.trim();
+  if (!name) {
+    if (unregistered.length > 0) {
+      const opts = unregistered.map((m) => ({ value: m.name, label: m.name, hint: "unregistered on disk" }));
+      opts.push({ value: "__custom__", label: "\u270F\uFE0F Enter custom name...", hint: "" });
+      const choice = handleCancel(
+        await p15.select({
+          message: `Select a ${type} to register:`,
+          options: opts
+        })
+      );
+      if (choice === "__custom__") {
+        name = handleCancel(
+          await p15.text({
+            message: `Enter ${type} name:`,
+            validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
+          })
+        ).trim();
+      } else {
+        name = choice;
+      }
+    } else {
+      name = handleCancel(
+        await p15.text({
+          message: `Enter ${type} name to register:`,
+          validate: (v) => v && v.trim() ? void 0 : "Name cannot be empty"
+        })
+      ).trim();
+    }
+  }
+  const folder = type === "shared" ? resolveSharedDir(projectRoot) : resolveFeaturesDir(projectRoot);
+  const modDir = path2.join(folder, name);
+  if (!fs12.existsSync(modDir)) {
+    p15.log.error(pc15.red(`Module directory does not exist: ${path2.relative(projectRoot, modDir)}`));
+    process.exit(1);
+  }
+  const files = getAllFiles(modDir);
+  const integrity = computeDirectoryHash(modDir, files);
+  const manifestPath = path2.join(modDir, "registry.json");
+  let manifest;
+  if (fs12.existsSync(manifestPath)) {
+    manifest = JSON.parse(fs12.readFileSync(manifestPath, "utf-8"));
+  } else {
+    manifest = {
+      name,
+      type,
+      description: `${name} ${type} module`,
+      version: "1.0.0",
+      dependencies: {
+        npm: [],
+        shared: [],
+        features: []
+      },
+      files: []
+    };
+  }
+  manifest.name = name;
+  manifest.type = type;
+  manifest.files = files;
+  manifest.integrity = integrity;
+  fs12.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n", "utf-8");
+  const targetList = type === "shared" ? index.shared : index.features;
+  const existingIdx = targetList.findIndex((item) => item.name === name);
+  if (existingIdx >= 0) {
+    targetList[existingIdx] = {
+      name,
+      description: manifest.description,
+      version: manifest.version,
+      integrity
+    };
+  } else {
+    targetList.push({
+      name,
+      description: manifest.description,
+      version: manifest.version,
+      integrity
+    });
+  }
+  saveMasterIndex(projectRoot, index);
+  p15.log.success(
+    pc15.green(
+      `\u2713 Module '${type}/${name}' registered in index.json (${files.length} files, ${integrity.slice(0, 18)}...)`
+    )
+  );
+}
+async function commitModule(typeArg, nameArg, flags = {}) {
+  const projectRoot = findProjectRoot();
+  let type = typeArg?.trim();
+  if (!type) {
+    type = handleCancel(
+      await p15.select({
+        message: "Module type to commit:",
+        options: [
+          { value: "feature", label: "Feature" },
+          { value: "shared", label: "Shared Module" }
+        ]
+      })
+    );
+  }
+  let name = nameArg?.trim();
+  if (!name) {
+    const diskModules = discoverDiskModules(projectRoot).filter((m) => m.type === type);
+    const opts = diskModules.map((m) => {
+      const git = checkGitStatusForDir(projectRoot, m.dir);
+      return {
+        value: m.name,
+        label: m.name,
+        hint: git.hasChanges ? `${git.filesCount} uncommitted files` : "clean working tree"
+      };
+    });
+    name = handleCancel(
+      await p15.select({
+        message: `Select ${type} to commit:`,
+        options: opts
+      })
+    );
+  }
+  const folder = type === "shared" ? resolveSharedDir(projectRoot) : resolveFeaturesDir(projectRoot);
+  const modDir = path2.join(folder, name);
+  if (!fs12.existsSync(modDir)) {
+    p15.log.error(pc15.red(`Module directory does not exist: ${path2.relative(projectRoot, modDir)}`));
+    process.exit(1);
+  }
+  const relModDir = path2.relative(projectRoot, modDir);
+  const gitStatus = checkGitStatusForDir(projectRoot, modDir);
+  if (!gitStatus.hasChanges) {
+    p15.log.warn(pc15.yellow(`No uncommitted git changes found in '${type}/${name}'.`));
+    return;
+  }
+  let message = flags.message?.trim();
+  if (!message) {
+    message = handleCancel(
+      await p15.text({
+        message: `Commit message for ${type}/${name}:`,
+        placeholder: `e.g. feat(${name}): update use cases and dependencies`,
+        validate: (v) => v && v.trim() ? void 0 : "Commit message cannot be empty"
+      })
+    ).trim();
+  }
+  const s = p15.spinner();
+  s.start(`Committing '${type}/${name}' to git repository...`);
+  try {
+    execSync(`git add "${relModDir}"`, { cwd: projectRoot, stdio: ["ignore", "pipe", "pipe"] });
+    execSync(`git commit -m "${message.replace(/"/g, '\\"')}" -- "${relModDir}"`, {
+      cwd: projectRoot,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    s.stop(`Changes for '${type}/${name}' committed to git.`);
+    p15.log.success(pc15.green(`\u2713 Committed '${type}/${name}': "${message}"`));
+  } catch (err) {
+    s.stop(pc15.red("Git commit failed."));
+    p15.log.error(pc15.red(err.message || String(err)));
+    process.exit(1);
+  }
+}
+async function registerModuleChanges(typeArg, nameArg, flags = {}) {
+  const projectRoot = findProjectRoot();
+  const index = loadMasterIndex(projectRoot);
+  let type = typeArg?.trim();
+  if (!type) {
+    type = handleCancel(
+      await p15.select({
+        message: "Module type to update:",
+        options: [
+          { value: "feature", label: "Feature" },
+          { value: "shared", label: "Shared Module" }
+        ]
+      })
+    );
+  }
+  let name = nameArg?.trim();
+  if (!name) {
+    const diskModules = discoverDiskModules(projectRoot).filter((m) => m.type === type);
+    const diffs = getRegistryDiff(projectRoot).filter((d) => d.type === type && d.isRegistered);
+    const opts = diskModules.map((m) => {
+      const d = diffs.find((item) => item.name === m.name);
+      return {
+        value: m.name,
+        label: m.name,
+        hint: d?.hasIntegrityDrift ? "drift detected (needs register)" : "up to date"
+      };
+    });
+    name = handleCancel(
+      await p15.select({
+        message: `Select ${type} to register changes:`,
+        options: opts
+      })
+    );
+  }
+  const folder = type === "shared" ? resolveSharedDir(projectRoot) : resolveFeaturesDir(projectRoot);
+  const modDir = path2.join(folder, name);
+  if (!fs12.existsSync(modDir)) {
+    p15.log.error(pc15.red(`Module directory does not exist: ${path2.relative(projectRoot, modDir)}`));
+    process.exit(1);
+  }
+  const files = getAllFiles(modDir);
+  const integrity = computeDirectoryHash(modDir, files);
+  const manifestPath = path2.join(modDir, "registry.json");
+  let manifest;
+  if (fs12.existsSync(manifestPath)) {
+    manifest = JSON.parse(fs12.readFileSync(manifestPath, "utf-8"));
+  } else {
+    manifest = {
+      name,
+      type,
+      description: `${name} ${type} module`,
+      version: "1.0.0",
+      dependencies: { npm: [], shared: [], features: [] },
+      files: []
+    };
+  }
+  manifest.files = files;
+  manifest.integrity = integrity;
+  if (flags.version) {
+    manifest.version = flags.version;
+  }
+  fs12.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + "\n", "utf-8");
+  const targetList = type === "shared" ? index.shared : index.features;
+  const existingIdx = targetList.findIndex((item) => item.name === name);
+  if (existingIdx >= 0) {
+    targetList[existingIdx] = {
+      name,
+      description: manifest.description,
+      version: manifest.version,
+      integrity
+    };
+  } else {
+    targetList.push({
+      name,
+      description: manifest.description,
+      version: manifest.version,
+      integrity
+    });
+  }
+  saveMasterIndex(projectRoot, index);
+  p15.log.success(
+    pc15.green(`\u2713 Registered changes for '${type}/${name}' (new integrity: ${integrity.slice(0, 18)}...)`)
+  );
+}
+async function unregisterModule(typeArg, nameArg, flags = {}) {
+  const projectRoot = findProjectRoot();
+  const index = loadMasterIndex(projectRoot);
+  let type = typeArg?.trim();
+  if (!type) {
+    type = handleCancel(
+      await p15.select({
+        message: "Module type to unregister:",
+        options: [
+          { value: "feature", label: "Feature" },
+          { value: "shared", label: "Shared Module" }
+        ]
+      })
+    );
+  }
+  const registeredList = type === "shared" ? index.shared : index.features;
+  if (registeredList.length === 0) {
+    p15.log.warn(`No registered ${type} modules found in index.json.`);
+    return;
+  }
+  let name = nameArg?.trim();
+  if (!name) {
+    name = handleCancel(
+      await p15.select({
+        message: `Select ${type} to unregister from index.json:`,
+        options: registeredList.map((item) => ({
+          value: item.name,
+          label: item.name,
+          hint: item.description
+        }))
+      })
+    );
+  }
+  if (type === "shared") {
+    index.shared = index.shared.filter((item) => item.name !== name);
+  } else {
+    index.features = index.features.filter((item) => item.name !== name);
+  }
+  saveMasterIndex(projectRoot, index);
+  p15.log.success(
+    pc15.green(
+      `\u2713 Unregistered module '${type}/${name}' from index.json (source code retained on disk in ${type === "shared" ? "shared" : "features"}/${name})`
+    )
+  );
+}
+function diffRegistry(flags = {}) {
+  const projectRoot = findProjectRoot();
+  const diffs = getRegistryDiff(projectRoot);
+  p15.log.step(pc15.bold("\u{1F4CB} Mason Registry Diff & Status Summary"));
+  const unregistered = diffs.filter((d) => d.existsOnDisk && !d.isRegistered);
+  const uncommitted = diffs.filter((d) => d.existsOnDisk && d.hasUncommittedGitChanges);
+  const committedDrift = diffs.filter(
+    (d) => d.existsOnDisk && d.isRegistered && !d.hasUncommittedGitChanges && d.hasIntegrityDrift
+  );
+  const upToDate = diffs.filter(
+    (d) => d.existsOnDisk && d.isRegistered && !d.hasUncommittedGitChanges && !d.hasIntegrityDrift
+  );
+  const missing = diffs.filter((d) => !d.existsOnDisk && d.isRegistered);
+  if (unregistered.length > 0) {
+    p15.log.message(pc15.yellow(`
+\u{1F4E6} Unregistered Modules (${unregistered.length}):`));
+    for (const mod of unregistered) {
+      p15.log.message(`  ${pc15.red("\u25CF")} ${pc15.bold(`${mod.type}/${mod.name}`)} ${pc15.dim("(not registered in index.json)")}`);
+    }
+  }
+  if (uncommitted.length > 0) {
+    p15.log.message(pc15.yellow(`
+\u{1F4BE} Uncommitted Changes in Git (${uncommitted.length}):`));
+    for (const mod of uncommitted) {
+      p15.log.message(
+        `  ${pc15.yellow("\u25B2")} ${pc15.bold(`${mod.type}/${mod.name}`)} ${pc15.dim(`(${mod.uncommittedFilesCount} modified/untracked files)`)}`
+      );
+    }
+  }
+  if (committedDrift.length > 0) {
+    p15.log.message(pc15.cyan(`
+\u{1F680} Committed But Unregistered Changes (${committedDrift.length}):`));
+    for (const mod of committedDrift) {
+      p15.log.message(
+        `  ${pc15.cyan("\u25C6")} ${pc15.bold(`${mod.type}/${mod.name}`)} ${pc15.dim(
+          `local: ${mod.localIntegrity?.slice(0, 16)}... != registered: ${mod.registeredIntegrity?.slice(0, 16)}...`
+        )}`
+      );
+    }
+  }
+  if (missing.length > 0) {
+    p15.log.message(pc15.red(`
+\u26A0\uFE0F Missing on Disk (${missing.length}):`));
+    for (const mod of missing) {
+      p15.log.message(`  ${pc15.red("\u2715")} ${pc15.bold(`${mod.type}/${mod.name}`)} ${pc15.dim("(in index.json, but folder missing)")}`);
+    }
+  }
+  if (upToDate.length > 0) {
+    p15.log.message(pc15.green(`
+\u2713 Up to Date & Registered (${upToDate.length}):`));
+    for (const mod of upToDate) {
+      p15.log.message(`  ${pc15.green("\u2714")} ${mod.type}/${mod.name} ${pc15.dim(`(${mod.registeredIntegrity?.slice(0, 18)}...)`)}`);
+    }
+  }
+  p15.log.message("");
+}
+async function handleRegistry(actionArg, typeArg, nameArg, flags = {}) {
+  let action = actionArg?.trim().toLowerCase();
+  if (!action) {
+    action = handleCancel(
+      await p15.select({
+        message: "\u{1F3DB}\uFE0F  Mason Registry: What would you like to do?",
+        options: [
+          {
+            value: "diff",
+            label: "Inspect Diff & Status",
+            hint: "Summary of unregistered, uncommitted, and drifted modules"
+          },
+          {
+            value: "register",
+            label: "Register Module",
+            hint: "Add an existing module to index.json with integrity checksum"
+          },
+          {
+            value: "commit",
+            label: "Commit Changes",
+            hint: "Commit a module's working changes to git in the background"
+          },
+          {
+            value: "register-changes",
+            label: "Register Changes",
+            hint: "Update index.json & registry.json with latest checksums"
+          },
+          {
+            value: "unregister",
+            label: "Unregister Module",
+            hint: "Remove module from index.json (source code stays on disk)"
+          }
+        ]
+      })
+    );
+  }
+  switch (action) {
+    case "diff":
+    case "status":
+      diffRegistry(flags);
+      break;
+    case "register":
+      await registerModule(typeArg, nameArg, flags);
+      break;
+    case "commit":
+      await commitModule(typeArg, nameArg, flags);
+      break;
+    case "register-changes":
+    case "update":
+      await registerModuleChanges(typeArg, nameArg, flags);
+      break;
+    case "unregister":
+      await unregisterModule(typeArg, nameArg, flags);
+      break;
+    default:
+      p15.log.error(
+        pc15.red(
+          `Unknown registry action: "${action}". Valid actions: diff, register, commit, register-changes, unregister.`
+        )
+      );
+      process.exit(1);
+  }
+}
 
 // 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").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").action(async (args, flags) => {
     if (args && args.length > 0) {
-      p3.log.error(
-        pc13.red(
+      p15.log.error(
+        pc15.red(
           `Unknown command: "${args.join(" ")}". Use --help to list available commands.`
         )
       );
       process.exit(1);
     }
     try {
+      const projectRoot = findProjectRoot();
+      const mode = getEffectiveMode(projectRoot, flags);
+      if (mode === "registry") {
+        const choice2 = handleCancel(
+          await p15.select({
+            message: "\u{1F3DB}\uFE0F  Mason Registry Maintainer: What would you like to do?",
+            options: [
+              {
+                value: "diff",
+                label: "Inspect Diff & Status",
+                hint: "Overview of unregistered, uncommitted, or drifted modules"
+              },
+              {
+                value: "create_feature",
+                label: "Initialize New Feature",
+                hint: "Scaffold a new feature slice under features/"
+              },
+              {
+                value: "create_shared",
+                label: "Initialize New Shared Module",
+                hint: "Scaffold a new shared utility/port under shared/"
+              },
+              {
+                value: "create_usecase",
+                label: "Create New Use Case",
+                hint: "Add a new use case to an existing feature"
+              },
+              {
+                value: "register",
+                label: "Register Module",
+                hint: "Add a module to index.json with integrity checksum"
+              },
+              {
+                value: "commit",
+                label: "Commit Module Changes",
+                hint: "Commit working changes in a module to git"
+              },
+              {
+                value: "register_changes",
+                label: "Register Changes",
+                hint: "Recompute checksums and update index.json"
+              },
+              {
+                value: "unregister",
+                label: "Unregister Module",
+                hint: "Remove from index.json but keep source on disk"
+              },
+              {
+                value: "import",
+                label: "Import from Remote Registry",
+                hint: "Download a module from upstream"
+              }
+            ]
+          })
+        );
+        switch (choice2) {
+          case "diff":
+            await handleRegistry("diff", void 0, void 0, flags);
+            break;
+          case "create_feature":
+            await handleCreate("feature", void 0, flags);
+            break;
+          case "create_shared":
+            await handleCreate("shared", void 0, flags);
+            break;
+          case "create_usecase":
+            await handleCreate("usecase", void 0, flags);
+            break;
+          case "register":
+            await handleRegistry("register", void 0, void 0, flags);
+            break;
+          case "commit":
+            await handleRegistry("commit", void 0, void 0, flags);
+            break;
+          case "register_changes":
+            await handleRegistry("register-changes", void 0, void 0, flags);
+            break;
+          case "unregister":
+            await handleRegistry("unregister", void 0, void 0, flags);
+            break;
+          case "import":
+            await handleImport(void 0, void 0, flags);
+            break;
+        }
+        return;
+      }
       const choice = handleCancel(
-        await p3.select({
+        await p15.select({
           message: "\u{1F9F1} Mason: What would you like to do?",
           options: [
             {
               value: "create",
               label: "Create local component",
-              hint: "Scaffold a new feature, use case, domain entity, interface, etc."
+              hint: "Scaffold a new feature, shared module, use case, domain entity, etc."
             },
             {
               value: "import",
               label: "Import from registry",
               hint: "Download and link pre-built shared modules or features from the registry"
+            },
+            {
+              value: "registry",
+              label: "Registry management",
+              hint: "Inspect diff, register modules, or commit module changes"
             }
           ]
         })
       );
       if (choice === "create") {
         await handleCreate(void 0, void 0, flags);
+      } else if (choice === "registry") {
+        await handleRegistry(void 0, void 0, void 0, flags);
       } else {
         await handleImport(void 0, void 0, flags);
       }
@@ -3386,8 +4559,8 @@ function createCli() {
   });
   cli.command(
     "create [type] [name]",
-    "Scaffold local Clean Architecture components (feature, usecase, domain, etc.)"
-  ).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("-f, --feature <feature>", "Target feature name").option("-t, --target <dir>", "Override target directory").option("--express", "Include Express presentation layer (pxExpress)").option("--no-express", "Skip Express presentation layer").option("-i, --interface <interface>", "Interface or abstract class to implement").option("-k, --kind <kind>", "Implementation kind ('stub' or 'concrete')").option("-g, --global", "Place in global infrastructure/ instead of feature").option("-m, --method <method>", "HTTP method (get, post, put, patch, delete)").option("-p, --path <path>", "Route subpath (e.g. /:id)").option("-u, --usecase <usecase>", "Connected use case name").option("--message <message>", "Custom success message").option("--domainNames <names>", "Comma-separated domain entity names").example("mason create").example("mason create feature users").example("mason create usecase PlaceOrder -f orders").example("mason create domain User -f users").example("mason create infrastructure PostgresUserRepository -f users -i IUserRepository").example("mason create interface IUserRepository -f users").example("mason create httpHandler GetUserHttp -f users -m get -p /:id").example("mason create injectable PasswordHasher").action(async (type, name, flags = {}) => {
+    "Scaffold local Clean Architecture components (feature, shared, usecase, domain, etc.)"
+  ).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("-f, --feature <feature>", "Target feature name").option("-t, --target <dir>", "Override target directory").option("--dest <dir>", "Override target directory (alias for --target)").option("--registry", "Scaffold in registry mode (stamps registry.json)").option("--express", "Include Express presentation layer (pxExpress)").option("--no-express", "Skip Express presentation layer").option("-i, --interface <interface>", "Interface or abstract class to implement").option("-k, --kind <kind>", "Implementation kind ('stub' or 'concrete')").option("-g, --global", "Place in global infrastructure/ instead of feature").option("-m, --method <method>", "HTTP method (get, post, put, patch, delete)").option("-p, --path <path>", "Route subpath (e.g. /:id)").option("-u, --usecase <usecase>", "Connected use case name").option("--message <message>", "Custom success message").option("--domainNames <names>", "Comma-separated domain entity names").example("mason create").example("mason create feature users").example("mason create usecase PlaceOrder -f orders").example("mason create domain User -f users").example("mason create infrastructure PostgresUserRepository -f users -i IUserRepository").example("mason create interface IUserRepository -f users").example("mason create httpHandler GetUserHttp -f users -m get -p /:id").example("mason create injectable PasswordHasher").action(async (type, name, flags = {}) => {
     try {
       await handleCreate(type, name, flags);
     } catch (err) {
@@ -3404,8 +4577,28 @@ function createCli() {
       handleCliError(err);
     }
   });
+  cli.command(
+    "registry [action] [type] [name]",
+    "Registry & version management (diff, register, commit, register-changes, unregister)"
+  ).option("-m, --message <message>", "Commit message for 'commit' command").option("-y, --yes", "Accept defaults and skip interactive prompts").example("mason registry diff").example("mason registry register feature authn").example("mason registry commit shared hasher -m 'Add bcrypt engine'").example("mason registry register-changes shared hasher").example("mason registry unregister feature oldFeature").action(
+    async (action, type, name, flags = {}) => {
+      try {
+        await handleRegistry(action, type, name, flags);
+      } catch (err) {
+        handleCliError(err);
+      }
+    }
+  );
+  cli.command("diff", "Inspect registry status and diff (alias for 'mason registry diff')").allowUnknownOptions().action(async (flags = {}) => {
+    try {
+      await handleRegistry("diff", void 0, void 0, flags);
+    } catch (err) {
+      handleCliError(err);
+    }
+  });
   const createSubtypes = [
     "feature",
+    "shared",
     "usecase",
     "domain",
     "infrastructure",
@@ -3426,7 +4619,7 @@ function createCli() {
     });
   }
   cli.help();
-  cli.version("1.0.10");
+  cli.version("1.0.13");
   return cli;
 }
 function handleCliError(err) {
@@ -3434,7 +4627,7 @@ function handleCliError(err) {
     process.exit(0);
   }
   const message = err instanceof Error ? err.message : String(err);
-  p3.log.error(pc13.red(`Error: ${message}`));
+  p15.log.error(pc15.red(`Error: ${message}`));
   process.exit(1);
 }
 async function runCli(argv = process.argv) {