create-fullstack-scaffold 0.4.9 → 0.4.10

package/dist/cli/index.js

@@ -189,18 +189,11 @@ function getExcludePatterns(resolved, allManifests) {
         excludes.push(`src/server/middleware/__tests__/${mw.name}.test.ts`);
       }
     }
-    if (name === "notifications") {
-      excludes.push("src/cli/modules/notification");
-    }
     if (name === "todos") {
-      excludes.push("src/cli/modules/todo");
       excludes.push("src/server/__tests__/integration/todos-api.test.ts");
     }
-    if (name === "auth") {
-      excludes.push("src/cli/modules/auth");
-    }
-    if (name === "plugin") {
-      excludes.push("src/cli/modules/plugin");
+    if (manifest.cliModule) {
+      excludes.push(`src/cli/modules/${manifest.cliModule.dir}`);
     }
   }
   if (!resolved.modules.has("admin")) {
@@ -213,6 +206,8 @@ function getExcludePatterns(resolved, allManifests) {
     excludes.push("tenant.html");
     excludes.push("src/merchant");
     excludes.push("merchant.html");
+    excludes.push("src/server/middleware/tenant-isolation.ts");
+    excludes.push("src/server/middleware/__tests__/tenant-isolation.test.ts");
   }
   if (!resolved.hasClient) {
     excludes.push("src/client");
@@ -235,12 +230,14 @@ function getExcludePatterns(resolved, allManifests) {
   excludes.push("src/client/preset-ui-config.ts");
   if (!resolved.hasPermission && !resolved.modules.has("auth")) {
     excludes.push("src/server/utils/permission-utils.ts");
+    excludes.push("src/server/utils/__tests__/permission-utils.test.ts");
     excludes.push("src/server/middleware/__tests__/auth-simple.test.ts");
     excludes.push("src/server/middleware/__tests__/auth.test.ts");
     excludes.push("src/server/middleware/__tests__/error-response-format.test.ts");
     excludes.push("src/server/utils/__tests__/auth.test.ts");
   } else if (!resolved.hasPermission && resolved.modules.has("auth")) {
     excludes.push("src/server/utils/permission-utils.ts");
+    excludes.push("src/server/utils/__tests__/permission-utils.test.ts");
     excludes.push("src/server/middleware/__tests__/auth-simple.test.ts");
     excludes.push("src/server/middleware/__tests__/auth.test.ts");
     excludes.push("src/server/middleware/__tests__/error-response-format.test.ts");
@@ -305,25 +302,34 @@ function generateRouteRegistry(resolved) {
   const clientRoutes = [];
   const adminRoutes = [];
   const moduleEntries = [...resolved.modules.entries()];
+  const usedNames = /* @__PURE__ */ new Set();
   for (const [name, manifest] of moduleEntries) {
     const moduleDir = `module-${name}`;
     if (manifest.routes.client) {
       const clientRouteList = Array.isArray(manifest.routes.client) ? manifest.routes.client : [manifest.routes.client];
       for (const route of clientRouteList) {
         const { importPath, exportName } = route;
-        imports.push(
-          `import { ${exportName} } from './${moduleDir}/${importPath.replace(/^\.\//, "")}'`
-        );
-        clientRoutes.push(`  .route('/api', ${exportName})`);
+        const localName = usedNames.has(exportName) ? `${name}${exportName.charAt(0).toUpperCase()}${exportName.slice(1)}` : exportName;
+        usedNames.add(localName);
+        const importStmt = localName === exportName ? `import { ${exportName} } from './${moduleDir}/${importPath.replace(/^\.\//, "")}'` : `import { ${exportName} as ${localName} } from './${moduleDir}/${importPath.replace(
+          /^\.\//,
+          ""
+        )}'`;
+        imports.push(importStmt);
+        clientRoutes.push(`  .route('/api', ${localName})`);
       }
     }
     if (manifest.routes.admin) {
       for (const route of manifest.routes.admin) {
         const { importPath, exportName } = route;
-        imports.push(
-          `import { ${exportName} } from './${moduleDir}/${importPath.replace(/^\.\//, "")}'`
-        );
-        adminRoutes.push(`  .route('/api', ${exportName})`);
+        const localName = usedNames.has(exportName) ? `${name}${exportName.charAt(0).toUpperCase()}${exportName.slice(1)}` : exportName;
+        usedNames.add(localName);
+        const importStmt = localName === exportName ? `import { ${exportName} } from './${moduleDir}/${importPath.replace(/^\.\//, "")}'` : `import { ${exportName} as ${localName} } from './${moduleDir}/${importPath.replace(
+          /^\.\//,
+          ""
+        )}'`;
+        imports.push(importStmt);
+        adminRoutes.push(`  .route('/api', ${localName})`);
       }
     }
   }
@@ -371,6 +377,19 @@ function generateRouteRegistry(resolved) {
 `;
   return content;
 }
+function getStandaloneRoutes(resolved) {
+  const routes = [];
+  const usedNames = /* @__PURE__ */ new Set();
+  for (const [name, manifest] of resolved.modules) {
+    if (manifest.routes.standalone) {
+      const { exportName, mountPath } = manifest.routes.standalone;
+      const localName = usedNames.has(exportName) ? `${name}${exportName.charAt(0).toUpperCase()}${exportName.slice(1)}` : exportName;
+      usedNames.add(localName);
+      routes.push({ localName, mountPath });
+    }
+  }
+  return routes;
+}
 
 // src/generators/client-navigation.ts
 var DEFAULT_ICON = "Circle";
@@ -704,43 +723,6 @@ function generateDbSchemaBarrel(resolved) {
 }
 
 // src/generators/db-init.ts
-var SEED_MODULES = [
-  {
-    module: "todos",
-    importLine: "",
-    call: "import('../module-todos/services/todo-service').then(m => m.seedTodosIfEmpty())"
-  },
-  {
-    module: "order",
-    importLine: "",
-    call: "import('../module-order/services/order-service').then(m => m.seedOrdersIfEmpty())"
-  },
-  {
-    module: "ticket",
-    importLine: "",
-    call: "import('../module-ticket/services/ticket-service').then(m => m.seedTicketsIfEmpty())"
-  },
-  {
-    module: "dispute",
-    importLine: "",
-    call: "import('../module-dispute/services/dispute-service').then(m => m.seedDisputesIfEmpty())"
-  },
-  {
-    module: "content",
-    importLine: "",
-    call: "import('../module-content/services/content-service').then(m => m.seedContentsIfEmpty())"
-  },
-  {
-    module: "tenant",
-    importLine: "",
-    call: "import('../module-tenant/services/tenant-service').then(m => m.seedTenantsIfEmpty())"
-  },
-  {
-    module: "plugin",
-    importLine: "",
-    call: "import('../module-plugin/services/plugin-seed-service').then(m => m.seedPluginsIfEmpty())"
-  }
-];
 var INITIAL_PERMISSIONS = `const initialPermissions = [
   {
     id: 'perm_user_view',
@@ -1086,14 +1068,23 @@ var INITIAL_ROLE_PERMISSIONS = `const initialRolePermissions = [
   { roleId: 'role_user', permissionId: 'perm_order_view' },
 ]`;
 function generateDbInit(resolved) {
-  const activeSeeds = SEED_MODULES.filter((s) => resolved.modules.has(s.module));
+  const activeSeeds = [];
+  for (const [name, manifest] of resolved.modules) {
+    if (manifest.dbSchemas?.hasSeed && manifest.dbSchemas.seed) {
+      activeSeeds.push({
+        moduleDir: `module-${name}`,
+        serviceFile: manifest.dbSchemas.seed.serviceFile,
+        functionName: manifest.dbSchemas.seed.functionName
+      });
+    }
+  }
   if (!resolved.hasPermission) {
     return generateMinimalDbInit(activeSeeds);
   }
   return generateFullDbInit(activeSeeds);
 }
 function generateMinimalDbInit(activeSeeds) {
-  const seedCalls = activeSeeds.map((s) => `    ${s.call},`).join("\n");
+  const seedCalls = activeSeeds.map((s) => `    import('../${s.moduleDir}/services/${s.serviceFile}').then(m => m.${s.functionName}()),`).join("\n");
   const seedBlock = activeSeeds.length > 0 ? `
   log.info({}, 'Seeding module data...')
   await Promise.all([
@@ -1115,7 +1106,7 @@ export async function initializeDatabase() {
 `;
 }
 function generateFullDbInit(activeSeeds) {
-  const seedCalls = activeSeeds.map((s) => `    ${s.call},`).join("\n");
+  const seedCalls = activeSeeds.map((s) => `    import('../${s.moduleDir}/services/${s.serviceFile}').then(m => m.${s.functionName}()),`).join("\n");
   const seedBlock = activeSeeds.length > 0 ? `
   log.info({}, 'Seeding module data...')
   await Promise.all([
@@ -1188,7 +1179,7 @@ function generateServerApp(resolved) {
   const useRealtime = resolved.hasSSE || resolved.hasWebSocket;
   const useAuditLog = resolved.hasPermission;
   const useCaptcha = resolved.hasCaptcha;
-  const useFileRoutes = resolved.modules.has("file");
+  const standaloneRoutes = getStandaloneRoutes(resolved);
   const imports = [
     `import { OpenAPIHono } from '@hono/zod-openapi'`,
     ``,
@@ -1213,8 +1204,18 @@ function generateServerApp(resolved) {
     `import { createModuleLoggerSync } from './utils/logger'`,
     `import { adminApiRoutes, clientApiRoutes } from './route-registry'`
   );
-  if (useFileRoutes) {
-    imports.push(`import { fileRoutes } from './module-file/routes/file-routes'`);
+  const standaloneImportSet = /* @__PURE__ */ new Set();
+  for (const [name, manifest] of resolved.modules) {
+    if (manifest.routes.standalone) {
+      const { importPath, exportName } = manifest.routes.standalone;
+      const moduleDir = `module-${name}`;
+      const relPath = importPath.replace(/^\.\//, "");
+      const stmt = `import { ${exportName} } from './${moduleDir}/${relPath}'`;
+      if (!standaloneImportSet.has(stmt)) {
+        standaloneImportSet.add(stmt);
+        imports.push(stmt);
+      }
+    }
   }
   const middlewareChain = [
     `.use('*', errorHandlerMiddleware())`,
@@ -1239,8 +1240,8 @@ function generateServerApp(resolved) {
     );
   }
   const routes = [`.route('/', clientApiRoutes)`, `.route('/', adminApiRoutes)`];
-  if (useFileRoutes) {
-    routes.push(`.route('/files', fileRoutes)`);
+  for (const sr of standaloneRoutes) {
+    routes.push(`.route('${sr.mountPath}', ${sr.localName})`);
   }
   const indent = "    ";
   const chain = [...middlewareChain, ...routes].join(`
@@ -1401,7 +1402,7 @@ var MODULE_EXPORTS = {
       "hasPermission",
       "hasAnyPermission",
       "hasAllPermissions",
-      "type RoleType",
+      "type PermissionRoleType",
       "type RoleInfo",
       "type PermissionInfo",
       "type UserPermissions"
@@ -1451,6 +1452,210 @@ var MODULE_EXPORTS = {
       "type AdminDashboardStats",
       "type PluginListQuery"
     ]
+  },
+  merchant: {
+    namedExports: [
+      "ProductSchema",
+      "CreateProductSchema",
+      "UpdateProductSchema",
+      "ProductListSchema",
+      "type Product",
+      "type CreateProductInput",
+      "type UpdateProductInput"
+    ]
+  },
+  tenant: {
+    namedExports: [
+      "TenantSchema",
+      "TenantStatusSchema",
+      "TenantPlanSchema",
+      "TenantSettingsSchema",
+      "CreateTenantSchema",
+      "UpdateTenantSchema",
+      "TenantIdSchema",
+      "TenantSlugSchema",
+      "TenantListResponseSchema",
+      "TenantQuerySchema",
+      "TenantIdResponseSchema",
+      "type Tenant",
+      "type TenantStatus",
+      "type TenantPlan",
+      "type TenantSettings",
+      "type CreateTenantInput",
+      "type UpdateTenantInput",
+      "type TenantId",
+      "type TenantSlug",
+      "type TenantListResponse",
+      "type TenantQuery",
+      "type TenantIdResponse"
+    ]
+  },
+  order: {
+    namedExports: [
+      "OrderStatusSchema",
+      "OrderSchema",
+      "CreateOrderSchema",
+      "UpdateOrderSchema",
+      "OrderListSchema",
+      "OrderQuerySchema",
+      "OrderDeleteResultSchema",
+      "ProcessOrderSchema",
+      "CancelOrderSchema",
+      "RemoveCartItemResponseSchema",
+      "ECommerceProductSchema",
+      "ECommerceOrderStatusSchema",
+      "ECommerceOrderSchema",
+      "ECommerceOrderListSchema",
+      "type OrderStatus",
+      "type Order",
+      "type CreateOrderInput",
+      "type UpdateOrderInput",
+      "type OrderDeleteResult",
+      "type ProcessOrderInput",
+      "type CancelOrderInput",
+      "type OrderQueryInput",
+      "type RemoveCartItemResponse",
+      "type ECommerceProduct",
+      "type ECommerceOrderStatus",
+      "type ECommerceOrder"
+    ]
+  },
+  ticket: {
+    namedExports: [
+      "TicketStatusSchema",
+      "TicketPrioritySchema",
+      "TicketCategorySchema",
+      "TicketReplySchema",
+      "TicketSchema",
+      "CreateTicketSchema",
+      "UpdateTicketSchema",
+      "ReplyTicketSchema",
+      "TicketListSchema",
+      "TicketDeleteResultSchema",
+      "type TicketStatus",
+      "type TicketPriority",
+      "type TicketCategory",
+      "type TicketReply",
+      "type Ticket",
+      "type CreateTicketInput",
+      "type UpdateTicketInput",
+      "type ReplyTicketInput",
+      "type TicketDeleteResult"
+    ]
+  },
+  dispute: {
+    namedExports: [
+      "DisputeTypeSchema",
+      "DisputeStatusSchema",
+      "DisputeSchema",
+      "CreateDisputeSchema",
+      "UpdateDisputeSchema",
+      "ResolveDisputeSchema",
+      "DisputeListSchema",
+      "DisputeDeleteResultSchema",
+      "type DisputeType",
+      "type DisputeStatus",
+      "type Dispute",
+      "type CreateDisputeInput",
+      "type UpdateDisputeInput",
+      "type ResolveDisputeInput",
+      "type DisputeDeleteResult"
+    ]
+  },
+  content: {
+    namedExports: [
+      "ContentCategorySchema",
+      "ContentStatusSchema",
+      "ContentSchema",
+      "CreateContentSchema",
+      "UpdateContentSchema",
+      "ContentListSchema",
+      "ContentDeleteResultSchema",
+      "type ContentCategory",
+      "type ContentStatus",
+      "type Content",
+      "type CreateContentInput",
+      "type UpdateContentInput",
+      "type ContentDeleteResult"
+    ]
+  },
+  captcha: {
+    namedExports: [
+      "CaptchaResponseSchema",
+      "VerifyCaptchaRequestSchema",
+      "CaptchaVerifyResponseSchema",
+      "type CaptchaResponse",
+      "type VerifyCaptchaRequest",
+      "type CaptchaVerifyResponse"
+    ]
+  },
+  dashboard: {
+    namedExports: [
+      "DashboardStatSchema",
+      "RevenueDataSchema",
+      "ActivityStatusSchema",
+      "ActivitySchema",
+      "DashboardResponseSchema",
+      "type DashboardStat",
+      "type RevenueData",
+      "type ActivityStatus",
+      "type Activity",
+      "type DashboardResponse"
+    ]
+  },
+  cart: {
+    namedExports: [
+      "CartItemSchema",
+      "CartSummarySchema",
+      "CartResponseSchema",
+      "AddCartItemSchema",
+      "CartItemIdSchema",
+      "type CartItem",
+      "type CartSummary",
+      "type CartResponse",
+      "type AddCartItemInput"
+    ]
+  },
+  community: {
+    namedExports: [
+      "TopicStatusSchema",
+      "TopicTagSchema",
+      "TopicAuthorSchema",
+      "TopicSchema",
+      "TopicsResponseSchema",
+      "ProfileStatsSchema",
+      "ActivityTypeSchema",
+      "ProfileActivitySchema",
+      "ProfileResponseSchema",
+      "type TopicStatus",
+      "type TopicTag",
+      "type TopicAuthor",
+      "type Topic",
+      "type ProfileStats",
+      "type ActivityType",
+      "type ProfileActivity",
+      "type ProfileResponse"
+    ]
+  },
+  audit: {
+    namedExports: [
+      "ResourceTypeSchema",
+      "ActionTypeSchema",
+      "AuditLogSchema",
+      "type AuditLogType"
+    ]
+  },
+  role: {
+    namedExports: [
+      "RoleSchema",
+      "CreateRoleSchema",
+      "UpdateRoleSchema",
+      "UpdateRolePermissionsSchema",
+      "RoleSuccessSchema",
+      "type RoleDataType",
+      "type CreateRoleType",
+      "type UpdateRoleType"
+    ]
   }
 };
 function generateSharedModulesIndex(resolved) {
@@ -1463,8 +1668,16 @@ function generateSharedModulesIndex(resolved) {
     "admin",
     "permission",
     "auth",
-    "plugin"
+    "plugin",
+    "merchant",
+    "tenant",
+    "order",
+    "ticket",
+    "dispute",
+    "content",
+    "captcha"
   ];
+  const standaloneModules = ["dashboard", "cart", "community"];
   for (const moduleName of moduleOrder2) {
     if (!resolved.modules.has(moduleName)) continue;
     const manifest = resolved.modules.get(moduleName);
@@ -1475,6 +1688,31 @@ function generateSharedModulesIndex(resolved) {
   ${exports.namedExports.join(",\n  ")},
 } from './${exportKey}'`);
   }
+  const additionalExported = /* @__PURE__ */ new Set();
+  for (const moduleName of moduleOrder2) {
+    if (!resolved.modules.has(moduleName)) continue;
+    const manifest = resolved.modules.get(moduleName);
+    if (manifest.sharedSchemas?.additionalPaths) {
+      for (const extra of manifest.sharedSchemas.additionalPaths) {
+        if (additionalExported.has(extra)) continue;
+        additionalExported.add(extra);
+        const exports = MODULE_EXPORTS[extra];
+        if (!exports) continue;
+        lines.push(`export {
+  ${exports.namedExports.join(",\n  ")},
+} from './${extra}'`);
+      }
+    }
+  }
+  if (resolved.hasClient) {
+    for (const moduleName of standaloneModules) {
+      const exports = MODULE_EXPORTS[moduleName];
+      if (!exports) continue;
+      lines.push(`export {
+  ${exports.namedExports.join(",\n  ")},
+} from './${moduleName}'`);
+    }
+  }
   return lines.join("\n") + "\n";
 }
 
@@ -1624,7 +1862,7 @@ var MODULE_EXPORTS2 = {
       "UpdateUserRequestSchema",
       "CreateUserRequestSchema",
       "ClearTodosResultSchema",
-      "SuccessSchema",
+      "AdminSuccessSchema",
       "DownloadTokenSchema",
       "type SystemStats",
       "type HealthCheck",
@@ -1694,13 +1932,13 @@ var MODULE_EXPORTS2 = {
       "CreateContentSchema",
       "UpdateContentSchema",
       "ContentListSchema",
-      "DeleteResultSchema",
+      "ContentDeleteResultSchema",
       "type ContentCategory",
       "type ContentStatus",
       "type Content",
       "type CreateContentInput",
       "type UpdateContentInput",
-      "type DeleteResult"
+      "type ContentDeleteResult"
     ]
   },
   dashboard: {
@@ -1717,6 +1955,55 @@ var MODULE_EXPORTS2 = {
       "type DashboardResponse"
     ]
   },
+  merchant: {
+    namedExports: [
+      "MerchantSchema",
+      "MerchantLoginSchema",
+      "MerchantLoginResponseSchema",
+      "MerchantStatsSchema",
+      "ProductSchema",
+      "CreateProductSchema",
+      "UpdateProductSchema",
+      "ProductListSchema",
+      "ProductListResponseSchema",
+      "ProductQuerySchema",
+      "type Merchant",
+      "type MerchantLoginInput",
+      "type MerchantLoginResponse",
+      "type MerchantStats",
+      "type Product",
+      "type CreateProductInput",
+      "type UpdateProductInput",
+      "type ProductListResponse",
+      "type ProductQuery"
+    ]
+  },
+  tenant: {
+    namedExports: [
+      "TenantSchema",
+      "TenantStatusSchema",
+      "TenantPlanSchema",
+      "TenantSettingsSchema",
+      "CreateTenantSchema",
+      "UpdateTenantSchema",
+      "TenantIdSchema",
+      "TenantSlugSchema",
+      "TenantListResponseSchema",
+      "TenantQuerySchema",
+      "TenantIdResponseSchema",
+      "type Tenant",
+      "type TenantStatus",
+      "type TenantPlan",
+      "type TenantSettings",
+      "type CreateTenantInput",
+      "type UpdateTenantInput",
+      "type TenantId",
+      "type TenantSlug",
+      "type TenantListResponse",
+      "type TenantQuery",
+      "type TenantIdResponse"
+    ]
+  },
   dispute: {
     namedExports: [
       "DisputeTypeSchema",
@@ -1726,14 +2013,14 @@ var MODULE_EXPORTS2 = {
       "UpdateDisputeSchema",
       "ResolveDisputeSchema",
       "DisputeListSchema",
-      "DeleteResultSchema",
+      "DisputeDeleteResultSchema",
       "type DisputeType",
       "type DisputeStatus",
       "type Dispute",
       "type CreateDisputeInput",
       "type UpdateDisputeInput",
       "type ResolveDisputeInput",
-      "type DeleteResult"
+      "type DisputeDeleteResult"
     ]
   },
   order: {
@@ -1744,7 +2031,7 @@ var MODULE_EXPORTS2 = {
       "UpdateOrderSchema",
       "OrderListSchema",
       "OrderQuerySchema",
-      "DeleteResultSchema",
+      "OrderDeleteResultSchema",
       "ProcessOrderSchema",
       "CancelOrderSchema",
       "RemoveCartItemResponseSchema",
@@ -1756,7 +2043,7 @@ var MODULE_EXPORTS2 = {
       "type Order",
       "type CreateOrderInput",
       "type UpdateOrderInput",
-      "type DeleteResult",
+      "type OrderDeleteResult",
       "type ProcessOrderInput",
       "type CancelOrderInput",
       "type OrderQueryInput",
@@ -1785,7 +2072,7 @@ var MODULE_EXPORTS2 = {
       "RoleLabelsSchema",
       "PermissionLabelsSchema",
       "PermissionInitSchema",
-      "type RoleType",
+      "type PermissionRoleType",
       "type PermissionType",
       "type RoleInfo",
       "type PermissionInfo",
@@ -1813,8 +2100,8 @@ var MODULE_EXPORTS2 = {
       "CreateRoleSchema",
       "UpdateRoleSchema",
       "UpdateRolePermissionsSchema",
-      "SuccessSchema",
-      "type RoleType",
+      "RoleSuccessSchema",
+      "type RoleDataType",
       "type CreateRoleType",
       "type UpdateRoleType"
     ]
@@ -1830,7 +2117,7 @@ var MODULE_EXPORTS2 = {
       "UpdateTicketSchema",
       "ReplyTicketSchema",
       "TicketListSchema",
-      "DeleteResultSchema",
+      "TicketDeleteResultSchema",
       "type TicketStatus",
       "type TicketPriority",
       "type TicketCategory",
@@ -1839,7 +2126,7 @@ var MODULE_EXPORTS2 = {
       "type CreateTicketInput",
       "type UpdateTicketInput",
       "type ReplyTicketInput",
-      "type DeleteResult"
+      "type TicketDeleteResult"
     ]
   }
 };
@@ -1862,9 +2149,11 @@ var moduleOrder = [
   "content",
   "dashboard",
   "dispute",
+  "merchant",
   "order",
   "permission",
   "role",
+  "tenant",
   "ticket"
 ];
 function generateSharedSchemasIndex(resolved) {
@@ -1893,14 +2182,21 @@ export {
 `;
   const moduleLines = [];
   const exportedNames = /* @__PURE__ */ new Set();
+  const firstSeenModule = /* @__PURE__ */ new Map();
+  const droppedExports = [];
   for (const moduleName of moduleOrder) {
     const exports = MODULE_EXPORTS2[moduleName];
     if (!exports) continue;
     const shouldInclude = shouldIncludeModule(moduleName, resolved);
     if (!shouldInclude) continue;
     const uniqueExports = exports.namedExports.filter((name) => {
-      if (exportedNames.has(name)) return false;
+      if (exportedNames.has(name)) {
+        const originalModule = firstSeenModule.get(name) ?? "unknown";
+        droppedExports.push({ name, moduleName, originalModule });
+        return false;
+      }
       exportedNames.add(name);
+      firstSeenModule.set(name, moduleName);
       return true;
     });
     if (uniqueExports.length === 0) continue;
@@ -1911,6 +2207,11 @@ export {
 } from '../modules/${importPath}'`
     );
   }
+  for (const { name, moduleName, originalModule } of droppedExports) {
+    console.warn(
+      `\u26A0\uFE0F  Schema collision: "${name}" defined in both ${originalModule} and ${moduleName}. Using ${originalModule}'s version. Rename to avoid ambiguity.`
+    );
+  }
   return header + moduleLines.join("\n") + "\n";
 }
 function shouldIncludeModule(moduleName, resolved) {
@@ -2263,27 +2564,22 @@ function generateClientComponentsIndex(resolved) {
 }
 
 // src/generators/cli-modules-index.ts
+var ALWAYS_INCLUDED = {
+  dir: "config",
+  registerFunction: "registerConfigCommands"
+};
 function generateCliModulesIndex(resolved) {
   const modules = [];
   const registrations = [];
-  if (resolved.modules.has("todos")) {
-    modules.push("import { registerTodoCommands } from './todo'");
-    registrations.push("registerTodoCommands(site)");
-  }
-  if (resolved.modules.has("notifications")) {
-    modules.push("import { registerNotificationCommands } from './notification'");
-    registrations.push("registerNotificationCommands(site)");
-  }
-  if (resolved.modules.has("auth")) {
-    modules.push("import { registerAuthCommands } from './auth'");
-    registrations.push("registerAuthCommands(site)");
-  }
-  if (resolved.modules.has("plugin")) {
-    modules.push("import { registerPluginCommands } from './plugin'");
-    registrations.push("registerPluginCommands(site)");
+  for (const [, manifest] of resolved.modules) {
+    if (manifest.cliModule) {
+      const { dir, registerFunction } = manifest.cliModule;
+      modules.push(`import { ${registerFunction} } from './${dir}'`);
+      registrations.push(`${registerFunction}(site)`);
+    }
   }
-  modules.push("import { registerConfigCommands } from './config'");
-  registrations.push("registerConfigCommands(site)");
+  modules.push(`import { ${ALWAYS_INCLUDED.registerFunction} } from './${ALWAYS_INCLUDED.dir}'`);
+  registrations.push(`${ALWAYS_INCLUDED.registerFunction}(site)`);
   const exports = modules.map((m) => {
     const match = m.match(/\{ (\w+) \}/);
     return match ? match[1] : "";
@@ -2433,13 +2729,19 @@ function generateViteConfig(resolved, templateDir) {
     aliasesToRemove.push("@tenant", "@merchant");
   }
   for (const name of entriesToRemove) {
-    const re = new RegExp(`^\\s*${name}:\\s*path\\.resolve\\(__dirname,\\s*['"]${name}\\.html['"]\\),\\s*$\\n?`, "gm");
+    const re = new RegExp(
+      `^\\s*${name}:\\s*path\\.resolve\\(__dirname,\\s*['"]${name}\\.html['"]\\),\\s*$\\n?`,
+      "gm"
+    );
     content = content.replace(re, "");
   }
   for (const alias of aliasesToRemove) {
     const escapedAlias = alias.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const dirName = alias.replace("@", "");
-    const re = new RegExp(`^\\s*'${escapedAlias}':\\s*path\\.resolve\\(__dirname,\\s*['"]src\\/${dirName}['"]\\),\\s*$\\n?`, "gm");
+    const re = new RegExp(
+      `^\\s*'${escapedAlias}':\\s*path\\.resolve\\(__dirname,\\s*['"]src\\/${dirName}['"]\\),\\s*$\\n?`,
+      "gm"
+    );
     content = content.replace(re, "");
   }
   return content;
@@ -2513,6 +2815,20 @@ function getThemeForPresetType(presetType) {
   borderRadius: '8px',
   logoText: 'AdminPanel',
   fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif",
+}`
+    },
+    community: {
+      constName: "COMMUNITY_THEME",
+      theme: `{
+  primaryColor: '#f97316',
+  primaryHover: '#ea580c',
+  bgColor: '#ffffff',
+  textColor: '#111827',
+  secondaryBg: '#fff7ed',
+  borderColor: '#fed7aa',
+  borderRadius: '12px',
+  logoText: 'CommunityHub',
+  fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif",
 }`
     }
   };
@@ -2706,6 +3022,67 @@ function getRoutesForPreset(presetType, resolved) {
       routes.push(...maybeAuthRoutes);
       return routes;
     }
+    case "community": {
+      const routes = [];
+      if (hasModule("content")) {
+        routes.push(
+          {
+            path: "/",
+            importPath: "./pages/ContentListPage",
+            componentName: "ContentListPage",
+            label: "Home"
+          },
+          {
+            path: "/topics",
+            importPath: "./pages/ContentListPage",
+            componentName: "ContentListPage",
+            label: "Topics"
+          },
+          {
+            path: "/topics/:id",
+            importPath: "./pages/ContentDetailPage",
+            componentName: "ContentDetailPage",
+            label: "Topic Detail"
+          },
+          {
+            path: "/popular",
+            importPath: "./pages/ContentListPage",
+            componentName: "ContentListPage",
+            label: "Popular"
+          },
+          {
+            path: "/content",
+            importPath: "./pages/ContentListPage",
+            componentName: "ContentListPage",
+            label: "Content"
+          },
+          {
+            path: "/content/:id",
+            importPath: "./pages/ContentDetailPage",
+            componentName: "ContentDetailPage",
+            label: "Content Detail"
+          }
+        );
+      }
+      if (hasModule("chat")) {
+        routes.push({
+          path: "/websocket",
+          importPath: "./pages/WebSocketPage",
+          componentName: "WebSocketPage",
+          label: "WebSocket"
+        });
+      }
+      if (hasModule("notifications")) {
+        routes.push({
+          path: "/notifications",
+          importPath: "./pages/NotificationPage",
+          componentName: "NotificationPage",
+          label: "Notifications"
+        });
+      }
+      routes.push(...maybeAuthRoutes);
+      return routes;
+    }
     default:
       return [...maybeAuthRoutes];
   }
@@ -2791,6 +3168,28 @@ function getNavConfigForPreset(presetType, hasAuth) {
         ],
         defaultRoute: "/dashboard"
       };
+    case "community":
+      return {
+        name: "Community Forum",
+        appType: "client",
+        layout: "top-nav",
+        navigationObj: "{ visible: true, showLogo: true, showSearch: true, showCart: false, authStyle: 'text-link', navItems: 'desktop' }",
+        desktopNav: [
+          "{ label: 'Home', icon: 'Home', path: '/' }",
+          "{ label: 'Topics', icon: 'MessageSquare', path: '/topics' }",
+          "{ label: 'Popular', icon: 'Flame', path: '/popular' }",
+          "{ label: 'Profile', icon: 'User', path: '/profile' }",
+          "{ label: 'Chat', icon: 'MessageCircle', path: '/websocket' }"
+        ],
+        mobileTabs: [
+          "{ label: 'Home', icon: 'Home', path: '/' }",
+          "{ label: 'Topics', icon: 'MessageSquare', path: '/topics' }",
+          "{ label: 'Popular', icon: 'Flame', path: '/popular' }",
+          "{ label: 'Profile', icon: 'User', path: '/profile' }",
+          "{ label: 'Chat', icon: 'MessageCircle', path: '/websocket' }"
+        ],
+        defaultRoute: "/"
+      };
     default:
       return {
         name: "App",
@@ -3424,12 +3823,12 @@ async function createProject(projectNameOrOptions, useCurrentDir = false, preset
 // src/index.ts
 var __filename2 = fileURLToPath(import.meta.url);
 var __dirname2 = path.dirname(__filename2);
-var rootDir = __dirname2.endsWith(path.join("src")) || __dirname2.endsWith(path.join("dist")) ? path.resolve(__dirname2, "..") : path.resolve(__dirname2, "..", "..");
+var rootDir = __dirname2.endsWith(path.join("src")) ? path.resolve(__dirname2, "..") : __dirname2.endsWith(path.join("dist", "cli")) ? path.resolve(__dirname2, "..", "..") : path.resolve(__dirname2, "..", "..");
 var packageJson = JSON.parse(readFileSync(path.join(rootDir, "package.json"), "utf-8"));
 var program = new Command();
 program.name("create-fullstack-scaffold").description("Create a new full-stack scaffold app with Todo List example").version(packageJson.version).argument("[project-name]", "Name of your project").option("-c, --current-dir", "Create project in current directory").option(
   "-p, --preset <preset>",
-  "Template preset to use (fullstack-admin, todo-app, cli-only, minimal)"
+  "Template preset to use (fullstack-admin, todo-app, ecommerce, xbrowser-marketplace, forum, cli-only, minimal, saas)"
 ).option("-o, --output-dir <path>", "Output directory (defaults to project name)").option("--dry-run", "Show what would be generated without creating files").action(
   async (projectName = "my-fullstack-app", options) => {
     console.log("");
@@ -3440,7 +3839,7 @@ program.name("create-fullstack-scaffold").description("Create a new full-stack s
     console.log("");
     let preset = options.preset;
     if (!preset && process.stdin.isTTY) {
-      const templateDir = path.join(__dirname2, "../template");
+      const templateDir = path.join(rootDir, "template");
       const presets = await loadPresets(templateDir);
       preset = await select({
         message: "Choose a template preset:",
@@ -3471,7 +3870,7 @@ program.name("create-fullstack-scaffold").description("Create a new full-stack s
   }
 );
 program.command("presets").description("List available template presets").action(async () => {
-  const templateDir = path.join(__dirname2, "../template");
+  const templateDir = path.join(rootDir, "template");
   const presets = await loadPresets(templateDir);
   console.log(chalk.cyan("\nAvailable presets:\n"));
   for (const preset of presets) {