@open-mercato/shared 0.6.3-develop.3857.1.da89d7530c → 0.6.3-develop.3881.1.0b590ac4eb

package/dist/lib/di/container.js

@@ -6,6 +6,57 @@ import { DefaultDataEngine } from "@open-mercato/shared/lib/data/engine";
 import { commandRegistry, CommandBus } from "@open-mercato/shared/lib/commands";
 import { applyDiOverridesToContainer } from "@open-mercato/shared/modules/overrides";
 const GLOBAL_KEY = "__openMercatoDiRegistrars__";
+const BOOTSTRAP_CACHE_KEY = "__openMercatoBootstrapCache__";
+const ENCRYPTION_ENABLED_KEY = "__openMercatoEncryptionEnabledCache__";
+const BOOTSTRAP_CACHE_KEYS = [
+  "cache",
+  "eventBus",
+  "kmsService",
+  "tenantEncryptionService",
+  "rateLimiterService",
+  "searchModuleConfigs",
+  "searchIndexer"
+];
+function isBootstrapCacheEnabled() {
+  const raw = process.env.OM_BOOTSTRAP_CACHE;
+  if (raw === void 0) return false;
+  const normalized = raw.trim().toLowerCase();
+  if (!normalized.length) return false;
+  if (normalized === "0" || normalized === "off" || normalized === "false" || normalized === "no") return false;
+  return true;
+}
+function getBootstrapCache() {
+  if (!isBootstrapCacheEnabled()) return null;
+  const existing = globalThis[BOOTSTRAP_CACHE_KEY];
+  return existing && typeof existing === "object" ? existing : null;
+}
+function setBootstrapCache(entry) {
+  if (!isBootstrapCacheEnabled()) return;
+  globalThis[BOOTSTRAP_CACHE_KEY] = entry;
+}
+function harvestBootstrapCache(container) {
+  const entry = {};
+  for (const key of BOOTSTRAP_CACHE_KEYS) {
+    try {
+      const value = container.resolve(key);
+      if (value !== void 0 && value !== null) entry[key] = value;
+    } catch {
+    }
+  }
+  return entry;
+}
+function getCachedEncryptionEnabled(service) {
+  if (!service || typeof service.isEnabled !== "function") return false;
+  const cached = globalThis[ENCRYPTION_ENABLED_KEY];
+  if (typeof cached === "boolean") return cached;
+  try {
+    const result = !!service.isEnabled();
+    globalThis[ENCRYPTION_ENABLED_KEY] = result;
+    return result;
+  } catch {
+    return null;
+  }
+}
 function getGlobalRegistrars() {
   return globalThis[GLOBAL_KEY] ?? null;
 }
@@ -18,6 +69,8 @@ function registerDiRegistrars(registrars) {
     console.debug("[Bootstrap] DI registrars re-registered (this may occur during HMR)");
   }
   setGlobalRegistrars(registrars);
+  globalThis[BOOTSTRAP_CACHE_KEY] = null;
+  globalThis[ENCRYPTION_ENABLED_KEY] = void 0;
 }
 function getDiRegistrars() {
   const registrars = getGlobalRegistrars();
@@ -26,6 +79,10 @@ function getDiRegistrars() {
   }
   return registrars;
 }
+function resetBootstrapCache() {
+  globalThis[BOOTSTRAP_CACHE_KEY] = null;
+  globalThis[ENCRYPTION_ENABLED_KEY] = void 0;
+}
 function isAwilixResolver(value) {
   return Boolean(value && typeof value === "object" && typeof value.resolve === "function");
 }
@@ -62,15 +119,25 @@ async function createRequestContainer() {
     } catch {
     }
   }
-  try {
-    const { bootstrap } = await import("@open-mercato/core/bootstrap");
-    if (bootstrap && typeof bootstrap === "function") {
-      const alreadyBootstrapped = !!container.registrations?.eventBus;
-      if (!alreadyBootstrapped) {
-        await bootstrap(container);
+  const alreadyBootstrappedOnThisContainer = !!container.registrations?.eventBus;
+  if (!alreadyBootstrappedOnThisContainer) {
+    const cached = getBootstrapCache();
+    if (cached) {
+      const replay = {};
+      for (const [key, value] of Object.entries(cached)) {
+        if (value !== void 0 && value !== null) replay[key] = asValue(value);
+      }
+      if (Object.keys(replay).length > 0) container.register(replay);
+    } else {
+      try {
+        const { bootstrap } = await import("@open-mercato/core/bootstrap");
+        if (bootstrap && typeof bootstrap === "function") {
+          await bootstrap(container);
+          setBootstrapCache(harvestBootstrapCache(container));
+        }
+      } catch {
       }
     }
-  } catch {
   }
   try {
     const appDi = await import("@/di");
@@ -90,7 +157,7 @@ async function createRequestContainer() {
   try {
     const emForEnc = container.resolve("em");
     const tenantEncryptionService = container.hasRegistration("tenantEncryptionService") ? container.resolve("tenantEncryptionService") : null;
-    if (emForEnc && tenantEncryptionService?.isEnabled?.()) {
+    if (emForEnc && tenantEncryptionService && getCachedEncryptionEnabled(tenantEncryptionService) === true) {
       const { registerTenantEncryptionSubscriber } = await import("@open-mercato/shared/lib/encryption/subscriber");
       registerTenantEncryptionSubscriber(emForEnc, tenantEncryptionService);
     }
@@ -105,6 +172,7 @@ try {
 export {
   createRequestContainer,
   getDiRegistrars,
-  registerDiRegistrars
+  registerDiRegistrars,
+  resetBootstrapCache
 };
 //# sourceMappingURL=container.js.map

package/dist/lib/di/container.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/di/container.ts"],
-  "sourcesContent": ["import { createContainer, asValue, AwilixContainer, InjectionMode, type Resolver } from 'awilix'\nimport { RequestContext } from '@mikro-orm/core'\nimport { getOrm } from '@open-mercato/shared/lib/db/mikro'\nimport { EntityManager } from '@mikro-orm/postgresql'\nimport { BasicQueryEngine } from '@open-mercato/shared/lib/query/engine'\nimport { DefaultDataEngine } from '@open-mercato/shared/lib/data/engine'\nimport { commandRegistry, CommandBus } from '@open-mercato/shared/lib/commands'\nimport { applyDiOverridesToContainer } from '@open-mercato/shared/modules/overrides'\n\ntype DynamicCradle = Record<string, any>\n\nexport type AppContainer = AwilixContainer<DynamicCradle>\nexport type DiRegistrar = (container: AppContainer) => void\n\n// Registration pattern for publishable packages\n// Use globalThis to survive tsx/esbuild module duplication issue where the same\n// file can be loaded as multiple module instances when mixing dynamic and static imports\nconst GLOBAL_KEY = '__openMercatoDiRegistrars__'\n\nfunction getGlobalRegistrars(): DiRegistrar[] | null {\n  return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalRegistrars(registrars: DiRegistrar[]): void {\n  (globalThis as any)[GLOBAL_KEY] = registrars\n}\n\nexport function registerDiRegistrars(registrars: DiRegistrar[]) {\n  const existing = getGlobalRegistrars()\n  if (existing !== null && process.env.NODE_ENV === 'development') {\n    console.debug('[Bootstrap] DI registrars re-registered (this may occur during HMR)')\n  }\n  setGlobalRegistrars(registrars)\n}\n\nexport function getDiRegistrars(): DiRegistrar[] {\n  const registrars = getGlobalRegistrars()\n  if (!registrars) {\n    throw new Error('[Bootstrap] DI registrars not registered. Call registerDiRegistrars() at bootstrap.')\n  }\n  return registrars\n}\n\nfunction isAwilixResolver(value: unknown): value is Resolver<unknown> {\n  return Boolean(value && typeof value === 'object' && typeof (value as { resolve?: unknown }).resolve === 'function')\n}\n\nfunction toAwilixRegistrations(registrations: Record<string, unknown>): Record<string, Resolver<any>> {\n  return Object.fromEntries(\n    Object.entries(registrations).map(([key, value]) => [\n      key,\n      isAwilixResolver(value) ? value : asValue(value),\n    ]),\n  )\n}\n\nexport async function createRequestContainer(): Promise<AppContainer> {\n  const diRegistrars = getDiRegistrars()\n  const orm = await getOrm()\n  // Use a fresh event manager so request-level subscribers (e.g., encryption) don't pile up globally\n  const baseEm = (RequestContext.getEntityManager() as any) ?? orm.em\n  const em = baseEm.fork({ clear: true, freshEventManager: true, useContext: true }) as unknown as EntityManager\n  const container = createContainer<DynamicCradle>({ injectionMode: InjectionMode.CLASSIC })\n  // Core registrations\n  container.register({\n    em: asValue(em),\n    queryEngine: asValue(new BasicQueryEngine(em, undefined, () => {\n      try { return container.resolve('tenantEncryptionService') as any } catch { return null }\n    })),\n    dataEngine: asValue(new DefaultDataEngine(em, container as any)),\n    commandRegistry: asValue(commandRegistry),\n    commandBus: asValue(new CommandBus()),\n  })\n  // Allow modules to override/extend\n  for (const reg of diRegistrars) {\n    try { reg?.(container) } catch {}\n  }\n  // Core bootstrap (cache, event bus, encryption subscriber/KMS, module subscribers)\n  try {\n    const { bootstrap } = await import('@open-mercato/core/bootstrap') as any\n    if (bootstrap && typeof bootstrap === 'function') {\n      // Avoid double bootstrap if caller already wired it\n      const alreadyBootstrapped = !!container.registrations?.eventBus\n      if (!alreadyBootstrapped) {\n        await bootstrap(container)\n      }\n    }\n  } catch { /* optional */ }\n  // App-level DI override (last chance)\n  // This import path resolves only in the app context, not in packages\n  try {\n    // @ts-ignore - @/di only exists in app context, not in packages\n    const appDi = await import('@/di') as any\n    if (appDi?.register) {\n      try {\n        const maybe = appDi.register(container)\n        if (maybe && typeof maybe.then === 'function') await maybe\n      } catch {}\n    }\n  } catch {}\n  applyDiOverridesToContainer({\n    register: (registrations) => container.register(toAwilixRegistrations(registrations)),\n    unregister: (key) => container.register({ [key]: asValue(undefined) }),\n  })\n  // Ensure tenant encryption subscriber is always registered on the fresh request-scoped EM\n  try {\n    const emForEnc = container.resolve('em') as any\n    const tenantEncryptionService = container.hasRegistration('tenantEncryptionService')\n      ? (container.resolve('tenantEncryptionService') as any)\n      : null\n    if (emForEnc && tenantEncryptionService?.isEnabled?.()) {\n      const { registerTenantEncryptionSubscriber } = await import('@open-mercato/shared/lib/encryption/subscriber')\n      registerTenantEncryptionSubscriber(emForEnc, tenantEncryptionService)\n    }\n  } catch {\n    // best-effort; do not block container creation\n  }\n  return container\n}\ntry {\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  require('server-only')\n} catch {\n  // allow CLI/generator usage where Next server-only is not present\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { createContainer, asValue, AwilixContainer, InjectionMode, type Resolver } from 'awilix'\nimport { RequestContext } from '@mikro-orm/core'\nimport { getOrm } from '@open-mercato/shared/lib/db/mikro'\nimport { EntityManager } from '@mikro-orm/postgresql'\nimport { BasicQueryEngine } from '@open-mercato/shared/lib/query/engine'\nimport { DefaultDataEngine } from '@open-mercato/shared/lib/data/engine'\nimport { commandRegistry, CommandBus } from '@open-mercato/shared/lib/commands'\nimport { applyDiOverridesToContainer } from '@open-mercato/shared/modules/overrides'\n\ntype DynamicCradle = Record<string, any>\n\nexport type AppContainer = AwilixContainer<DynamicCradle>\nexport type DiRegistrar = (container: AppContainer) => void\n\n// Registration pattern for publishable packages\n// Use globalThis to survive tsx/esbuild module duplication issue where the same\n// file can be loaded as multiple module instances when mixing dynamic and static imports\nconst GLOBAL_KEY = '__openMercatoDiRegistrars__'\n// Phase 5 \u2014 process-scoped bootstrap cache. The cache/event-bus/encryption\n// services bootstrap() creates are inherently process-scoped (they hold\n// state across requests). Caching them on globalThis after the first\n// successful bootstrap call lets every subsequent request skip the\n// `await bootstrap(container)` body and just re-register the cached\n// instances. Same globalThis pattern as registerDiRegistrars so HMR\n// keeps working.\nconst BOOTSTRAP_CACHE_KEY = '__openMercatoBootstrapCache__'\nconst ENCRYPTION_ENABLED_KEY = '__openMercatoEncryptionEnabledCache__'\n\nconst BOOTSTRAP_CACHE_KEYS = [\n  'cache',\n  'eventBus',\n  'kmsService',\n  'tenantEncryptionService',\n  'rateLimiterService',\n  'searchModuleConfigs',\n  'searchIndexer',\n] as const\n\ntype BootstrapCacheEntry = Partial<Record<(typeof BOOTSTRAP_CACHE_KEYS)[number], unknown>>\n\n// Phase 5 is opt-in. Some bootstrap services close over per-request state\n// (e.g. tenantEncryptionService captures the first request's `em.fork`, the\n// event-bus's resolver closes over the first container) so naively replaying\n// them on later requests yields stale references \u2014 observed as a 500 from\n// CRUD list endpoints in `next start`. Default OFF preserves develop's\n// per-request bootstrap. Set `OM_BOOTSTRAP_CACHE=1` to opt in once each\n// cached service is verified safe for cross-request reuse.\nfunction isBootstrapCacheEnabled(): boolean {\n  const raw = process.env.OM_BOOTSTRAP_CACHE\n  if (raw === undefined) return false\n  const normalized = raw.trim().toLowerCase()\n  if (!normalized.length) return false\n  if (normalized === '0' || normalized === 'off' || normalized === 'false' || normalized === 'no') return false\n  return true\n}\n\nfunction getBootstrapCache(): BootstrapCacheEntry | null {\n  if (!isBootstrapCacheEnabled()) return null\n  const existing = (globalThis as any)[BOOTSTRAP_CACHE_KEY]\n  return existing && typeof existing === 'object' ? (existing as BootstrapCacheEntry) : null\n}\n\nfunction setBootstrapCache(entry: BootstrapCacheEntry): void {\n  if (!isBootstrapCacheEnabled()) return\n  ;(globalThis as any)[BOOTSTRAP_CACHE_KEY] = entry\n}\n\nfunction harvestBootstrapCache(container: AwilixContainer): BootstrapCacheEntry {\n  const entry: BootstrapCacheEntry = {}\n  for (const key of BOOTSTRAP_CACHE_KEYS) {\n    try {\n      const value: unknown = container.resolve(key as never)\n      if (value !== undefined && value !== null) entry[key] = value\n    } catch {\n      // not registered \u2014 skip\n    }\n  }\n  return entry\n}\n\ntype EncryptionEnabledProbe = { isEnabled?: () => boolean } | null | undefined\n\nfunction getCachedEncryptionEnabled(service: EncryptionEnabledProbe): boolean | null {\n  if (!service || typeof service.isEnabled !== 'function') return false\n  const cached = (globalThis as Record<string, unknown>)[ENCRYPTION_ENABLED_KEY]\n  if (typeof cached === 'boolean') return cached\n  try {\n    const result = !!service.isEnabled()\n    ;(globalThis as Record<string, unknown>)[ENCRYPTION_ENABLED_KEY] = result\n    return result\n  } catch {\n    return null\n  }\n}\n\nfunction getGlobalRegistrars(): DiRegistrar[] | null {\n  return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalRegistrars(registrars: DiRegistrar[]): void {\n  (globalThis as any)[GLOBAL_KEY] = registrars\n}\n\nexport function registerDiRegistrars(registrars: DiRegistrar[]) {\n  const existing = getGlobalRegistrars()\n  if (existing !== null && process.env.NODE_ENV === 'development') {\n    console.debug('[Bootstrap] DI registrars re-registered (this may occur during HMR)')\n  }\n  setGlobalRegistrars(registrars)\n  // Force re-bootstrap on HMR \u2014 module subscribers may have changed.\n  ;(globalThis as any)[BOOTSTRAP_CACHE_KEY] = null\n  ;(globalThis as any)[ENCRYPTION_ENABLED_KEY] = undefined\n}\n\nexport function getDiRegistrars(): DiRegistrar[] {\n  const registrars = getGlobalRegistrars()\n  if (!registrars) {\n    throw new Error('[Bootstrap] DI registrars not registered. Call registerDiRegistrars() at bootstrap.')\n  }\n  return registrars\n}\n\n/** Test-only helper to drop the process-scoped bootstrap cache. */\nexport function resetBootstrapCache(): void {\n  (globalThis as any)[BOOTSTRAP_CACHE_KEY] = null\n  ;(globalThis as any)[ENCRYPTION_ENABLED_KEY] = undefined\n}\n\nfunction isAwilixResolver(value: unknown): value is Resolver<unknown> {\n  return Boolean(value && typeof value === 'object' && typeof (value as { resolve?: unknown }).resolve === 'function')\n}\n\nfunction toAwilixRegistrations(registrations: Record<string, unknown>): Record<string, Resolver<any>> {\n  return Object.fromEntries(\n    Object.entries(registrations).map(([key, value]) => [\n      key,\n      isAwilixResolver(value) ? value : asValue(value),\n    ]),\n  )\n}\n\nexport async function createRequestContainer(): Promise<AppContainer> {\n  const diRegistrars = getDiRegistrars()\n  const orm = await getOrm()\n  // Use a fresh event manager so request-level subscribers (e.g., encryption) don't pile up globally\n  const baseEm = (RequestContext.getEntityManager() as any) ?? orm.em\n  const em = baseEm.fork({ clear: true, freshEventManager: true, useContext: true }) as unknown as EntityManager\n  const container = createContainer<DynamicCradle>({ injectionMode: InjectionMode.CLASSIC })\n  // Core registrations\n  container.register({\n    em: asValue(em),\n    queryEngine: asValue(new BasicQueryEngine(em, undefined, () => {\n      try { return container.resolve('tenantEncryptionService') as any } catch { return null }\n    })),\n    dataEngine: asValue(new DefaultDataEngine(em, container as any)),\n    commandRegistry: asValue(commandRegistry),\n    commandBus: asValue(new CommandBus()),\n  })\n  // Allow modules to override/extend\n  for (const reg of diRegistrars) {\n    try { reg?.(container) } catch {}\n  }\n  // Core bootstrap (cache, event bus, encryption subscriber/KMS, module subscribers)\n  // Phase 5 \u2014 process-scoped once-guard. The first request runs the full\n  // bootstrap() body; later requests re-register the cached services\n  // directly on this request's container without re-importing or\n  // re-initializing anything. HMR clears the cache (see\n  // registerDiRegistrars). Skippable if a caller already wired eventBus.\n  const alreadyBootstrappedOnThisContainer = !!container.registrations?.eventBus\n  if (!alreadyBootstrappedOnThisContainer) {\n    const cached = getBootstrapCache()\n    if (cached) {\n      const replay: Record<string, any> = {}\n      for (const [key, value] of Object.entries(cached)) {\n        if (value !== undefined && value !== null) replay[key] = asValue(value)\n      }\n      if (Object.keys(replay).length > 0) container.register(replay)\n    } else {\n      try {\n        const { bootstrap } = await import('@open-mercato/core/bootstrap') as any\n        if (bootstrap && typeof bootstrap === 'function') {\n          await bootstrap(container)\n          setBootstrapCache(harvestBootstrapCache(container))\n        }\n      } catch { /* optional */ }\n    }\n  }\n  // App-level DI override (last chance)\n  // This import path resolves only in the app context, not in packages\n  try {\n    // @ts-ignore - @/di only exists in app context, not in packages\n    const appDi = await import('@/di') as any\n    if (appDi?.register) {\n      try {\n        const maybe = appDi.register(container)\n        if (maybe && typeof maybe.then === 'function') await maybe\n      } catch {}\n    }\n  } catch {}\n  applyDiOverridesToContainer({\n    register: (registrations) => container.register(toAwilixRegistrations(registrations)),\n    unregister: (key) => container.register({ [key]: asValue(undefined) }),\n  })\n  // Ensure tenant encryption subscriber is always registered on the fresh request-scoped EM\n  // Phase 5 \u2014 cache `tenantEncryptionService.isEnabled()` for the process\n  // lifetime. The result depends only on config that does not change at\n  // runtime, so reading it once skips a config lookup per request.\n  try {\n    const emForEnc = container.resolve('em') as any\n    const tenantEncryptionService = container.hasRegistration('tenantEncryptionService')\n      ? (container.resolve('tenantEncryptionService') as any)\n      : null\n    if (emForEnc && tenantEncryptionService && getCachedEncryptionEnabled(tenantEncryptionService) === true) {\n      const { registerTenantEncryptionSubscriber } = await import('@open-mercato/shared/lib/encryption/subscriber')\n      registerTenantEncryptionSubscriber(emForEnc, tenantEncryptionService)\n    }\n  } catch {\n    // best-effort; do not block container creation\n  }\n  return container\n}\ntry {\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  require('server-only')\n} catch {\n  // allow CLI/generator usage where Next server-only is not present\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/version.js

@@ -1,4 +1,4 @@
-const APP_VERSION = "0.6.3-develop.3857.1.da89d7530c";
+const APP_VERSION = "0.6.3-develop.3881.1.0b590ac4eb";
 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.6.3-develop.3857.1.da89d7530c'\nexport const appVersion = APP_VERSION\n"],
+  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.3-develop.3881.1.0b590ac4eb'\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.6.3-develop.3857.1.da89d7530c",
+  "version": "0.6.3-develop.3881.1.0b590ac4eb",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -92,7 +92,7 @@
     "@mikro-orm/core": "^7.1.1",
     "@mikro-orm/decorators": "^7.1.1",
     "@mikro-orm/postgresql": "^7.1.1",
-    "@open-mercato/cache": "0.6.3-develop.3857.1.da89d7530c",
+    "@open-mercato/cache": "0.6.3-develop.3881.1.0b590ac4eb",
     "dotenv": "^17.4.2",
     "rate-limiter-flexible": "^11.1.0",
     "re2js": "2.8.3",

package/src/lib/crud/__tests__/custom-fields.cache.test.ts

@@ -0,0 +1,142 @@
+import { loadCustomFieldDefinitionIndex } from '@open-mercato/shared/lib/crud/custom-fields'
+
+function buildFakeEm(rows: any[]) {
+  const find = jest.fn(async () => rows.slice())
+  const em = {
+    find,
+  }
+  return { em, find }
+}
+
+function buildMemoryCache() {
+  const store = new Map<string, { value: unknown; tags: string[]; expiresAt: number | null }>()
+  return {
+    store,
+    get: jest.fn(async (key: string) => {
+      const hit = store.get(key)
+      if (!hit) return null
+      if (hit.expiresAt !== null && hit.expiresAt < Date.now()) {
+        store.delete(key)
+        return null
+      }
+      return hit.value
+    }),
+    set: jest.fn(async (key: string, value: unknown, opts?: { ttl?: number; tags?: string[] }) => {
+      const expiresAt = opts?.ttl && opts.ttl > 0 ? Date.now() + opts.ttl : null
+      store.set(key, { value, tags: opts?.tags ?? [], expiresAt })
+    }),
+    deleteByTags: jest.fn(async (tags: string[]) => {
+      let removed = 0
+      for (const [key, entry] of store.entries()) {
+        if (entry.tags.some((tag) => tags.includes(tag))) {
+          store.delete(key)
+          removed += 1
+        }
+      }
+      return removed
+    }),
+  }
+}
+
+const tenantId = 'tenant-1'
+const entityId = 'example.todo'
+
+function fakeDef(key: string, idSuffix: string) {
+  return {
+    id: `00000000-0000-4000-8000-${idSuffix}`,
+    key,
+    entityId,
+    kind: 'text',
+    organizationId: null,
+    tenantId,
+    updatedAt: new Date('2026-05-24T10:00:00.000Z'),
+    configJson: { label: key },
+    isActive: true,
+  }
+}
+
+describe('loadCustomFieldDefinitionIndex caching', () => {
+  const originalTtl = process.env.OM_CF_DEF_CACHE_TTL_MS
+
+  afterEach(() => {
+    if (originalTtl === undefined) delete process.env.OM_CF_DEF_CACHE_TTL_MS
+    else process.env.OM_CF_DEF_CACHE_TTL_MS = originalTtl
+  })
+
+  it('hits the underlying em.find once per (tenant, entities) within the TTL window', async () => {
+    process.env.OM_CF_DEF_CACHE_TTL_MS = '300000'
+    const { em, find } = buildFakeEm([fakeDef('priority', '000000000001')])
+    const cache = buildMemoryCache()
+
+    await loadCustomFieldDefinitionIndex({
+      em: em as any,
+      entityIds: entityId,
+      tenantId,
+      cache,
+    })
+    expect(find).toHaveBeenCalledTimes(1)
+
+    await loadCustomFieldDefinitionIndex({
+      em: em as any,
+      entityIds: entityId,
+      tenantId,
+      cache,
+    })
+    expect(find).toHaveBeenCalledTimes(1)
+  })
+
+  it('falls through to em.find when OM_CF_DEF_CACHE_TTL_MS=0', async () => {
+    process.env.OM_CF_DEF_CACHE_TTL_MS = '0'
+    const { em, find } = buildFakeEm([fakeDef('priority', '000000000002')])
+    const cache = buildMemoryCache()
+
+    await loadCustomFieldDefinitionIndex({ em: em as any, entityIds: entityId, tenantId, cache })
+    await loadCustomFieldDefinitionIndex({ em: em as any, entityIds: entityId, tenantId, cache })
+    expect(find).toHaveBeenCalledTimes(2)
+    expect(cache.set).not.toHaveBeenCalled()
+  })
+
+  it('writes tags that the existing entities:definitions invalidation hits', async () => {
+    process.env.OM_CF_DEF_CACHE_TTL_MS = '300000'
+    const { em } = buildFakeEm([fakeDef('priority', '000000000003')])
+    const cache = buildMemoryCache()
+
+    await loadCustomFieldDefinitionIndex({
+      em: em as any,
+      entityIds: entityId,
+      tenantId,
+      cache,
+    })
+    expect(cache.set).toHaveBeenCalledTimes(1)
+    const writeOpts = cache.set.mock.calls[0]?.[2] as { tags?: string[] } | undefined
+    expect(writeOpts?.tags).toEqual(
+      expect.arrayContaining([
+        `entities:definitions:${tenantId}`,
+        `entities:definitions:${tenantId}:entity:${entityId}`,
+      ]),
+    )
+
+    await cache.deleteByTags([`entities:definitions:${tenantId}:entity:${entityId}`])
+    expect(cache.store.size).toBe(0)
+  })
+
+  it('keys distinguish different entity-id sets', async () => {
+    process.env.OM_CF_DEF_CACHE_TTL_MS = '300000'
+    const { em, find } = buildFakeEm([fakeDef('priority', '000000000004')])
+    const cache = buildMemoryCache()
+
+    await loadCustomFieldDefinitionIndex({ em: em as any, entityIds: entityId, tenantId, cache })
+    await loadCustomFieldDefinitionIndex({ em: em as any, entityIds: 'other:entity', tenantId, cache })
+    expect(find).toHaveBeenCalledTimes(2)
+    expect(cache.store.size).toBe(2)
+  })
+
+  it('per-request micro-cache short-circuits inside one request scope', async () => {
+    process.env.OM_CF_DEF_CACHE_TTL_MS = '0' // disable shared cache so we only see micro-cache effect
+    const { em, find } = buildFakeEm([fakeDef('priority', '000000000005')])
+    const ctx = {}
+    await loadCustomFieldDefinitionIndex({ em: em as any, entityIds: entityId, tenantId, requestScope: ctx })
+    await loadCustomFieldDefinitionIndex({ em: em as any, entityIds: entityId, tenantId, requestScope: ctx })
+    expect(find).toHaveBeenCalledTimes(1)
+  })
+})

package/src/lib/crud/__tests__/log-crud-access.test.ts

@@ -0,0 +1,158 @@
+import { flushPendingCrudAccessLogs, logCrudAccess } from '@open-mercato/shared/lib/crud/factory'
+import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
+
+function makeContainer(service: { log: jest.Mock; logMany?: jest.Mock }) {
+  const registrations = { accessLogService: service }
+  return {
+    registrations,
+    resolve: (key: string) => (key === 'accessLogService' ? service : undefined),
+  } as any
+}
+
+const auth: AuthContext = {
+  sub: '11111111-1111-4111-8111-111111111111',
+  email: 'u@example.com',
+  tenantId: '22222222-2222-4222-8222-222222222222',
+  orgId: '33333333-3333-4333-8333-333333333333',
+} as any
+
+function makeItems(count: number) {
+  return Array.from({ length: count }, (_, idx) => ({
+    id: `00000000-0000-4000-8000-${String(idx).padStart(12, '0')}`,
+    title: `Row ${idx}`,
+  }))
+}
+
+describe('logCrudAccess', () => {
+  const originalBlocking = process.env.OM_CRUD_ACCESS_LOG_BLOCKING
+
+  afterEach(async () => {
+    await flushPendingCrudAccessLogs()
+    if (originalBlocking === undefined) delete process.env.OM_CRUD_ACCESS_LOG_BLOCKING
+    else process.env.OM_CRUD_ACCESS_LOG_BLOCKING = originalBlocking
+  })
+
+  it('prefers logMany() when the service exposes it', async () => {
+    process.env.OM_CRUD_ACCESS_LOG_BLOCKING = '1'
+    const service = {
+      log: jest.fn(async () => {}),
+      logMany: jest.fn(async (_payloads: unknown[]) => {}),
+    }
+    const items = makeItems(50)
+    const result = await logCrudAccess({
+      container: makeContainer(service),
+      auth,
+      items,
+      idField: 'id',
+      resourceKind: 'example.todo',
+    })
+    expect(service.logMany).toHaveBeenCalledTimes(1)
+    const batch = service.logMany.mock.calls[0]?.[0] as Array<Record<string, unknown>>
+    expect(Array.isArray(batch)).toBe(true)
+    expect(batch).toHaveLength(50)
+    expect(service.log).not.toHaveBeenCalled()
+    expect(result.mode).toBe('blocking')
+    expect(result.count).toBe(50)
+  })
+
+  it('falls back to per-row log() when logMany is missing', async () => {
+    process.env.OM_CRUD_ACCESS_LOG_BLOCKING = '1'
+    const service = { log: jest.fn(async () => {}) }
+    const items = makeItems(3)
+    const result = await logCrudAccess({
+      container: makeContainer(service),
+      auth,
+      items,
+      idField: 'id',
+      resourceKind: 'example.todo',
+    })
+    expect(service.log).toHaveBeenCalledTimes(3)
+    // dispatchMode reflects the underlying service shape even when the outer
+    // call blocks — the profiler payload needs to distinguish "batched into
+    // one INSERT" from "fanned out N INSERTs in blocking mode".
+    expect(result.mode).toBe('blocking')
+    expect(result.count).toBe(3)
+  })
+
+  it('does not await writes when OM_CRUD_ACCESS_LOG_BLOCKING is unset', async () => {
+    delete process.env.OM_CRUD_ACCESS_LOG_BLOCKING
+    let resolveLogMany: () => void = () => {}
+    const pendingLogMany = new Promise<void>((resolve) => {
+      resolveLogMany = resolve
+    })
+    const service = {
+      log: jest.fn(async () => {}),
+      logMany: jest.fn(async (_payloads: unknown[]) => {
+        await pendingLogMany
+      }),
+    }
+    const items = makeItems(5)
+    const start = process.hrtime.bigint()
+    const result = await logCrudAccess({
+      container: makeContainer(service),
+      auth,
+      items,
+      idField: 'id',
+      resourceKind: 'example.todo',
+    })
+    const elapsedMs = Number(process.hrtime.bigint() - start) / 1_000_000
+    // The outer logCrudAccess call should return immediately, even though
+    // logMany has not resolved yet. Allow a generous 50 ms ceiling for CI noise.
+    expect(elapsedMs).toBeLessThan(50)
+    expect(service.logMany).toHaveBeenCalledTimes(1)
+    expect(result.mode).toBe('batch')
+    expect(result.count).toBe(5)
+    expect(result.pending).toBeGreaterThan(0)
+    resolveLogMany()
+    await flushPendingCrudAccessLogs()
+  })
+
+  it('flushPendingCrudAccessLogs drains in-flight writes', async () => {
+    delete process.env.OM_CRUD_ACCESS_LOG_BLOCKING
+    let completed = 0
+    const service = {
+      log: jest.fn(async () => {}),
+      logMany: jest.fn(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 5))
+        completed += 1
+      }),
+    }
+    await logCrudAccess({
+      container: makeContainer(service),
+      auth,
+      items: makeItems(2),
+      idField: 'id',
+      resourceKind: 'example.todo',
+    })
+    expect(completed).toBe(0)
+    await flushPendingCrudAccessLogs()
+    expect(completed).toBe(1)
+  })
+
+  it('skips items without a normalized id and dedupes duplicate ids', async () => {
+    process.env.OM_CRUD_ACCESS_LOG_BLOCKING = '1'
+    const service = {
+      log: jest.fn(async () => {}),
+      logMany: jest.fn(async (_payloads: unknown[]) => {}),
+    }
+    const items = [
+      { id: '00000000-0000-4000-8000-000000000001' },
+      { id: '00000000-0000-4000-8000-000000000001' }, // dup
+      { id: '' }, // empty
+      { id: '00000000-0000-4000-8000-000000000002' },
+    ]
+    await logCrudAccess({
+      container: makeContainer(service),
+      auth,
+      items,
+      idField: 'id',
+      resourceKind: 'example.todo',
+    })
+    const batch = service.logMany.mock.calls[0]?.[0] as Array<Record<string, unknown>>
+    expect(batch).toHaveLength(2)
+    expect(batch.map((p) => p.resourceId)).toEqual([
+      '00000000-0000-4000-8000-000000000001',
+      '00000000-0000-4000-8000-000000000002',
+    ])
+  })
+})

package/src/lib/crud/__tests__/user-features-memo.test.ts

@@ -0,0 +1,106 @@
+// Light-weight contract test: the per-request RBAC memo MUST coalesce
+// concurrent + sequential getGrantedFeatures calls for the same ctx into
+// a single rbacService call. This is what saves the 5-15 ms / request the
+// spec attributes to Phase 3.
+
+import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
+import { registerApiInterceptors } from '@open-mercato/shared/lib/crud/interceptor-registry'
+import { z } from 'zod'
+
+const getGrantedFeatures = jest.fn(async () => ['example.view'])
+const rbacService = { getGrantedFeatures }
+const accessLogService = { log: jest.fn(async () => {}), logMany: jest.fn(async () => {}) }
+
+const defaultOrgId = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
+const defaultTenantId = '123e4567-e89b-12d3-a456-426614174000'
+
+const em = {
+  getRepository: () => ({
+    find: async () => [{ id: 'id-1', organizationId: defaultOrgId, tenantId: defaultTenantId }],
+    findOne: async () => null,
+  }),
+}
+
+const queryEngine = {
+  query: jest.fn(async () => ({
+    items: [{ id: 'id-1', organization_id: defaultOrgId, tenant_id: defaultTenantId }],
+    total: 1,
+  })),
+}
+
+jest.mock('@open-mercato/shared/lib/di/container', () => ({
+  createRequestContainer: async () => ({
+    resolve: (key: string) => {
+      if (key === 'em') return em
+      if (key === 'queryEngine') return queryEngine
+      if (key === 'rbacService') return rbacService
+      if (key === 'accessLogService') return accessLogService
+      throw new Error(`unexpected DI key: ${key}`)
+    },
+    registrations: {
+      em: true,
+      queryEngine: true,
+      rbacService: true,
+      accessLogService: true,
+    },
+  }),
+}))
+
+jest.mock('@open-mercato/shared/lib/auth/server', () => ({
+  __esModule: true,
+  getAuthFromCookies: async () => ({
+    sub: '00000000-0000-4000-8000-000000000001',
+    tenantId: defaultTenantId,
+    orgId: defaultOrgId,
+  }),
+  getAuthFromRequest: async () => ({
+    sub: '00000000-0000-4000-8000-000000000001',
+    tenantId: defaultTenantId,
+    orgId: defaultOrgId,
+  }),
+}))
+
+jest.mock('@open-mercato/core/modules/directory/utils/organizationScope', () => ({
+  resolveOrganizationScopeForRequest: async () => ({
+    selectedId: defaultOrgId,
+    filterIds: [defaultOrgId],
+    allowedIds: [defaultOrgId],
+    tenantId: defaultTenantId,
+  }),
+}))
+
+class Todo {}
+
+describe('per-request userFeatures memo', () => {
+  beforeEach(() => {
+    getGrantedFeatures.mockClear()
+    accessLogService.log.mockClear()
+    accessLogService.logMany.mockClear()
+    queryEngine.query.mockClear()
+    registerApiInterceptors([])
+    process.env.OM_CRUD_ACCESS_LOG_BLOCKING = '1'
+  })
+
+  it('calls rbacService.getGrantedFeatures at most once per GET when enrichers are configured', async () => {
+    const route = makeCrudRoute({
+      metadata: { GET: { requireAuth: true } },
+      orm: { entity: Todo, idField: 'id', orgField: 'organizationId', tenantField: 'tenantId', softDeleteField: 'deletedAt' },
+      indexer: { entityType: 'example.todo' },
+      list: {
+        schema: z.object({
+          page: z.coerce.number().default(1),
+          pageSize: z.coerce.number().default(50),
+          sortField: z.string().default('id'),
+          sortDir: z.enum(['asc', 'desc']).default('asc'),
+        }),
+        entityId: 'example.todo',
+        fields: ['id'],
+        buildFilters: () => ({} as any),
+      },
+      enrichers: { entityId: 'example.todo' },
+    })
+    const res = await route.GET(new Request('http://x/api/example/todos?page=1&pageSize=10'))
+    expect(res.status).toBe(200)
+    expect(getGrantedFeatures).toHaveBeenCalledTimes(1)
+  })
+})