@open-mercato/cli 0.4.2-canary-eb5f87d5f9 → 0.4.2-canary-5035717565

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.4.2-canary-eb5f87d5f9",
+  "version": "0.4.2-canary-5035717565",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -55,7 +55,7 @@
     "@mikro-orm/core": "^6.6.2",
     "@mikro-orm/migrations": "^6.6.2",
     "@mikro-orm/postgresql": "^6.6.2",
-    "@open-mercato/shared": "0.4.2-canary-eb5f87d5f9",
+    "@open-mercato/shared": "0.4.2-canary-5035717565",
     "pg": "^8.16.3",
     "typescript": "^5.9.3"
   },

package/src/lib/db/commands.ts

@@ -77,8 +77,7 @@ async function loadModuleEntities(entry: ModuleEntry, resolver: PackageResolver)
     path.join(roots.appBase, 'db'),
     path.join(roots.pkgBase, 'db'),
   ]
-  // Check both .ts (src/monorepo) and .js (dist/production) extensions
-  const candidates = ['entities.ts', 'entities.js', 'schema.ts', 'schema.js']
+  const candidates = ['entities.ts', 'schema.ts']
 
   for (const base of bases) {
     for (const f of candidates) {
@@ -86,12 +85,10 @@ async function loadModuleEntities(entry: ModuleEntry, resolver: PackageResolver)
       if (fs.existsSync(p)) {
         const sub = path.basename(base)
         const fromApp = base.startsWith(roots.appBase)
-        const ext = path.extname(f)
-        const baseName = f.replace(ext, '')
         // For @app modules, use file:// URL since @/ alias doesn't work in Node.js runtime
         const importPath = (isAppModule && fromApp)
           ? `file://${p.replace(/\.ts$/, '.js')}`
-          : `${fromApp ? imps.appBase : imps.pkgBase}/${sub}/${baseName}`
+          : `${fromApp ? imps.appBase : imps.pkgBase}/${sub}/${f.replace(/\.ts$/, '')}`
         try {
           const mod = await import(importPath)
           const entities = Object.values(mod).filter((v) => typeof v === 'function')
@@ -110,15 +107,25 @@ async function loadModuleEntities(entry: ModuleEntry, resolver: PackageResolver)
 
 function getMigrationsPath(entry: ModuleEntry, resolver: PackageResolver): string {
   const from = entry.from || '@open-mercato/core'
-
-  if (from === '@app') {
-    // For @app modules, use the app directory
-    return path.join(resolver.getAppDir(), 'src/modules', entry.id, 'migrations')
+  let pkgModRoot: string
+
+  if (from === '@open-mercato/core') {
+    pkgModRoot = path.join(resolver.getRootDir(), 'packages/core/src/modules', entry.id)
+  } else if (/^@open-mercato\//.test(from)) {
+    const segs = from.split('/')
+    if (segs.length > 1 && segs[1]) {
+      pkgModRoot = path.join(resolver.getRootDir(), `packages/${segs[1]}/src/modules`, entry.id)
+    } else {
+      pkgModRoot = path.join(resolver.getRootDir(), 'packages/core/src/modules', entry.id)
+    }
+  } else if (from === '@app') {
+    // For @app modules, use the app directory not the monorepo root
+    pkgModRoot = path.join(resolver.getAppDir(), 'src/modules', entry.id)
+  } else {
+    pkgModRoot = path.join(resolver.getRootDir(), 'packages/core/src/modules', entry.id)
   }
 
-  // Use resolver's getModulePaths which handles monorepo vs production mode
-  const { pkgBase } = resolver.getModulePaths(entry)
-  return path.join(pkgBase, 'migrations')
+  return path.join(pkgModRoot, 'migrations')
 }
 
 export interface DbOptions {

package/src/lib/generators/entity-ids.ts

@@ -179,8 +179,7 @@ export async function generateEntityIds(options: EntityIdsOptions): Promise<Gene
     const appDb = path.join(roots.appBase, 'db')
     const pkgDb = path.join(roots.pkgBase, 'db')
     const bases = [appData, pkgData, appDb, pkgDb]
-    // Check both .ts (src/monorepo) and .js (dist/production) extensions
-    const candidates = ['entities.override.ts', 'entities.override.js', 'entities.ts', 'entities.js', 'schema.ts', 'schema.js']
+    const candidates = ['entities.override.ts', 'entities.ts', 'schema.ts']
     let importPath: string | null = null
     let filePath: string | null = null
 
@@ -190,8 +189,7 @@ export async function generateEntityIds(options: EntityIdsOptions): Promise<Gene
         if (fs.existsSync(p)) {
           const fromApp = base.startsWith(roots.appBase)
           const sub = path.basename(base) // 'data' | 'db'
-          const fileBaseName = f.replace(/\.(ts|js)$/, '')
-          importPath = `${fromApp ? imps.appBase : imps.pkgBase}/${sub}/${fileBaseName}`
+          importPath = `${fromApp ? imps.appBase : imps.pkgBase}/${sub}/${f.replace(/\.ts$/, '')}`
           filePath = p
           break
         }

package/src/lib/generators/module-di.ts

@@ -34,13 +34,10 @@ export async function generateModuleDi(options: ModuleDiOptions): Promise<Genera
     const modId = entry.id
     const roots = resolver.getModulePaths(entry)
     const imp = resolver.getModuleImportBase(entry)
-    // Check both .ts (src/monorepo) and .js (dist/production) extensions
-    const appDiTs = path.join(roots.appBase, 'di.ts')
-    const appDiJs = path.join(roots.appBase, 'di.js')
-    const pkgDiTs = path.join(roots.pkgBase, 'di.ts')
-    const pkgDiJs = path.join(roots.pkgBase, 'di.js')
-    const useApp = fs.existsSync(appDiTs) || fs.existsSync(appDiJs)
-    const usePkg = fs.existsSync(pkgDiTs) || fs.existsSync(pkgDiJs)
+    const appDi = path.join(roots.appBase, 'di.ts')
+    const pkgDi = path.join(roots.pkgBase, 'di.ts')
+    const useApp = fs.existsSync(appDi)
+    const usePkg = fs.existsSync(pkgDi)
     const importName = `D_${toVar(modId)}_${i++}`
 
     if (useApp) {

package/src/lib/generators/module-entities.ts

@@ -41,7 +41,7 @@ export async function generateModuleEntities(options: ModuleEntitiesOptions): Pr
     const appDb = path.join(roots.appBase, 'db')
     const pkgDb = path.join(roots.pkgBase, 'db')
     const bases = [appData, pkgData, appDb, pkgDb]
-    const candidates = ['entities.override.ts', 'entities.override.js', 'entities.ts', 'entities.js', 'schema.ts', 'schema.js']
+    const candidates = ['entities.override.ts', 'entities.ts', 'schema.ts']
 
     let found: { base: string; file: string } | null = null
     for (const base of bases) {
@@ -63,13 +63,12 @@ export async function generateModuleEntities(options: ModuleEntitiesOptions): Pr
     // For @app modules, use relative path to ensure it works both in Next.js and Node.js CLI context
     // From .mercato/generated/, the relative path to src/modules/ is ../src/modules/
     let relImport: string
-    const fileBaseName = found.file.replace(/\.(ts|js)$/, '')
     if (isAppModule && fromApp) {
       // From .mercato/generated/, go up two levels (../..) to reach the app root, then into src/modules/
-      relImport = `../../src/modules/${modId}/${sub}/${fileBaseName}`
+      relImport = `../../src/modules/${modId}/${sub}/${found.file.replace(/\.ts$/, '')}`
     } else {
       const baseImport = fromApp ? imp.appBase : imp.pkgBase
-      relImport = `${baseImport}/${sub}/${fileBaseName}`
+      relImport = `${baseImport}/${sub}/${found.file.replace(/\.ts$/, '')}`
     }
     imports.push(`import * as ${importName} from '${relImport}'`)
     entitySources.push({ importName, moduleId: modId })

package/src/lib/generators/module-registry.ts

@@ -15,21 +15,6 @@ import {
 
 type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE'
 
-/**
- * Find a module file, checking for both .ts (src) and .js (dist) extensions.
- * Supports both simple names (e.g., 'cli') and nested paths (e.g., 'data/extensions').
- * Returns the path if found, null otherwise.
- */
-function findModuleFile(basePath: string, ...segments: string[]): string | null {
-  const name = segments.pop()!
-  const dir = segments.length ? path.join(basePath, ...segments) : basePath
-  const tsPath = path.join(dir, `${name}.ts`)
-  if (fs.existsSync(tsPath)) return tsPath
-  const jsPath = path.join(dir, `${name}.js`)
-  if (fs.existsSync(jsPath)) return jsPath
-  return null
-}
-
 export interface ModuleRegistryOptions {
   resolver: PackageResolver
   quiet?: boolean
@@ -94,9 +79,9 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
     let injectionTableImportName: string | null = null
 
     // Module metadata: index.ts (overrideable)
-    const appIndex = findModuleFile(roots.appBase, 'index')
-    const pkgIndex = findModuleFile(roots.pkgBase, 'index')
-    const indexTs = appIndex ?? pkgIndex
+    const appIndex = path.join(roots.appBase, 'index.ts')
+    const pkgIndex = path.join(roots.pkgBase, 'index.ts')
+    const indexTs = fs.existsSync(appIndex) ? appIndex : fs.existsSync(pkgIndex) ? pkgIndex : null
     if (indexTs) {
       infoImportName = `I${importId++}_${toVar(modId)}`
       const importPath = indexTs.startsWith(roots.appBase) ? `${appImportBase}/index` : `${imps.pkgBase}/index`
@@ -205,10 +190,10 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
 
     // Entity extensions: src/modules/<module>/data/extensions.ts
     {
-      const appFile = findModuleFile(roots.appBase, 'data', 'extensions')
-      const pkgFile = findModuleFile(roots.pkgBase, 'data', 'extensions')
-      const hasApp = !!appFile
-      const hasPkg = !!pkgFile
+      const appFile = path.join(roots.appBase, 'data', 'extensions.ts')
+      const pkgFile = path.join(roots.pkgBase, 'data', 'extensions.ts')
+      const hasApp = fs.existsSync(appFile)
+      const hasPkg = fs.existsSync(pkgFile)
       if (hasApp || hasPkg) {
         const importName = `X_${toVar(modId)}_${importId++}`
         const importPath = hasApp ? `${appImportBase}/data/extensions` : `${imps.pkgBase}/data/extensions`
@@ -219,12 +204,12 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
 
     // RBAC feature declarations: module root acl.ts
     {
-      const rootApp = findModuleFile(roots.appBase, 'acl')
-      const rootPkg = findModuleFile(roots.pkgBase, 'acl')
-      const hasRoot = rootApp || rootPkg
+      const rootApp = path.join(roots.appBase, 'acl.ts')
+      const rootPkg = path.join(roots.pkgBase, 'acl.ts')
+      const hasRoot = fs.existsSync(rootApp) || fs.existsSync(rootPkg)
       if (hasRoot) {
         const importName = `ACL_${toVar(modId)}_${importId++}`
-        const useApp = rootApp ?? rootPkg!
+        const useApp = fs.existsSync(rootApp) ? rootApp : rootPkg
         const importPath = useApp.startsWith(roots.appBase) ? `${appImportBase}/acl` : `${imps.pkgBase}/acl`
         imports.push(`import * as ${importName} from '${importPath}'`)
         featuresImportName = importName
@@ -233,10 +218,10 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
 
     // Custom entities declarations: module root ce.ts
     {
-      const appFile = findModuleFile(roots.appBase, 'ce')
-      const pkgFile = findModuleFile(roots.pkgBase, 'ce')
-      const hasApp = !!appFile
-      const hasPkg = !!pkgFile
+      const appFile = path.join(roots.appBase, 'ce.ts')
+      const pkgFile = path.join(roots.pkgBase, 'ce.ts')
+      const hasApp = fs.existsSync(appFile)
+      const hasPkg = fs.existsSync(pkgFile)
       if (hasApp || hasPkg) {
         const importName = `CE_${toVar(modId)}_${importId++}`
         const importPath = hasApp ? `${appImportBase}/ce` : `${imps.pkgBase}/ce`
@@ -247,10 +232,10 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
 
     // Search module configuration: module root search.ts
     {
-      const appFile = findModuleFile(roots.appBase, 'search')
-      const pkgFile = findModuleFile(roots.pkgBase, 'search')
-      const hasApp = !!appFile
-      const hasPkg = !!pkgFile
+      const appFile = path.join(roots.appBase, 'search.ts')
+      const pkgFile = path.join(roots.pkgBase, 'search.ts')
+      const hasApp = fs.existsSync(appFile)
+      const hasPkg = fs.existsSync(pkgFile)
       if (hasApp || hasPkg) {
         const importName = `SEARCH_${toVar(modId)}_${importId++}`
         const importPath = hasApp ? `${appImportBase}/search` : `${imps.pkgBase}/search`
@@ -263,10 +248,10 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
 
     // Custom field declarations: src/modules/<module>/data/fields.ts
     {
-      const appFile = findModuleFile(roots.appBase, 'data', 'fields')
-      const pkgFile = findModuleFile(roots.pkgBase, 'data', 'fields')
-      const hasApp = !!appFile
-      const hasPkg = !!pkgFile
+      const appFile = path.join(roots.appBase, 'data', 'fields.ts')
+      const pkgFile = path.join(roots.pkgBase, 'data', 'fields.ts')
+      const hasApp = fs.existsSync(appFile)
+      const hasPkg = fs.existsSync(pkgFile)
       if (hasApp || hasPkg) {
         const importName = `F_${toVar(modId)}_${importId++}`
         const importPath = hasApp ? `${appImportBase}/data/fields` : `${imps.pkgBase}/data/fields`
@@ -369,21 +354,19 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
     const apiApp = path.join(roots.appBase, 'api')
     const apiPkg = path.join(roots.pkgBase, 'api')
     if (fs.existsSync(apiApp) || fs.existsSync(apiPkg)) {
-      // route.ts or route.js aggregations
+      // route.ts aggregations
       const routeFiles: string[] = []
       const walk = (dir: string, rel: string[] = []) => {
         for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
           if (e.isDirectory()) {
             if (e.name === '__tests__' || e.name === '__mocks__') continue
             walk(path.join(dir, e.name), [...rel, e.name])
-          } else if (e.isFile() && (e.name === 'route.ts' || e.name === 'route.js')) {
-            routeFiles.push([...rel, e.name].join('/'))
-          }
+          } else if (e.isFile() && e.name === 'route.ts') routeFiles.push([...rel, e.name].join('/'))
         }
       }
       if (fs.existsSync(apiPkg)) walk(apiPkg)
       if (fs.existsSync(apiApp)) walk(apiApp)
-      const routeList = Array.from(new Set(routeFiles.map(f => f.replace(/\.(ts|js)$/, ''))))
+      const routeList = Array.from(new Set(routeFiles))
       const isDynamicRoute = (p: string) => p.split('/').some((seg) => /\[|\[\[\.\.\./.test(seg))
       routeList.sort((a, b) => {
         const ad = isDynamicRoute(a) ? 1 : 0
@@ -393,27 +376,22 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
       })
       for (const rel of routeList) {
         const segs = rel.split('/')
-        segs.pop() // remove 'route'
+        segs.pop()
         const reqSegs = [modId, ...segs]
         const importName = `R${importId++}_${toVar(modId)}_${toVar(segs.join('_') || 'index')}`
-        const appFileTs = path.join(apiApp, ...segs, 'route.ts')
-        const appFileJs = path.join(apiApp, ...segs, 'route.js')
-        const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs)
+        const appFile = path.join(apiApp, ...segs, 'route.ts')
+        const fromApp = fs.existsSync(appFile)
         const apiSegPath = segs.join('/')
         const importPath = `${fromApp ? appImportBase : imps.pkgBase}/api${apiSegPath ? `/${apiSegPath}` : ''}/route`
         const routePath = '/' + reqSegs.filter(Boolean).join('/')
-        const pkgFileTs = path.join(apiPkg, ...segs, 'route.ts')
-        const pkgFileJs = path.join(apiPkg, ...segs, 'route.js')
-        const sourceFile = fromApp
-          ? (fs.existsSync(appFileTs) ? appFileTs : appFileJs)
-          : (fs.existsSync(pkgFileTs) ? pkgFileTs : pkgFileJs)
+        const sourceFile = fromApp ? appFile : path.join(apiPkg, ...segs, 'route.ts')
         const hasOpenApi = await moduleHasExport(sourceFile, 'openApi')
         const docsPart = hasOpenApi ? `, docs: ${importName}.openApi` : ''
         imports.push(`import * as ${importName} from '${importPath}'`)
         apis.push(`{ path: '${routePath}', metadata: (${importName} as any).metadata, handlers: ${importName} as any${docsPart} }`)
       }
 
-      // Single files (non-route API files)
+      // Single files
       const plainFiles: string[] = []
       const methodNames = new Set(['get', 'post', 'put', 'patch', 'delete'])
       const walkPlain = (dir: string, rel: string[] = []) => {
@@ -422,32 +400,28 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
             if (methodNames.has(e.name.toLowerCase())) continue
             if (e.name === '__tests__' || e.name === '__mocks__') continue
             walkPlain(path.join(dir, e.name), [...rel, e.name])
-          } else if (e.isFile() && (e.name.endsWith('.ts') || e.name.endsWith('.js')) && !e.name.startsWith('route.')) {
-            if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue
-            if (e.name.endsWith('.d.ts')) continue
+          } else if (e.isFile() && e.name.endsWith('.ts') && e.name !== 'route.ts') {
+            if (/\.(test|spec)\.ts$/.test(e.name)) continue
             plainFiles.push([...rel, e.name].join('/'))
           }
         }
       }
       if (fs.existsSync(apiPkg)) walkPlain(apiPkg)
       if (fs.existsSync(apiApp)) walkPlain(apiApp)
-      const plainList = Array.from(new Set(plainFiles.map(f => f.replace(/\.(ts|js)$/, ''))))
+      const plainList = Array.from(new Set(plainFiles))
       for (const rel of plainList) {
         const segs = rel.split('/')
-        const pathWithoutExt = segs.pop()!
+        const file = segs.pop()!
+        const pathWithoutExt = file.replace(/\.ts$/, '')
         const fullSegs = [...segs, pathWithoutExt]
         const routePath = '/' + [modId, ...fullSegs].filter(Boolean).join('/')
         const importName = `R${importId++}_${toVar(modId)}_${toVar(fullSegs.join('_') || 'index')}`
-        const appFileTs = path.join(apiApp, ...fullSegs) + '.ts'
-        const appFileJs = path.join(apiApp, ...fullSegs) + '.js'
-        const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs)
+        const appFile = path.join(apiApp, ...fullSegs) + '.ts'
+        const fromApp = fs.existsSync(appFile)
         const plainSegPath = fullSegs.join('/')
         const importPath = `${fromApp ? appImportBase : imps.pkgBase}/api${plainSegPath ? `/${plainSegPath}` : ''}`
-        const pkgFileTs = path.join(apiPkg, ...fullSegs) + '.ts'
-        const pkgFileJs = path.join(apiPkg, ...fullSegs) + '.js'
-        const sourceFile = fromApp
-          ? (fs.existsSync(appFileTs) ? appFileTs : appFileJs)
-          : (fs.existsSync(pkgFileTs) ? pkgFileTs : pkgFileJs)
+        const pkgFile = path.join(apiPkg, ...fullSegs) + '.ts'
+        const sourceFile = fromApp ? appFile : pkgFile
         const hasOpenApi = await moduleHasExport(sourceFile, 'openApi')
         const docsPart = hasOpenApi ? `, docs: ${importName}.openApi` : ''
         imports.push(`import * as ${importName} from '${importPath}'`)
@@ -466,27 +440,25 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
             if (e.isDirectory()) {
               if (e.name === '__tests__' || e.name === '__mocks__') continue
               walk2(path.join(dir, e.name), [...rel, e.name])
-            } else if (e.isFile() && (e.name.endsWith('.ts') || e.name.endsWith('.js'))) {
-              if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue
-              if (e.name.endsWith('.d.ts')) continue
+            } else if (e.isFile() && e.name.endsWith('.ts')) {
+              if (/\.(test|spec)\.ts$/.test(e.name)) continue
               apiFiles.push([...rel, e.name].join('/'))
             }
           }
         }
         walk2(methodDir)
-        const methodList = Array.from(new Set(apiFiles.map(f => f.replace(/\.(ts|js)$/, ''))))
+        const methodList = Array.from(new Set(apiFiles))
         for (const rel of methodList) {
           const segs = rel.split('/')
-          const pathWithoutExt = segs.pop()!
+          const file = segs.pop()!
+          const pathWithoutExt = file.replace(/\.ts$/, '')
           const fullSegs = [...segs, pathWithoutExt]
           const routePath = '/' + [modId, ...fullSegs].filter(Boolean).join('/')
           const importName = `H${importId++}_${toVar(modId)}_${toVar(method)}_${toVar(fullSegs.join('_'))}`
           const fromApp = methodDir === appMethodDir
           const importPath = `${fromApp ? appImportBase : imps.pkgBase}/api/${method.toLowerCase()}/${fullSegs.join('/')}`
           const metaName = `RM${importId++}_${toVar(modId)}_${toVar(method)}_${toVar(fullSegs.join('_'))}`
-          const sourceFileTs = path.join(methodDir, ...segs, `${pathWithoutExt}.ts`)
-          const sourceFileJs = path.join(methodDir, ...segs, `${pathWithoutExt}.js`)
-          const sourceFile = fs.existsSync(sourceFileTs) ? sourceFileTs : sourceFileJs
+          const sourceFile = path.join(methodDir, ...segs, file)
           const hasOpenApi = await moduleHasExport(sourceFile, 'openApi')
           const docsPart = hasOpenApi ? `, docs: ${metaName}.openApi` : ''
           imports.push(`import ${importName}, * as ${metaName} from '${importPath}'`)
@@ -496,9 +468,9 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
     }
 
     // CLI
-    const cliApp = findModuleFile(roots.appBase, 'cli')
-    const cliPkg = findModuleFile(roots.pkgBase, 'cli')
-    const cliPath = cliApp ?? cliPkg
+    const cliApp = path.join(roots.appBase, 'cli.ts')
+    const cliPkg = path.join(roots.pkgBase, 'cli.ts')
+    const cliPath = fs.existsSync(cliApp) ? cliApp : fs.existsSync(cliPkg) ? cliPkg : null
     if (cliPath) {
       const importName = `CLI_${toVar(modId)}`
       const importPath = cliPath.startsWith(roots.appBase) ? `${appImportBase}/cli` : `${imps.pkgBase}/cli`
@@ -538,7 +510,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
       }
     }
 
-    // Subscribers: src/modules/<module>/subscribers/*.ts or *.js
+    // Subscribers: src/modules/<module>/subscribers/*.ts
     const subApp = path.join(roots.appBase, 'subscribers')
     const subPkg = path.join(roots.pkgBase, 'subscribers')
     if (fs.existsSync(subApp) || fs.existsSync(subPkg)) {
@@ -548,9 +520,8 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
           if (e.isDirectory()) {
             if (e.name === '__tests__' || e.name === '__mocks__') continue
             walk(path.join(dir, e.name), [...rel, e.name])
-          } else if (e.isFile() && (e.name.endsWith('.ts') || e.name.endsWith('.js'))) {
-            if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue
-            if (e.name.endsWith('.d.ts')) continue
+          } else if (e.isFile() && e.name.endsWith('.ts')) {
+            if (/\.(test|spec)\.ts$/.test(e.name)) continue
             found.push([...rel, e.name].join('/'))
           }
         }
@@ -561,12 +532,11 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
       for (const rel of files) {
         const segs = rel.split('/')
         const file = segs.pop()!
-        const name = file.replace(/\.(ts|js)$/, '')
+        const name = file.replace(/\.ts$/, '')
         const importName = `Subscriber${importId++}_${toVar(modId)}_${toVar([...segs, name].join('_') || 'index')}`
         const metaName = `SubscriberMeta${importId++}_${toVar(modId)}_${toVar([...segs, name].join('_') || 'index')}`
-        const appFileTs = path.join(subApp, ...segs, `${name}.ts`)
-        const appFileJs = path.join(subApp, ...segs, `${name}.js`)
-        const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs)
+        const appFile = path.join(subApp, ...segs, `${name}.ts`)
+        const fromApp = fs.existsSync(appFile)
         const importPath = `${fromApp ? appImportBase : imps.pkgBase}/subscribers/${[...segs, name].join('/')}`
         imports.push(`import ${importName}, * as ${metaName} from '${importPath}'`)
         const sid = [modId, ...segs, name].filter(Boolean).join(':')
@@ -576,7 +546,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
       }
     }
 
-    // Workers: src/modules/<module>/workers/*.ts or *.js
+    // Workers: src/modules/<module>/workers/*.ts
     // Only includes files that export `metadata` with a `queue` property
     {
       const wrkApp = path.join(roots.appBase, 'workers')
@@ -588,9 +558,8 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
             if (e.isDirectory()) {
               if (e.name === '__tests__' || e.name === '__mocks__') continue
               walk(path.join(dir, e.name), [...rel, e.name])
-            } else if (e.isFile() && (e.name.endsWith('.ts') || e.name.endsWith('.js'))) {
-              if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue
-              if (e.name.endsWith('.d.ts')) continue
+            } else if (e.isFile() && e.name.endsWith('.ts')) {
+              if (/\.(test|spec)\.ts$/.test(e.name)) continue
               found.push([...rel, e.name].join('/'))
             }
           }
@@ -601,10 +570,9 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
         for (const rel of files) {
           const segs = rel.split('/')
           const file = segs.pop()!
-          const name = file.replace(/\.(ts|js)$/, '')
-          const appFileTs = path.join(wrkApp, ...segs, `${name}.ts`)
-          const appFileJs = path.join(wrkApp, ...segs, `${name}.js`)
-          const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs)
+          const name = file.replace(/\.ts$/, '')
+          const appFile = path.join(wrkApp, ...segs, `${name}.ts`)
+          const fromApp = fs.existsSync(appFile)
           // Use package import path for checking exports (file path fails due to relative imports)
           const importPath = `${fromApp ? appImportBase : imps.pkgBase}/workers/${[...segs, name].join('/')}`
           // Only include files that export metadata with a queue property
@@ -962,9 +930,9 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
     let customFieldSetsExpr: string = '[]'
 
     // Module metadata: index.ts (overrideable)
-    const appIndex = findModuleFile(roots.appBase, 'index')
-    const pkgIndex = findModuleFile(roots.pkgBase, 'index')
-    const indexTs = appIndex ?? pkgIndex
+    const appIndex = path.join(roots.appBase, 'index.ts')
+    const pkgIndex = path.join(roots.pkgBase, 'index.ts')
+    const indexTs = fs.existsSync(appIndex) ? appIndex : fs.existsSync(pkgIndex) ? pkgIndex : null
     if (indexTs) {
       infoImportName = `I${importId++}_${toVar(modId)}`
       const importPath = indexTs.startsWith(roots.appBase) ? `${appImportBase}/index` : `${imps.pkgBase}/index`
@@ -981,10 +949,10 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
 
     // Entity extensions: src/modules/<module>/data/extensions.ts
     {
-      const appFile = findModuleFile(roots.appBase, 'data', 'extensions')
-      const pkgFile = findModuleFile(roots.pkgBase, 'data', 'extensions')
-      const hasApp = !!appFile
-      const hasPkg = !!pkgFile
+      const appFile = path.join(roots.appBase, 'data', 'extensions.ts')
+      const pkgFile = path.join(roots.pkgBase, 'data', 'extensions.ts')
+      const hasApp = fs.existsSync(appFile)
+      const hasPkg = fs.existsSync(pkgFile)
       if (hasApp || hasPkg) {
         const importName = `X_${toVar(modId)}_${importId++}`
         const importPath = hasApp ? `${appImportBase}/data/extensions` : `${imps.pkgBase}/data/extensions`
@@ -995,12 +963,12 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
 
     // RBAC feature declarations: module root acl.ts
     {
-      const rootApp = findModuleFile(roots.appBase, 'acl')
-      const rootPkg = findModuleFile(roots.pkgBase, 'acl')
-      const hasRoot = rootApp || rootPkg
+      const rootApp = path.join(roots.appBase, 'acl.ts')
+      const rootPkg = path.join(roots.pkgBase, 'acl.ts')
+      const hasRoot = fs.existsSync(rootApp) || fs.existsSync(rootPkg)
       if (hasRoot) {
         const importName = `ACL_${toVar(modId)}_${importId++}`
-        const useApp = rootApp ?? rootPkg!
+        const useApp = fs.existsSync(rootApp) ? rootApp : rootPkg
         const importPath = useApp.startsWith(roots.appBase) ? `${appImportBase}/acl` : `${imps.pkgBase}/acl`
         imports.push(`import * as ${importName} from '${importPath}'`)
         featuresImportName = importName
@@ -1009,10 +977,10 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
 
     // Custom entities declarations: module root ce.ts
     {
-      const appFile = findModuleFile(roots.appBase, 'ce')
-      const pkgFile = findModuleFile(roots.pkgBase, 'ce')
-      const hasApp = !!appFile
-      const hasPkg = !!pkgFile
+      const appFile = path.join(roots.appBase, 'ce.ts')
+      const pkgFile = path.join(roots.pkgBase, 'ce.ts')
+      const hasApp = fs.existsSync(appFile)
+      const hasPkg = fs.existsSync(pkgFile)
       if (hasApp || hasPkg) {
         const importName = `CE_${toVar(modId)}_${importId++}`
         const importPath = hasApp ? `${appImportBase}/ce` : `${imps.pkgBase}/ce`
@@ -1023,10 +991,10 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
 
     // Vector search configuration: module root vector.ts
     {
-      const appFile = findModuleFile(roots.appBase, 'vector')
-      const pkgFile = findModuleFile(roots.pkgBase, 'vector')
-      const hasApp = !!appFile
-      const hasPkg = !!pkgFile
+      const appFile = path.join(roots.appBase, 'vector.ts')
+      const pkgFile = path.join(roots.pkgBase, 'vector.ts')
+      const hasApp = fs.existsSync(appFile)
+      const hasPkg = fs.existsSync(pkgFile)
       if (hasApp || hasPkg) {
         const importName = `VECTOR_${toVar(modId)}_${importId++}`
         const importPath = hasApp ? `${appImportBase}/vector` : `${imps.pkgBase}/vector`
@@ -1037,10 +1005,10 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
 
     // Custom field declarations: src/modules/<module>/data/fields.ts
     {
-      const appFile = findModuleFile(roots.appBase, 'data', 'fields')
-      const pkgFile = findModuleFile(roots.pkgBase, 'data', 'fields')
-      const hasApp = !!appFile
-      const hasPkg = !!pkgFile
+      const appFile = path.join(roots.appBase, 'data', 'fields.ts')
+      const pkgFile = path.join(roots.pkgBase, 'data', 'fields.ts')
+      const hasApp = fs.existsSync(appFile)
+      const hasPkg = fs.existsSync(pkgFile)
       if (hasApp || hasPkg) {
         const importName = `F_${toVar(modId)}_${importId++}`
         const importPath = hasApp ? `${appImportBase}/data/fields` : `${imps.pkgBase}/data/fields`
@@ -1050,9 +1018,9 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
     }
 
     // CLI
-    const cliApp = findModuleFile(roots.appBase, 'cli')
-    const cliPkg = findModuleFile(roots.pkgBase, 'cli')
-    const cliPath = cliApp ?? cliPkg
+    const cliApp = path.join(roots.appBase, 'cli.ts')
+    const cliPkg = path.join(roots.pkgBase, 'cli.ts')
+    const cliPath = fs.existsSync(cliApp) ? cliApp : fs.existsSync(cliPkg) ? cliPkg : null
     if (cliPath) {
       const importName = `CLI_${toVar(modId)}`
       const importPath = cliPath.startsWith(roots.appBase) ? `${appImportBase}/cli` : `${imps.pkgBase}/cli`
@@ -1092,7 +1060,7 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
       }
     }
 
-    // Subscribers: src/modules/<module>/subscribers/*.ts or *.js
+    // Subscribers: src/modules/<module>/subscribers/*.ts
     const subApp = path.join(roots.appBase, 'subscribers')
     const subPkg = path.join(roots.pkgBase, 'subscribers')
     if (fs.existsSync(subApp) || fs.existsSync(subPkg)) {
@@ -1102,9 +1070,8 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
           if (e.isDirectory()) {
             if (e.name === '__tests__' || e.name === '__mocks__') continue
             walk(path.join(dir, e.name), [...rel, e.name])
-          } else if (e.isFile() && (e.name.endsWith('.ts') || e.name.endsWith('.js'))) {
-            if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue
-            if (e.name.endsWith('.d.ts')) continue
+          } else if (e.isFile() && e.name.endsWith('.ts')) {
+            if (/\.(test|spec)\.ts$/.test(e.name)) continue
             found.push([...rel, e.name].join('/'))
           }
         }
@@ -1115,12 +1082,11 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
       for (const rel of files) {
         const segs = rel.split('/')
         const file = segs.pop()!
-        const name = file.replace(/\.(ts|js)$/, '')
+        const name = file.replace(/\.ts$/, '')
         const importName = `Subscriber${importId++}_${toVar(modId)}_${toVar([...segs, name].join('_') || 'index')}`
         const metaName = `SubscriberMeta${importId++}_${toVar(modId)}_${toVar([...segs, name].join('_') || 'index')}`
-        const appFileTs = path.join(subApp, ...segs, `${name}.ts`)
-        const appFileJs = path.join(subApp, ...segs, `${name}.js`)
-        const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs)
+        const appFile = path.join(subApp, ...segs, `${name}.ts`)
+        const fromApp = fs.existsSync(appFile)
         const importPath = `${fromApp ? appImportBase : imps.pkgBase}/subscribers/${[...segs, name].join('/')}`
         imports.push(`import ${importName}, * as ${metaName} from '${importPath}'`)
         const sid = [modId, ...segs, name].filter(Boolean).join(':')
@@ -1130,7 +1096,7 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
       }
     }
 
-    // Workers: src/modules/<module>/workers/*.ts or *.js
+    // Workers: src/modules/<module>/workers/*.ts
     // Only includes files that export `metadata` with a `queue` property
     {
       const wrkApp = path.join(roots.appBase, 'workers')
@@ -1142,9 +1108,8 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
             if (e.isDirectory()) {
               if (e.name === '__tests__' || e.name === '__mocks__') continue
               walk(path.join(dir, e.name), [...rel, e.name])
-            } else if (e.isFile() && (e.name.endsWith('.ts') || e.name.endsWith('.js'))) {
-              if (/\.(test|spec)\.(ts|js)$/.test(e.name)) continue
-              if (e.name.endsWith('.d.ts')) continue
+            } else if (e.isFile() && e.name.endsWith('.ts')) {
+              if (/\.(test|spec)\.ts$/.test(e.name)) continue
               found.push([...rel, e.name].join('/'))
             }
           }
@@ -1155,10 +1120,9 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
         for (const rel of files) {
           const segs = rel.split('/')
           const file = segs.pop()!
-          const name = file.replace(/\.(ts|js)$/, '')
-          const appFileTs = path.join(wrkApp, ...segs, `${name}.ts`)
-          const appFileJs = path.join(wrkApp, ...segs, `${name}.js`)
-          const fromApp = fs.existsSync(appFileTs) || fs.existsSync(appFileJs)
+          const name = file.replace(/\.ts$/, '')
+          const appFile = path.join(wrkApp, ...segs, `${name}.ts`)
+          const fromApp = fs.existsSync(appFile)
           // Use package import path for checking exports (file path fails due to relative imports)
           const importPath = `${fromApp ? appImportBase : imps.pkgBase}/workers/${[...segs, name].join('/')}`
           // Only include files that export metadata with a queue property