@open-mercato/shared 0.5.1-develop.2699.f8b50c8046 → 0.5.1-develop.2709.b6bdd776ac

package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
-[build:shared] found 201 entry points
+[build:shared] found 202 entry points
 [build:shared] built successfully

package/dist/lib/bootstrap/dynamicLoader.js

@@ -1,10 +1,15 @@
 import { findAppRoot } from "./appResolver.js";
 import { registerEntityIds } from "../encryption/entityIds.js";
+import {
+  ensureMikroOrmV7GeneratedCacheCompatibility,
+  recoverMikroOrmV7GeneratedCacheFromImportError
+} from "./generatedCacheRecovery.js";
 import path from "node:path";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-async function compileAndImport(tsPath) {
+async function compileAndImport(tsPath, allowRecovery = true) {
   const jsPath = tsPath.replace(/\.ts$/, ".mjs");
+  const appRoot = path.dirname(path.dirname(path.dirname(tsPath)));
   const tsExists = fs.existsSync(tsPath);
   const jsExists = fs.existsSync(jsPath);
   if (!tsExists) {
@@ -13,7 +18,6 @@ async function compileAndImport(tsPath) {
   const needsCompile = !jsExists || fs.statSync(tsPath).mtimeMs > fs.statSync(jsPath).mtimeMs;
   if (needsCompile) {
     const esbuild = await import("esbuild");
-    const appRoot = path.dirname(path.dirname(path.dirname(tsPath)));
     const aliasPlugin = {
       name: "alias-resolver",
       setup(build) {
@@ -55,8 +59,19 @@ async function compileAndImport(tsPath) {
       loader: { ".json": "json" }
     });
   }
-  const fileUrl = pathToFileURL(jsPath).href;
-  return import(fileUrl);
+  try {
+    const fileUrl = `${pathToFileURL(jsPath).href}?mtime=${fs.statSync(jsPath).mtimeMs}`;
+    return import(fileUrl);
+  } catch (error) {
+    if (!allowRecovery) {
+      throw error;
+    }
+    const recovered = recoverMikroOrmV7GeneratedCacheFromImportError(appRoot, error);
+    if (!recovered.applied) {
+      throw error;
+    }
+    return compileAndImport(tsPath, false);
+  }
 }
 async function loadBootstrapData(appRoot) {
   const resolved = appRoot ? {
@@ -70,6 +85,7 @@ async function loadBootstrapData(appRoot) {
     );
   }
   const { generatedDir } = resolved;
+  ensureMikroOrmV7GeneratedCacheCompatibility(resolved.appDir);
   const entityIdsModule = await compileAndImport(path.join(generatedDir, "entities.ids.generated.ts"));
   registerEntityIds(entityIdsModule.E);
   const [

package/dist/lib/bootstrap/dynamicLoader.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/bootstrap/dynamicLoader.ts"],
-  "sourcesContent": ["import type { BootstrapData } from './types'\nimport { findAppRoot, type AppRoot } from './appResolver'\nimport { registerEntityIds } from '../encryption/entityIds'\nimport path from 'node:path'\nimport fs from 'node:fs'\nimport { pathToFileURL } from 'node:url'\n\n/**\n * Compile a TypeScript file to JavaScript using esbuild bundler.\n * This bundles the file and all its dependencies, handling JSON imports properly.\n * The compiled file is written next to the source file with a .mjs extension.\n */\nasync function compileAndImport(tsPath: string): Promise<Record<string, unknown>> {\n  const jsPath = tsPath.replace(/\\.ts$/, '.mjs')\n\n  // Check if we need to recompile (source newer than compiled)\n  const tsExists = fs.existsSync(tsPath)\n  const jsExists = fs.existsSync(jsPath)\n\n  if (!tsExists) {\n    throw new Error(`Generated file not found: ${tsPath}`)\n  }\n\n  const needsCompile = !jsExists ||\n    fs.statSync(tsPath).mtimeMs > fs.statSync(jsPath).mtimeMs\n\n  if (needsCompile) {\n    // Dynamically import esbuild only when needed\n    const esbuild = await import('esbuild')\n\n    // The app root is 2 levels up from .mercato/generated/\n    const appRoot = path.dirname(path.dirname(path.dirname(tsPath)))\n\n    // Plugin to resolve @/ alias to app root (works for @app modules)\n    const aliasPlugin: import('esbuild').Plugin = {\n      name: 'alias-resolver',\n      setup(build) {\n        // Resolve @/ alias to app root\n        build.onResolve({ filter: /^@\\// }, (args) => {\n          const resolved = path.join(appRoot, args.path.slice(2))\n          // Try with .ts extension if base path doesn't exist\n          if (!fs.existsSync(resolved) && fs.existsSync(resolved + '.ts')) {\n            return { path: resolved + '.ts' }\n          }\n          // Also check for /index.ts if it's a directory\n          if (fs.existsSync(resolved) && fs.statSync(resolved).isDirectory() && fs.existsSync(path.join(resolved, 'index.ts'))) {\n            return { path: path.join(resolved, 'index.ts') }\n          }\n          return { path: resolved }\n        })\n      },\n    }\n\n    // Plugin to mark non-JSON package imports as external\n    const externalNonJsonPlugin: import('esbuild').Plugin = {\n      name: 'external-non-json',\n      setup(build) {\n        // Mark all package imports as external EXCEPT JSON files\n        // Filter matches paths that don't start with . or / (package imports like @open-mercato/shared)\n        build.onResolve({ filter: /^[^./]/ }, (args) => {\n          // Skip Windows absolute paths (e.g., C:\\...) - they're local files, not packages\n          if (/^[a-zA-Z]:/.test(args.path)) {\n            return null // Let esbuild handle it\n          }\n          // If it's a JSON file, let esbuild bundle it\n          if (args.path.endsWith('.json')) {\n            return null // Let esbuild handle it\n          }\n          // Otherwise mark as external\n          return { path: args.path, external: true }\n        })\n      },\n    }\n\n    // Use esbuild.build with bundling to handle JSON imports\n    await esbuild.build({\n      entryPoints: [tsPath],\n      outfile: jsPath,\n      bundle: true,\n      format: 'esm',\n      platform: 'node',\n      target: 'node18',\n      plugins: [aliasPlugin, externalNonJsonPlugin],\n      // Allow JSON imports\n      loader: { '.json': 'json' },\n    })\n  }\n\n  // Import the compiled JavaScript\n  const fileUrl = pathToFileURL(jsPath).href\n  return import(fileUrl)\n}\n\n\n/**\n * Dynamically load bootstrap data from a resolved app directory.\n *\n * IMPORTANT: This only works in unbundled contexts (CLI, tsx).\n * Do NOT use this in Next.js bundled code - use static imports instead.\n *\n * For CLI context, we skip loading modules.generated.ts which has Next.js dependencies.\n * CLI commands are discovered separately via the CLI module system.\n *\n * @param appRoot - Optional explicit app root path. If not provided, will search from cwd.\n * @returns The loaded bootstrap data\n * @throws Error if app root cannot be found or generated files are missing\n */\nexport async function loadBootstrapData(appRoot?: string): Promise<BootstrapData> {\n  const resolved: AppRoot | null = appRoot\n    ? {\n        generatedDir: path.join(appRoot, '.mercato', 'generated'),\n        appDir: appRoot,\n        mercatoDir: path.join(appRoot, '.mercato'),\n      }\n    : findAppRoot()\n\n  if (!resolved) {\n    throw new Error(\n      'Could not find app root with .mercato/generated directory. ' +\n        'Make sure you run this command from within a Next.js app directory, ' +\n        'or run \"yarn mercato generate\" first to create the generated files.',\n    )\n  }\n\n  const { generatedDir } = resolved\n\n  // IMPORTANT: Load entity IDs FIRST and register them before loading modules.\n  // This is because modules (e.g., ce.ts files) use E.xxx.xxx at module scope,\n  // and they need entity IDs to be available when they're imported.\n  const entityIdsModule = await compileAndImport(path.join(generatedDir, 'entities.ids.generated.ts'))\n  registerEntityIds(entityIdsModule.E as BootstrapData['entityIds'])\n\n  // Now load the rest of the generated files.\n  // modules.cli.generated.ts excludes Next.js-dependent code (routes, APIs, widgets)\n  const [\n    modulesModule,\n    entitiesModule,\n    diModule,\n    searchModule,\n  ] = await Promise.all([\n    compileAndImport(path.join(generatedDir, 'modules.cli.generated.ts')),\n    compileAndImport(path.join(generatedDir, 'entities.generated.ts')),\n    compileAndImport(path.join(generatedDir, 'di.generated.ts')),\n    compileAndImport(path.join(generatedDir, 'search.generated.ts')).catch(() => ({ searchModuleConfigs: [] })),\n  ])\n\n  return {\n    modules: modulesModule.modules as BootstrapData['modules'],\n    entities: entitiesModule.entities as BootstrapData['entities'],\n    diRegistrars: diModule.diRegistrars as BootstrapData['diRegistrars'],\n    entityIds: entityIdsModule.E as BootstrapData['entityIds'],\n    // Search configs are needed by workers for indexing\n    searchModuleConfigs: (searchModule.searchModuleConfigs ?? []) as BootstrapData['searchModuleConfigs'],\n    // Empty UI-related data - not needed for CLI\n    dashboardWidgetEntries: [],\n    injectionWidgetEntries: [],\n    injectionTables: [],\n    interceptorEntries: [],\n    componentOverrideEntries: [],\n  }\n}\n\n/**\n * Create and execute bootstrap in CLI context.\n *\n * This is a convenience function that finds the app root, loads the generated\n * data dynamically, and runs bootstrap. Use this in CLI entry points.\n *\n * Returns the loaded bootstrap data so the CLI can register modules directly\n * (avoids module resolution issues when importing @open-mercato/cli/mercato).\n *\n * @param appRoot - Optional explicit app root path\n * @returns The loaded bootstrap data (modules, entities, etc.)\n */\nexport async function bootstrapFromAppRoot(appRoot?: string): Promise<BootstrapData> {\n  const { createBootstrap, waitForAsyncRegistration } = await import('./factory.js')\n  const data = await loadBootstrapData(appRoot)\n  const bootstrap = createBootstrap(data)\n  bootstrap()\n  // In CLI context, wait for async registrations (UI widgets, search configs, etc.)\n  await waitForAsyncRegistration()\n\n  return data\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { BootstrapData } from './types'\nimport { findAppRoot, type AppRoot } from './appResolver'\nimport { registerEntityIds } from '../encryption/entityIds'\nimport {\n  ensureMikroOrmV7GeneratedCacheCompatibility,\n  recoverMikroOrmV7GeneratedCacheFromImportError,\n} from './generatedCacheRecovery'\nimport path from 'node:path'\nimport fs from 'node:fs'\nimport { pathToFileURL } from 'node:url'\n\n/**\n * Compile a TypeScript file to JavaScript using esbuild bundler.\n * This bundles the file and all its dependencies, handling JSON imports properly.\n * The compiled file is written next to the source file with a .mjs extension.\n */\nasync function compileAndImport(tsPath: string, allowRecovery: boolean = true): Promise<Record<string, unknown>> {\n  const jsPath = tsPath.replace(/\\.ts$/, '.mjs')\n  const appRoot = path.dirname(path.dirname(path.dirname(tsPath)))\n\n  // Check if we need to recompile (source newer than compiled)\n  const tsExists = fs.existsSync(tsPath)\n  const jsExists = fs.existsSync(jsPath)\n\n  if (!tsExists) {\n    throw new Error(`Generated file not found: ${tsPath}`)\n  }\n\n  const needsCompile = !jsExists ||\n    fs.statSync(tsPath).mtimeMs > fs.statSync(jsPath).mtimeMs\n\n  if (needsCompile) {\n    // Dynamically import esbuild only when needed\n    const esbuild = await import('esbuild')\n\n    // Plugin to resolve @/ alias to app root (works for @app modules)\n    const aliasPlugin: import('esbuild').Plugin = {\n      name: 'alias-resolver',\n      setup(build) {\n        // Resolve @/ alias to app root\n        build.onResolve({ filter: /^@\\// }, (args) => {\n          const resolved = path.join(appRoot, args.path.slice(2))\n          // Try with .ts extension if base path doesn't exist\n          if (!fs.existsSync(resolved) && fs.existsSync(resolved + '.ts')) {\n            return { path: resolved + '.ts' }\n          }\n          // Also check for /index.ts if it's a directory\n          if (fs.existsSync(resolved) && fs.statSync(resolved).isDirectory() && fs.existsSync(path.join(resolved, 'index.ts'))) {\n            return { path: path.join(resolved, 'index.ts') }\n          }\n          return { path: resolved }\n        })\n      },\n    }\n\n    // Plugin to mark non-JSON package imports as external\n    const externalNonJsonPlugin: import('esbuild').Plugin = {\n      name: 'external-non-json',\n      setup(build) {\n        // Mark all package imports as external EXCEPT JSON files\n        // Filter matches paths that don't start with . or / (package imports like @open-mercato/shared)\n        build.onResolve({ filter: /^[^./]/ }, (args) => {\n          // Skip Windows absolute paths (e.g., C:\\...) - they're local files, not packages\n          if (/^[a-zA-Z]:/.test(args.path)) {\n            return null // Let esbuild handle it\n          }\n          // If it's a JSON file, let esbuild bundle it\n          if (args.path.endsWith('.json')) {\n            return null // Let esbuild handle it\n          }\n          // Otherwise mark as external\n          return { path: args.path, external: true }\n        })\n      },\n    }\n\n    // Use esbuild.build with bundling to handle JSON imports\n    await esbuild.build({\n      entryPoints: [tsPath],\n      outfile: jsPath,\n      bundle: true,\n      format: 'esm',\n      platform: 'node',\n      target: 'node18',\n      plugins: [aliasPlugin, externalNonJsonPlugin],\n      // Allow JSON imports\n      loader: { '.json': 'json' },\n    })\n  }\n\n  // Import the compiled JavaScript\n  try {\n    const fileUrl = `${pathToFileURL(jsPath).href}?mtime=${fs.statSync(jsPath).mtimeMs}`\n    return import(fileUrl)\n  } catch (error) {\n    if (!allowRecovery) {\n      throw error\n    }\n\n    const recovered = recoverMikroOrmV7GeneratedCacheFromImportError(appRoot, error)\n    if (!recovered.applied) {\n      throw error\n    }\n\n    return compileAndImport(tsPath, false)\n  }\n}\n\n\n/**\n * Dynamically load bootstrap data from a resolved app directory.\n *\n * IMPORTANT: This only works in unbundled contexts (CLI, tsx).\n * Do NOT use this in Next.js bundled code - use static imports instead.\n *\n * For CLI context, we skip loading modules.generated.ts which has Next.js dependencies.\n * CLI commands are discovered separately via the CLI module system.\n *\n * @param appRoot - Optional explicit app root path. If not provided, will search from cwd.\n * @returns The loaded bootstrap data\n * @throws Error if app root cannot be found or generated files are missing\n */\nexport async function loadBootstrapData(appRoot?: string): Promise<BootstrapData> {\n  const resolved: AppRoot | null = appRoot\n    ? {\n        generatedDir: path.join(appRoot, '.mercato', 'generated'),\n        appDir: appRoot,\n        mercatoDir: path.join(appRoot, '.mercato'),\n      }\n    : findAppRoot()\n\n  if (!resolved) {\n    throw new Error(\n      'Could not find app root with .mercato/generated directory. ' +\n        'Make sure you run this command from within a Next.js app directory, ' +\n        'or run \"yarn mercato generate\" first to create the generated files.',\n    )\n  }\n\n  const { generatedDir } = resolved\n\n  ensureMikroOrmV7GeneratedCacheCompatibility(resolved.appDir)\n\n  // IMPORTANT: Load entity IDs FIRST and register them before loading modules.\n  // This is because modules (e.g., ce.ts files) use E.xxx.xxx at module scope,\n  // and they need entity IDs to be available when they're imported.\n  const entityIdsModule = await compileAndImport(path.join(generatedDir, 'entities.ids.generated.ts'))\n  registerEntityIds(entityIdsModule.E as BootstrapData['entityIds'])\n\n  // Now load the rest of the generated files.\n  // modules.cli.generated.ts excludes Next.js-dependent code (routes, APIs, widgets)\n  const [\n    modulesModule,\n    entitiesModule,\n    diModule,\n    searchModule,\n  ] = await Promise.all([\n    compileAndImport(path.join(generatedDir, 'modules.cli.generated.ts')),\n    compileAndImport(path.join(generatedDir, 'entities.generated.ts')),\n    compileAndImport(path.join(generatedDir, 'di.generated.ts')),\n    compileAndImport(path.join(generatedDir, 'search.generated.ts')).catch(() => ({ searchModuleConfigs: [] })),\n  ])\n\n  return {\n    modules: modulesModule.modules as BootstrapData['modules'],\n    entities: entitiesModule.entities as BootstrapData['entities'],\n    diRegistrars: diModule.diRegistrars as BootstrapData['diRegistrars'],\n    entityIds: entityIdsModule.E as BootstrapData['entityIds'],\n    // Search configs are needed by workers for indexing\n    searchModuleConfigs: (searchModule.searchModuleConfigs ?? []) as BootstrapData['searchModuleConfigs'],\n    // Empty UI-related data - not needed for CLI\n    dashboardWidgetEntries: [],\n    injectionWidgetEntries: [],\n    injectionTables: [],\n    interceptorEntries: [],\n    componentOverrideEntries: [],\n  }\n}\n\n/**\n * Create and execute bootstrap in CLI context.\n *\n * This is a convenience function that finds the app root, loads the generated\n * data dynamically, and runs bootstrap. Use this in CLI entry points.\n *\n * Returns the loaded bootstrap data so the CLI can register modules directly\n * (avoids module resolution issues when importing @open-mercato/cli/mercato).\n *\n * @param appRoot - Optional explicit app root path\n * @returns The loaded bootstrap data (modules, entities, etc.)\n */\nexport async function bootstrapFromAppRoot(appRoot?: string): Promise<BootstrapData> {\n  const { createBootstrap, waitForAsyncRegistration } = await import('./factory.js')\n  const data = await loadBootstrapData(appRoot)\n  const bootstrap = createBootstrap(data)\n  bootstrap()\n  // In CLI context, wait for async registrations (UI widgets, search configs, etc.)\n  await waitForAsyncRegistration()\n\n  return data\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/bootstrap/generatedCacheRecovery.js

@@ -0,0 +1,121 @@
+import fs from "node:fs";
+import path from "node:path";
+const DECORATOR_EXPORT_NAMES = [
+  "Entity",
+  "PrimaryKey",
+  "Property",
+  "ManyToOne",
+  "OneToMany",
+  "OneToOne",
+  "ManyToMany",
+  "Enum",
+  "Index",
+  "Unique",
+  "Embeddable",
+  "Embedded",
+  "Formula"
+];
+const RECOVERY_VERSION = "mikro-orm-v7-generated-cache-recovery-v1";
+const RECOVERY_MARKER_FILE = ".mikro-orm-v7-cache-recovery.json";
+const GENERATED_DIR_SEGMENTS = [".mercato", "generated"];
+const staleDecoratorImportPattern = new RegExp(
+  String.raw`import\s*\{[^}]*\b(?:${DECORATOR_EXPORT_NAMES.join("|")})\b[^}]*\}\s*from\s*['"]@mikro-orm/core['"]`,
+  "m"
+);
+const decoratorExportErrorPattern = /@mikro-orm\/core' does not provide an export named '(?:Entity|PrimaryKey|Property|ManyToOne|OneToMany|OneToOne|ManyToMany|Enum|Index|Unique|Embeddable|Embedded|Formula)'/;
+function getGeneratedDir(appRoot) {
+  return path.join(appRoot, ...GENERATED_DIR_SEGMENTS);
+}
+function getRecoveryMarkerPath(appRoot) {
+  return path.join(getGeneratedDir(appRoot), RECOVERY_MARKER_FILE);
+}
+function walkFiles(dirPath) {
+  if (!fs.existsSync(dirPath)) return [];
+  const entries = fs.readdirSync(dirPath, { withFileTypes: true });
+  const files = [];
+  for (const entry of entries) {
+    const absolutePath = path.join(dirPath, entry.name);
+    if (entry.isDirectory()) {
+      files.push(...walkFiles(absolutePath));
+      continue;
+    }
+    if (entry.isFile()) {
+      files.push(absolutePath);
+    }
+  }
+  return files;
+}
+function listGeneratedCacheFiles(appRoot) {
+  return walkFiles(getGeneratedDir(appRoot)).filter((filePath) => filePath.endsWith(".mjs")).sort();
+}
+function findStaleGeneratedCacheFiles(appRoot) {
+  const generatedFiles = listGeneratedCacheFiles(appRoot);
+  return generatedFiles.filter((filePath) => {
+    const source = fs.readFileSync(filePath, "utf8");
+    return staleDecoratorImportPattern.test(source);
+  });
+}
+function writeRecoveryMarker(appRoot, marker) {
+  const markerPath = getRecoveryMarkerPath(appRoot);
+  fs.writeFileSync(markerPath, JSON.stringify(marker, null, 2));
+  return markerPath;
+}
+function logRecoveryMessage(logger, reason) {
+  const header = reason === "runtime-import-error" ? "\u26A0\uFE0F  Open Mercato detected a stale generated cache while bootstrapping the app." : "\u26A0\uFE0F  Open Mercato detected stale generated cache from the MikroORM v7 migration.";
+  logger.warn("");
+  logger.warn(header);
+  logger.warn("\u{1F4D8} Open Mercato migrated MikroORM to version 7. Please review UPGRADE_NOTES.md and the `migrate-mikro-orm` skill if your code still imports decorators from `@mikro-orm/core`.");
+  logger.warn("\u{1F9F9} Cleaning generated compilation cache and recompiling generated code now...");
+  logger.warn("");
+}
+function deleteGeneratedCacheFiles(filePaths) {
+  const deletedFiles = [];
+  for (const filePath of filePaths) {
+    if (!fs.existsSync(filePath)) continue;
+    fs.rmSync(filePath, { force: true });
+    deletedFiles.push(filePath);
+  }
+  return deletedFiles;
+}
+function applyGeneratedCacheRecovery(appRoot, staleFiles, reason, logger) {
+  if (staleFiles.length === 0) {
+    return { applied: false, deletedFiles: [], markerPath: null };
+  }
+  logRecoveryMessage(logger, reason);
+  const generatedCacheFiles = listGeneratedCacheFiles(appRoot);
+  const deletedFiles = deleteGeneratedCacheFiles(generatedCacheFiles);
+  const markerPath = writeRecoveryMarker(appRoot, {
+    version: RECOVERY_VERSION,
+    reason,
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    deletedFiles
+  });
+  return {
+    applied: true,
+    deletedFiles,
+    markerPath
+  };
+}
+function shouldRecoverMikroOrmV7GeneratedCache(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return decoratorExportErrorPattern.test(message);
+}
+function ensureMikroOrmV7GeneratedCacheCompatibility(appRoot, options = {}) {
+  const logger = options.logger ?? console;
+  const staleFiles = findStaleGeneratedCacheFiles(appRoot);
+  return applyGeneratedCacheRecovery(appRoot, staleFiles, "stale-generated-cache-scan", logger);
+}
+function recoverMikroOrmV7GeneratedCacheFromImportError(appRoot, error, options = {}) {
+  if (!shouldRecoverMikroOrmV7GeneratedCache(error)) {
+    return { applied: false, deletedFiles: [], markerPath: null };
+  }
+  const logger = options.logger ?? console;
+  const staleFiles = findStaleGeneratedCacheFiles(appRoot);
+  return applyGeneratedCacheRecovery(appRoot, staleFiles, "runtime-import-error", logger);
+}
+export {
+  ensureMikroOrmV7GeneratedCacheCompatibility,
+  recoverMikroOrmV7GeneratedCacheFromImportError,
+  shouldRecoverMikroOrmV7GeneratedCache
+};
+//# sourceMappingURL=generatedCacheRecovery.js.map

package/dist/lib/bootstrap/generatedCacheRecovery.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/bootstrap/generatedCacheRecovery.ts"],
+  "sourcesContent": ["import fs from 'node:fs'\nimport path from 'node:path'\n\nconst DECORATOR_EXPORT_NAMES = [\n  'Entity',\n  'PrimaryKey',\n  'Property',\n  'ManyToOne',\n  'OneToMany',\n  'OneToOne',\n  'ManyToMany',\n  'Enum',\n  'Index',\n  'Unique',\n  'Embeddable',\n  'Embedded',\n  'Formula',\n] as const\n\nconst RECOVERY_VERSION = 'mikro-orm-v7-generated-cache-recovery-v1'\nconst RECOVERY_MARKER_FILE = '.mikro-orm-v7-cache-recovery.json'\nconst GENERATED_DIR_SEGMENTS = ['.mercato', 'generated'] as const\n\nconst staleDecoratorImportPattern = new RegExp(\n  String.raw`import\\s*\\{[^}]*\\b(?:${DECORATOR_EXPORT_NAMES.join('|')})\\b[^}]*\\}\\s*from\\s*['\"]@mikro-orm/core['\"]`,\n  'm',\n)\n\nconst decoratorExportErrorPattern = /@mikro-orm\\/core' does not provide an export named '(?:Entity|PrimaryKey|Property|ManyToOne|OneToMany|OneToOne|ManyToMany|Enum|Index|Unique|Embeddable|Embedded|Formula)'/\n\ntype RecoveryLogger = {\n  warn: (message: string) => void\n}\n\ntype RecoveryReason = 'stale-generated-cache-scan' | 'runtime-import-error'\n\ntype RecoveryMarker = {\n  version: string\n  reason: RecoveryReason\n  createdAt: string\n  deletedFiles: string[]\n}\n\nexport type GeneratedCacheRecoveryResult = {\n  applied: boolean\n  deletedFiles: string[]\n  markerPath: string | null\n}\n\nfunction getGeneratedDir(appRoot: string): string {\n  return path.join(appRoot, ...GENERATED_DIR_SEGMENTS)\n}\n\nfunction getRecoveryMarkerPath(appRoot: string): string {\n  return path.join(getGeneratedDir(appRoot), RECOVERY_MARKER_FILE)\n}\n\nfunction walkFiles(dirPath: string): string[] {\n  if (!fs.existsSync(dirPath)) return []\n\n  const entries = fs.readdirSync(dirPath, { withFileTypes: true })\n  const files: string[] = []\n  for (const entry of entries) {\n    const absolutePath = path.join(dirPath, entry.name)\n    if (entry.isDirectory()) {\n      files.push(...walkFiles(absolutePath))\n      continue\n    }\n    if (entry.isFile()) {\n      files.push(absolutePath)\n    }\n  }\n  return files\n}\n\nfunction listGeneratedCacheFiles(appRoot: string): string[] {\n  return walkFiles(getGeneratedDir(appRoot))\n    .filter((filePath) => filePath.endsWith('.mjs'))\n    .sort()\n}\n\nfunction findStaleGeneratedCacheFiles(appRoot: string): string[] {\n  const generatedFiles = listGeneratedCacheFiles(appRoot)\n  return generatedFiles.filter((filePath) => {\n    const source = fs.readFileSync(filePath, 'utf8')\n    return staleDecoratorImportPattern.test(source)\n  })\n}\n\nfunction writeRecoveryMarker(appRoot: string, marker: RecoveryMarker): string {\n  const markerPath = getRecoveryMarkerPath(appRoot)\n  fs.writeFileSync(markerPath, JSON.stringify(marker, null, 2))\n  return markerPath\n}\n\nfunction logRecoveryMessage(logger: RecoveryLogger, reason: RecoveryReason): void {\n  const header =\n    reason === 'runtime-import-error'\n      ? '\u26A0\uFE0F  Open Mercato detected a stale generated cache while bootstrapping the app.'\n      : '\u26A0\uFE0F  Open Mercato detected stale generated cache from the MikroORM v7 migration.'\n\n  logger.warn('')\n  logger.warn(header)\n  logger.warn('\uD83D\uDCD8 Open Mercato migrated MikroORM to version 7. Please review UPGRADE_NOTES.md and the `migrate-mikro-orm` skill if your code still imports decorators from `@mikro-orm/core`.')\n  logger.warn('\uD83E\uDDF9 Cleaning generated compilation cache and recompiling generated code now...')\n  logger.warn('')\n}\n\nfunction deleteGeneratedCacheFiles(filePaths: string[]): string[] {\n  const deletedFiles: string[] = []\n  for (const filePath of filePaths) {\n    if (!fs.existsSync(filePath)) continue\n    fs.rmSync(filePath, { force: true })\n    deletedFiles.push(filePath)\n  }\n  return deletedFiles\n}\n\nfunction applyGeneratedCacheRecovery(\n  appRoot: string,\n  staleFiles: string[],\n  reason: RecoveryReason,\n  logger: RecoveryLogger,\n): GeneratedCacheRecoveryResult {\n  if (staleFiles.length === 0) {\n    return { applied: false, deletedFiles: [], markerPath: null }\n  }\n\n  logRecoveryMessage(logger, reason)\n\n  const generatedCacheFiles = listGeneratedCacheFiles(appRoot)\n  const deletedFiles = deleteGeneratedCacheFiles(generatedCacheFiles)\n  const markerPath = writeRecoveryMarker(appRoot, {\n    version: RECOVERY_VERSION,\n    reason,\n    createdAt: new Date().toISOString(),\n    deletedFiles,\n  })\n\n  return {\n    applied: true,\n    deletedFiles,\n    markerPath,\n  }\n}\n\nexport function shouldRecoverMikroOrmV7GeneratedCache(error: unknown): boolean {\n  const message = error instanceof Error ? error.message : String(error)\n  return decoratorExportErrorPattern.test(message)\n}\n\nexport function ensureMikroOrmV7GeneratedCacheCompatibility(\n  appRoot: string,\n  options: { logger?: RecoveryLogger } = {},\n): GeneratedCacheRecoveryResult {\n  const logger = options.logger ?? console\n  const staleFiles = findStaleGeneratedCacheFiles(appRoot)\n  return applyGeneratedCacheRecovery(appRoot, staleFiles, 'stale-generated-cache-scan', logger)\n}\n\nexport function recoverMikroOrmV7GeneratedCacheFromImportError(\n  appRoot: string,\n  error: unknown,\n  options: { logger?: RecoveryLogger } = {},\n): GeneratedCacheRecoveryResult {\n  if (!shouldRecoverMikroOrmV7GeneratedCache(error)) {\n    return { applied: false, deletedFiles: [], markerPath: null }\n  }\n\n  const logger = options.logger ?? console\n  const staleFiles = findStaleGeneratedCacheFiles(appRoot)\n  return applyGeneratedCacheRecovery(appRoot, staleFiles, 'runtime-import-error', logger)\n}\n\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/lib/commands/registry.js

@@ -1,10 +1,19 @@
 class CommandRegistry {
   constructor() {
     this.handlers = /* @__PURE__ */ new Map();
+    this.didWarnAboutDevelopmentReregistration = false;
   }
   register(handler) {
     if (!handler?.id) throw new Error("Command handler must define an id");
     if (this.handlers.has(handler.id)) {
+      if (process.env.NODE_ENV === "development") {
+        if (!this.didWarnAboutDevelopmentReregistration) {
+          console.debug("[Bootstrap] Commands re-registered (this may occur during HMR)");
+          this.didWarnAboutDevelopmentReregistration = true;
+        }
+        this.handlers.set(handler.id, handler);
+        return;
+      }
       throw new Error(`Duplicate command registration for id ${handler.id}`);
     }
     this.handlers.set(handler.id, handler);
@@ -26,6 +35,7 @@ class CommandRegistry {
   }
   clear() {
     this.handlers.clear();
+    this.didWarnAboutDevelopmentReregistration = false;
   }
 }
 const commandRegistry = new CommandRegistry();

package/dist/lib/commands/registry.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/commands/registry.ts"],
-  "sourcesContent": ["import type { CommandHandler } from './types'\n\nclass CommandRegistry {\n  private handlers = new Map<string, CommandHandler>()\n\n  register(handler: CommandHandler) {\n    if (!handler?.id) throw new Error('Command handler must define an id')\n    if (this.handlers.has(handler.id)) {\n      throw new Error(`Duplicate command registration for id ${handler.id}`)\n    }\n    this.handlers.set(handler.id, handler)\n  }\n\n  unregister(id: string) {\n    this.handlers.delete(id)\n  }\n\n  get<TInput = unknown, TResult = unknown>(id: string): CommandHandler<TInput, TResult> | null {\n    return (this.handlers.get(id) as CommandHandler<TInput, TResult> | undefined) ?? null\n  }\n\n  has(id: string): boolean {\n    return this.handlers.has(id)\n  }\n\n  /**\n   * List all registered command handler IDs.\n   */\n  list(): string[] {\n    return Array.from(this.handlers.keys())\n  }\n\n  clear() {\n    this.handlers.clear()\n  }\n}\n\nexport const commandRegistry = new CommandRegistry()\n\nexport function registerCommand(handler: CommandHandler) {\n  commandRegistry.register(handler)\n}\n\nexport function unregisterCommand(id: string) {\n  commandRegistry.unregister(id)\n}\n"],
-  "mappings": "AAEA,MAAM,gBAAgB;AAAA,EAAtB;AACE,SAAQ,WAAW,oBAAI,IAA4B;AAAA;AAAA,EAEnD,SAAS,SAAyB;AAChC,QAAI,CAAC,SAAS,GAAI,OAAM,IAAI,MAAM,mCAAmC;AACrE,QAAI,KAAK,SAAS,IAAI,QAAQ,EAAE,GAAG;AACjC,YAAM,IAAI,MAAM,yCAAyC,QAAQ,EAAE,EAAE;AAAA,IACvE;AACA,SAAK,SAAS,IAAI,QAAQ,IAAI,OAAO;AAAA,EACvC;AAAA,EAEA,WAAW,IAAY;AACrB,SAAK,SAAS,OAAO,EAAE;AAAA,EACzB;AAAA,EAEA,IAAyC,IAAoD;AAC3F,WAAQ,KAAK,SAAS,IAAI,EAAE,KAAqD;AAAA,EACnF;AAAA,EAEA,IAAI,IAAqB;AACvB,WAAO,KAAK,SAAS,IAAI,EAAE;AAAA,EAC7B;AAAA;AAAA;AAAA;AAAA,EAKA,OAAiB;AACf,WAAO,MAAM,KAAK,KAAK,SAAS,KAAK,CAAC;AAAA,EACxC;AAAA,EAEA,QAAQ;AACN,SAAK,SAAS,MAAM;AAAA,EACtB;AACF;AAEO,MAAM,kBAAkB,IAAI,gBAAgB;AAE5C,SAAS,gBAAgB,SAAyB;AACvD,kBAAgB,SAAS,OAAO;AAClC;AAEO,SAAS,kBAAkB,IAAY;AAC5C,kBAAgB,WAAW,EAAE;AAC/B;",
+  "sourcesContent": ["import type { CommandHandler } from './types'\n\nclass CommandRegistry {\n  private handlers = new Map<string, CommandHandler>()\n  private didWarnAboutDevelopmentReregistration = false\n\n  register(handler: CommandHandler) {\n    if (!handler?.id) throw new Error('Command handler must define an id')\n    if (this.handlers.has(handler.id)) {\n      if (process.env.NODE_ENV === 'development') {\n        if (!this.didWarnAboutDevelopmentReregistration) {\n          console.debug('[Bootstrap] Commands re-registered (this may occur during HMR)')\n          this.didWarnAboutDevelopmentReregistration = true\n        }\n        this.handlers.set(handler.id, handler)\n        return\n      }\n      throw new Error(`Duplicate command registration for id ${handler.id}`)\n    }\n    this.handlers.set(handler.id, handler)\n  }\n\n  unregister(id: string) {\n    this.handlers.delete(id)\n  }\n\n  get<TInput = unknown, TResult = unknown>(id: string): CommandHandler<TInput, TResult> | null {\n    return (this.handlers.get(id) as CommandHandler<TInput, TResult> | undefined) ?? null\n  }\n\n  has(id: string): boolean {\n    return this.handlers.has(id)\n  }\n\n  /**\n   * List all registered command handler IDs.\n   */\n  list(): string[] {\n    return Array.from(this.handlers.keys())\n  }\n\n  clear() {\n    this.handlers.clear()\n    this.didWarnAboutDevelopmentReregistration = false\n  }\n}\n\nexport const commandRegistry = new CommandRegistry()\n\nexport function registerCommand(handler: CommandHandler) {\n  commandRegistry.register(handler)\n}\n\nexport function unregisterCommand(id: string) {\n  commandRegistry.unregister(id)\n}\n"],
+  "mappings": "AAEA,MAAM,gBAAgB;AAAA,EAAtB;AACE,SAAQ,WAAW,oBAAI,IAA4B;AACnD,SAAQ,wCAAwC;AAAA;AAAA,EAEhD,SAAS,SAAyB;AAChC,QAAI,CAAC,SAAS,GAAI,OAAM,IAAI,MAAM,mCAAmC;AACrE,QAAI,KAAK,SAAS,IAAI,QAAQ,EAAE,GAAG;AACjC,UAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,YAAI,CAAC,KAAK,uCAAuC;AAC/C,kBAAQ,MAAM,gEAAgE;AAC9E,eAAK,wCAAwC;AAAA,QAC/C;AACA,aAAK,SAAS,IAAI,QAAQ,IAAI,OAAO;AACrC;AAAA,MACF;AACA,YAAM,IAAI,MAAM,yCAAyC,QAAQ,EAAE,EAAE;AAAA,IACvE;AACA,SAAK,SAAS,IAAI,QAAQ,IAAI,OAAO;AAAA,EACvC;AAAA,EAEA,WAAW,IAAY;AACrB,SAAK,SAAS,OAAO,EAAE;AAAA,EACzB;AAAA,EAEA,IAAyC,IAAoD;AAC3F,WAAQ,KAAK,SAAS,IAAI,EAAE,KAAqD;AAAA,EACnF;AAAA,EAEA,IAAI,IAAqB;AACvB,WAAO,KAAK,SAAS,IAAI,EAAE;AAAA,EAC7B;AAAA;AAAA;AAAA;AAAA,EAKA,OAAiB;AACf,WAAO,MAAM,KAAK,KAAK,SAAS,KAAK,CAAC;AAAA,EACxC;AAAA,EAEA,QAAQ;AACN,SAAK,SAAS,MAAM;AACpB,SAAK,wCAAwC;AAAA,EAC/C;AACF;AAEO,MAAM,kBAAkB,IAAI,gBAAgB;AAE5C,SAAS,gBAAgB,SAAyB;AACvD,kBAAgB,SAAS,OAAO;AAClC;AAEO,SAAS,kBAAkB,IAAY;AAC5C,kBAAgB,WAAW,EAAE;AAC/B;",
   "names": []
 }

package/dist/lib/version.js

@@ -1,4 +1,4 @@
-const APP_VERSION = "0.5.1-develop.2699.f8b50c8046";
+const APP_VERSION = "0.5.1-develop.2709.b6bdd776ac";
 const appVersion = APP_VERSION;
 export {
   APP_VERSION,

package/dist/lib/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/lib/version.ts"],
-  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.5.1-develop.2699.f8b50c8046'\nexport const appVersion = APP_VERSION\n"],
+  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.5.1-develop.2709.b6bdd776ac'\nexport const appVersion = APP_VERSION\n"],
   "mappings": "AACO,MAAM,cAAc;AACpB,MAAM,aAAa;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/shared",
-  "version": "0.5.1-develop.2699.f8b50c8046",
+  "version": "0.5.1-develop.2709.b6bdd776ac",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -89,7 +89,12 @@
     }
   },
   "dependencies": {
+    "@mikro-orm/core": "^7.0.10",
+    "@mikro-orm/decorators": "^7.0.10",
+    "@mikro-orm/postgresql": "^7.0.10",
+    "dotenv": "^17.4.2",
     "rate-limiter-flexible": "^11.0.1",
+    "reflect-metadata": "^0.2.2",
     "sanitize-html": "^2.17.2"
   },
   "devDependencies": {

package/src/lib/bootstrap/__tests__/generatedCacheRecovery.test.ts

@@ -0,0 +1,90 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+
+import {
+  ensureMikroOrmV7GeneratedCacheCompatibility,
+  recoverMikroOrmV7GeneratedCacheFromImportError,
+  shouldRecoverMikroOrmV7GeneratedCache,
+} from '../generatedCacheRecovery'
+
+function createAppRoot(tempDir: string): { appRoot: string; generatedDir: string } {
+  const appRoot = path.join(tempDir, 'apps', 'mercato')
+  const generatedDir = path.join(appRoot, '.mercato', 'generated')
+  fs.mkdirSync(generatedDir, { recursive: true })
+  return { appRoot, generatedDir }
+}
+
+describe('generatedCacheRecovery', () => {
+  let tempDir: string
+
+  beforeEach(() => {
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'open-mercato-generated-cache-recovery-'))
+  })
+
+  afterEach(() => {
+    fs.rmSync(tempDir, { recursive: true, force: true })
+  })
+
+  it('removes stale generated .mjs bundles and writes a marker file', () => {
+    const { appRoot, generatedDir } = createAppRoot(tempDir)
+    const stalePath = path.join(generatedDir, 'entities.generated.mjs')
+    const companionPath = path.join(generatedDir, 'modules.cli.generated.mjs')
+    const warnings: string[] = []
+
+    fs.writeFileSync(stalePath, 'import { Entity, PrimaryKey, Property } from "@mikro-orm/core";\n')
+    fs.writeFileSync(companionPath, 'export const modules = []\n')
+
+    const result = ensureMikroOrmV7GeneratedCacheCompatibility(appRoot, {
+      logger: { warn: (message) => warnings.push(message) },
+    })
+
+    expect(result.applied).toBe(true)
+    expect(fs.existsSync(stalePath)).toBe(false)
+    expect(fs.existsSync(companionPath)).toBe(false)
+    expect(result.markerPath).not.toBeNull()
+    expect(result.deletedFiles).toHaveLength(2)
+    expect(result.deletedFiles).toEqual(expect.arrayContaining([companionPath, stalePath]))
+    expect(fs.existsSync(result.markerPath!)).toBe(true)
+    expect(warnings.some((message) => message.includes('MikroORM to version 7'))).toBe(true)
+  })
+
+  it('does nothing when the generated cache is already compatible', () => {
+    const { appRoot, generatedDir } = createAppRoot(tempDir)
+    const cleanPath = path.join(generatedDir, 'entities.generated.mjs')
+
+    fs.writeFileSync(cleanPath, 'import { Entity } from "@mikro-orm/decorators/legacy";\n')
+
+    const result = ensureMikroOrmV7GeneratedCacheCompatibility(appRoot)
+
+    expect(result.applied).toBe(false)
+    expect(result.deletedFiles).toEqual([])
+    expect(result.markerPath).toBeNull()
+    expect(fs.existsSync(cleanPath)).toBe(true)
+  })
+
+  it('retries recovery when the import error matches the MikroORM decorator export failure', () => {
+    const { appRoot, generatedDir } = createAppRoot(tempDir)
+    const stalePath = path.join(generatedDir, 'entities.generated.mjs')
+
+    fs.writeFileSync(stalePath, 'import { Entity, PrimaryKey, Property } from "@mikro-orm/core";\n')
+
+    const result = recoverMikroOrmV7GeneratedCacheFromImportError(
+      appRoot,
+      new SyntaxError("The requested module '@mikro-orm/core' does not provide an export named 'Entity'"),
+      { logger: { warn: () => undefined } },
+    )
+
+    expect(result.applied).toBe(true)
+    expect(fs.existsSync(stalePath)).toBe(false)
+  })
+
+  it('recognizes the MikroORM v7 decorator export error signature', () => {
+    expect(
+      shouldRecoverMikroOrmV7GeneratedCache(
+        new Error("The requested module '@mikro-orm/core' does not provide an export named 'Entity'"),
+      ),
+    ).toBe(true)
+    expect(shouldRecoverMikroOrmV7GeneratedCache(new Error('Some other bootstrap error'))).toBe(false)
+  })
+})

package/src/lib/bootstrap/dynamicLoader.ts

@@ -1,6 +1,10 @@
 import type { BootstrapData } from './types'
 import { findAppRoot, type AppRoot } from './appResolver'
 import { registerEntityIds } from '../encryption/entityIds'
+import {
+  ensureMikroOrmV7GeneratedCacheCompatibility,
+  recoverMikroOrmV7GeneratedCacheFromImportError,
+} from './generatedCacheRecovery'
 import path from 'node:path'
 import fs from 'node:fs'
 import { pathToFileURL } from 'node:url'
@@ -10,8 +14,9 @@ import { pathToFileURL } from 'node:url'
  * This bundles the file and all its dependencies, handling JSON imports properly.
  * The compiled file is written next to the source file with a .mjs extension.
  */
-async function compileAndImport(tsPath: string): Promise<Record<string, unknown>> {
+async function compileAndImport(tsPath: string, allowRecovery: boolean = true): Promise<Record<string, unknown>> {
   const jsPath = tsPath.replace(/\.ts$/, '.mjs')
+  const appRoot = path.dirname(path.dirname(path.dirname(tsPath)))
 
   // Check if we need to recompile (source newer than compiled)
   const tsExists = fs.existsSync(tsPath)
@@ -28,9 +33,6 @@ async function compileAndImport(tsPath: string): Promise<Record<string, unknown>
     // Dynamically import esbuild only when needed
     const esbuild = await import('esbuild')
 
-    // The app root is 2 levels up from .mercato/generated/
-    const appRoot = path.dirname(path.dirname(path.dirname(tsPath)))
-
     // Plugin to resolve @/ alias to app root (works for @app modules)
     const aliasPlugin: import('esbuild').Plugin = {
       name: 'alias-resolver',
@@ -87,8 +89,21 @@ async function compileAndImport(tsPath: string): Promise<Record<string, unknown>
   }
 
   // Import the compiled JavaScript
-  const fileUrl = pathToFileURL(jsPath).href
-  return import(fileUrl)
+  try {
+    const fileUrl = `${pathToFileURL(jsPath).href}?mtime=${fs.statSync(jsPath).mtimeMs}`
+    return import(fileUrl)
+  } catch (error) {
+    if (!allowRecovery) {
+      throw error
+    }
+
+    const recovered = recoverMikroOrmV7GeneratedCacheFromImportError(appRoot, error)
+    if (!recovered.applied) {
+      throw error
+    }
+
+    return compileAndImport(tsPath, false)
+  }
 }
 
 
@@ -124,6 +139,8 @@ export async function loadBootstrapData(appRoot?: string): Promise<BootstrapData
 
   const { generatedDir } = resolved
 
+  ensureMikroOrmV7GeneratedCacheCompatibility(resolved.appDir)
+
   // IMPORTANT: Load entity IDs FIRST and register them before loading modules.
   // This is because modules (e.g., ce.ts files) use E.xxx.xxx at module scope,
   // and they need entity IDs to be available when they're imported.

package/src/lib/bootstrap/generatedCacheRecovery.ts

@@ -0,0 +1,174 @@
+import fs from 'node:fs'
+import path from 'node:path'
+
+const DECORATOR_EXPORT_NAMES = [
+  'Entity',
+  'PrimaryKey',
+  'Property',
+  'ManyToOne',
+  'OneToMany',
+  'OneToOne',
+  'ManyToMany',
+  'Enum',
+  'Index',
+  'Unique',
+  'Embeddable',
+  'Embedded',
+  'Formula',
+] as const
+
+const RECOVERY_VERSION = 'mikro-orm-v7-generated-cache-recovery-v1'
+const RECOVERY_MARKER_FILE = '.mikro-orm-v7-cache-recovery.json'
+const GENERATED_DIR_SEGMENTS = ['.mercato', 'generated'] as const
+
+const staleDecoratorImportPattern = new RegExp(
+  String.raw`import\s*\{[^}]*\b(?:${DECORATOR_EXPORT_NAMES.join('|')})\b[^}]*\}\s*from\s*['"]@mikro-orm/core['"]`,
+  'm',
+)
+
+const decoratorExportErrorPattern = /@mikro-orm\/core' does not provide an export named '(?:Entity|PrimaryKey|Property|ManyToOne|OneToMany|OneToOne|ManyToMany|Enum|Index|Unique|Embeddable|Embedded|Formula)'/
+
+type RecoveryLogger = {
+  warn: (message: string) => void
+}
+
+type RecoveryReason = 'stale-generated-cache-scan' | 'runtime-import-error'
+
+type RecoveryMarker = {
+  version: string
+  reason: RecoveryReason
+  createdAt: string
+  deletedFiles: string[]
+}
+
+export type GeneratedCacheRecoveryResult = {
+  applied: boolean
+  deletedFiles: string[]
+  markerPath: string | null
+}
+
+function getGeneratedDir(appRoot: string): string {
+  return path.join(appRoot, ...GENERATED_DIR_SEGMENTS)
+}
+
+function getRecoveryMarkerPath(appRoot: string): string {
+  return path.join(getGeneratedDir(appRoot), RECOVERY_MARKER_FILE)
+}
+
+function walkFiles(dirPath: string): string[] {
+  if (!fs.existsSync(dirPath)) return []
+
+  const entries = fs.readdirSync(dirPath, { withFileTypes: true })
+  const files: string[] = []
+  for (const entry of entries) {
+    const absolutePath = path.join(dirPath, entry.name)
+    if (entry.isDirectory()) {
+      files.push(...walkFiles(absolutePath))
+      continue
+    }
+    if (entry.isFile()) {
+      files.push(absolutePath)
+    }
+  }
+  return files
+}
+
+function listGeneratedCacheFiles(appRoot: string): string[] {
+  return walkFiles(getGeneratedDir(appRoot))
+    .filter((filePath) => filePath.endsWith('.mjs'))
+    .sort()
+}
+
+function findStaleGeneratedCacheFiles(appRoot: string): string[] {
+  const generatedFiles = listGeneratedCacheFiles(appRoot)
+  return generatedFiles.filter((filePath) => {
+    const source = fs.readFileSync(filePath, 'utf8')
+    return staleDecoratorImportPattern.test(source)
+  })
+}
+
+function writeRecoveryMarker(appRoot: string, marker: RecoveryMarker): string {
+  const markerPath = getRecoveryMarkerPath(appRoot)
+  fs.writeFileSync(markerPath, JSON.stringify(marker, null, 2))
+  return markerPath
+}
+
+function logRecoveryMessage(logger: RecoveryLogger, reason: RecoveryReason): void {
+  const header =
+    reason === 'runtime-import-error'
+      ? '⚠️  Open Mercato detected a stale generated cache while bootstrapping the app.'
+      : '⚠️  Open Mercato detected stale generated cache from the MikroORM v7 migration.'
+
+  logger.warn('')
+  logger.warn(header)
+  logger.warn('📘 Open Mercato migrated MikroORM to version 7. Please review UPGRADE_NOTES.md and the `migrate-mikro-orm` skill if your code still imports decorators from `@mikro-orm/core`.')
+  logger.warn('🧹 Cleaning generated compilation cache and recompiling generated code now...')
+  logger.warn('')
+}
+
+function deleteGeneratedCacheFiles(filePaths: string[]): string[] {
+  const deletedFiles: string[] = []
+  for (const filePath of filePaths) {
+    if (!fs.existsSync(filePath)) continue
+    fs.rmSync(filePath, { force: true })
+    deletedFiles.push(filePath)
+  }
+  return deletedFiles
+}
+
+function applyGeneratedCacheRecovery(
+  appRoot: string,
+  staleFiles: string[],
+  reason: RecoveryReason,
+  logger: RecoveryLogger,
+): GeneratedCacheRecoveryResult {
+  if (staleFiles.length === 0) {
+    return { applied: false, deletedFiles: [], markerPath: null }
+  }
+
+  logRecoveryMessage(logger, reason)
+
+  const generatedCacheFiles = listGeneratedCacheFiles(appRoot)
+  const deletedFiles = deleteGeneratedCacheFiles(generatedCacheFiles)
+  const markerPath = writeRecoveryMarker(appRoot, {
+    version: RECOVERY_VERSION,
+    reason,
+    createdAt: new Date().toISOString(),
+    deletedFiles,
+  })
+
+  return {
+    applied: true,
+    deletedFiles,
+    markerPath,
+  }
+}
+
+export function shouldRecoverMikroOrmV7GeneratedCache(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : String(error)
+  return decoratorExportErrorPattern.test(message)
+}
+
+export function ensureMikroOrmV7GeneratedCacheCompatibility(
+  appRoot: string,
+  options: { logger?: RecoveryLogger } = {},
+): GeneratedCacheRecoveryResult {
+  const logger = options.logger ?? console
+  const staleFiles = findStaleGeneratedCacheFiles(appRoot)
+  return applyGeneratedCacheRecovery(appRoot, staleFiles, 'stale-generated-cache-scan', logger)
+}
+
+export function recoverMikroOrmV7GeneratedCacheFromImportError(
+  appRoot: string,
+  error: unknown,
+  options: { logger?: RecoveryLogger } = {},
+): GeneratedCacheRecoveryResult {
+  if (!shouldRecoverMikroOrmV7GeneratedCache(error)) {
+    return { applied: false, deletedFiles: [], markerPath: null }
+  }
+
+  const logger = options.logger ?? console
+  const staleFiles = findStaleGeneratedCacheFiles(appRoot)
+  return applyGeneratedCacheRecovery(appRoot, staleFiles, 'runtime-import-error', logger)
+}
+

package/src/lib/commands/__tests__/registry.test.ts

@@ -0,0 +1,47 @@
+import { commandRegistry, registerCommand } from '@open-mercato/shared/lib/commands'
+
+describe('command registry registration', () => {
+  const originalNodeEnv = process.env.NODE_ENV
+
+  afterEach(() => {
+    commandRegistry.clear()
+    process.env.NODE_ENV = originalNodeEnv
+    jest.restoreAllMocks()
+  })
+
+  it('throws on duplicate command ids outside development', () => {
+    process.env.NODE_ENV = 'test'
+
+    registerCommand({
+      id: 'test.command.duplicate',
+      execute: jest.fn(),
+    })
+
+    expect(() =>
+      registerCommand({
+        id: 'test.command.duplicate',
+        execute: jest.fn(),
+      })
+    ).toThrow('Duplicate command registration for id test.command.duplicate')
+  })
+
+  it('overwrites duplicate command ids in development to tolerate HMR re-evaluation', () => {
+    process.env.NODE_ENV = 'development'
+    const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {})
+    const firstExecute = jest.fn(async () => 'first')
+    const secondExecute = jest.fn(async () => 'second')
+
+    registerCommand({
+      id: 'test.command.hmr',
+      execute: firstExecute,
+    })
+
+    registerCommand({
+      id: 'test.command.hmr',
+      execute: secondExecute,
+    })
+
+    expect(commandRegistry.get('test.command.hmr')?.execute).toBe(secondExecute)
+    expect(debugSpy).toHaveBeenCalledWith('[Bootstrap] Commands re-registered (this may occur during HMR)')
+  })
+})

package/src/lib/commands/registry.ts

@@ -2,10 +2,19 @@ import type { CommandHandler } from './types'
 
 class CommandRegistry {
   private handlers = new Map<string, CommandHandler>()
+  private didWarnAboutDevelopmentReregistration = false
 
   register(handler: CommandHandler) {
     if (!handler?.id) throw new Error('Command handler must define an id')
     if (this.handlers.has(handler.id)) {
+      if (process.env.NODE_ENV === 'development') {
+        if (!this.didWarnAboutDevelopmentReregistration) {
+          console.debug('[Bootstrap] Commands re-registered (this may occur during HMR)')
+          this.didWarnAboutDevelopmentReregistration = true
+        }
+        this.handlers.set(handler.id, handler)
+        return
+      }
       throw new Error(`Duplicate command registration for id ${handler.id}`)
     }
     this.handlers.set(handler.id, handler)
@@ -32,6 +41,7 @@ class CommandRegistry {
 
   clear() {
     this.handlers.clear()
+    this.didWarnAboutDevelopmentReregistration = false
   }
 }