@open-mercato/shared 0.6.8-develop.6889.1.af4501ca97 → 0.6.8-develop.6892.1.f179677788

package/dist/lib/modules/registry.js

@@ -1,5 +1,5 @@
 import { applyModuleOverridesToModules } from "@open-mercato/shared/modules/overrides";
-import { invalidateDictionaryCache } from "../i18n/dictionary-cache.js";
+import { invalidateDictionaryCache, invalidateDictionaryCacheLocales } from "../i18n/dictionary-cache.js";
 import { createLogger } from "../logger/index.js";
 const logger = createLogger("shared").child({ component: "modules-registry" });
 const GLOBAL_KEY = "__openMercatoModulesRegistry__";
@@ -24,7 +24,10 @@ function mergeI18nModules(existing, incoming) {
     if (!i18nModule?.translations) return entry;
     return {
       ...entry,
-      translations: i18nModule.translations
+      translations: {
+        ...entry.translations ?? {},
+        ...i18nModule.translations
+      }
     };
   });
   for (const entry of incoming) {
@@ -32,15 +35,38 @@ function mergeI18nModules(existing, incoming) {
   }
   return merged;
 }
+function getTranslationLocales(modules) {
+  const locales = /* @__PURE__ */ new Set();
+  for (const entry of modules) {
+    for (const locale of Object.keys(entry.translations ?? {})) {
+      locales.add(locale);
+    }
+  }
+  return [...locales];
+}
+function preserveExistingTranslations(existing, incoming) {
+  const existingById = new Map(existing.map((entry) => [entry.id, entry]));
+  return incoming.map((entry) => {
+    if (entry.translations) return entry;
+    const translations = existingById.get(entry.id)?.translations;
+    return translations ? { ...entry, translations } : entry;
+  });
+}
 function registerModules(modules) {
   const existing = getGlobalModules();
   if (existing !== null && process.env.NODE_ENV === "development") {
     logger.debug("Modules re-registered (this may occur during HMR)");
   }
   const nextModules = applyModuleOverridesToModules(modules);
-  const shouldMergeI18nOnly = existing !== null && existing.some(hasRuntimeContracts) && isI18nOnlyRegistration(nextModules);
-  setGlobalModules(shouldMergeI18nOnly ? mergeI18nModules(existing, nextModules) : nextModules);
-  invalidateDictionaryCache();
+  const i18nOnlyRegistration = isI18nOnlyRegistration(nextModules);
+  const shouldMergeI18nOnly = existing !== null && i18nOnlyRegistration;
+  const registeredModules = shouldMergeI18nOnly ? mergeI18nModules(existing, nextModules) : preserveExistingTranslations(existing ?? [], nextModules);
+  setGlobalModules(registeredModules);
+  if (i18nOnlyRegistration) {
+    invalidateDictionaryCacheLocales(getTranslationLocales(nextModules));
+  } else {
+    invalidateDictionaryCache();
+  }
 }
 function getModules() {
   const modules = getGlobalModules();

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/modules/registry.ts"],
-  "sourcesContent": ["import type { Module } from '@open-mercato/shared/modules/registry'\nimport { applyModuleOverridesToModules } from '@open-mercato/shared/modules/overrides'\nimport { invalidateDictionaryCache } from '../i18n/dictionary-cache'\nimport { createLogger } from '../logger'\n\nconst logger = createLogger('shared').child({ component: 'modules-registry' })\n\n// Registration pattern for publishable packages.\n// Use globalThis to survive tsx/esbuild module duplication where the same\n// registry.ts file can be loaded as multiple module instances when mixing\n// dynamic and static imports \u2014 for example a standalone integration test\n// bootstraps via the source path while a worker handler resolves it through\n// node_modules/@open-mercato/shared/dist/. Mirrors the same workaround used\n// by `getDiRegistrars()` in `../di/container.ts`.\nconst GLOBAL_KEY = '__openMercatoModulesRegistry__'\n\nfunction getGlobalModules(): Module[] | null {\n  return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalModules(modules: Module[]): void {\n  ;(globalThis as any)[GLOBAL_KEY] = modules\n}\n\nfunction hasRuntimeContracts(entry: Module): boolean {\n  return Object.keys(entry).some((key) => key !== 'id' && key !== 'translations')\n}\n\nfunction isI18nOnlyRegistration(modules: Module[]): boolean {\n  return modules.length > 0 && modules.every((entry) => !hasRuntimeContracts(entry))\n}\n\nfunction mergeI18nModules(existing: Module[], incoming: Module[]): Module[] {\n  const incomingById = new Map(incoming.map((entry) => [entry.id, entry]))\n  const existingIds = new Set(existing.map((entry) => entry.id))\n  const merged = existing.map((entry) => {\n    const i18nModule = incomingById.get(entry.id)\n    if (!i18nModule?.translations) return entry\n    return {\n      ...entry,\n      translations: i18nModule.translations,\n    }\n  })\n\n  for (const entry of incoming) {\n    if (!existingIds.has(entry.id)) merged.push(entry)\n  }\n\n  return merged\n}\n\nexport function registerModules(modules: Module[]) {\n  const existing = getGlobalModules()\n  if (existing !== null && process.env.NODE_ENV === 'development') {\n    logger.debug('Modules re-registered (this may occur during HMR)')\n  }\n  const nextModules = applyModuleOverridesToModules(modules)\n  const shouldMergeI18nOnly = existing !== null\n    && existing.some(hasRuntimeContracts)\n    && isI18nOnlyRegistration(nextModules)\n  setGlobalModules(shouldMergeI18nOnly ? mergeI18nModules(existing, nextModules) : nextModules)\n  invalidateDictionaryCache()\n}\n\nexport function getModules(): Module[] {\n  const modules = getGlobalModules()\n  if (!modules) {\n    throw new Error('[Bootstrap] Modules not registered. Call registerModules() at bootstrap.')\n  }\n  return modules\n}\n\n/**\n * Non-throwing counterpart of `getModules()` for call sites that have a\n * meaningful degraded behavior when bootstrap has not run \u2014 route unit tests\n * exercise a single handler without `registerModules()`, and a hard throw there\n * turns an unrelated assertion into a bootstrap error.\n */\nexport function tryGetModules(): Module[] | null {\n  return getGlobalModules()\n}\n"],
-  "mappings": "AACA,SAAS,qCAAqC;AAC9C,SAAS,iCAAiC;AAC1C,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,QAAQ,EAAE,MAAM,EAAE,WAAW,mBAAmB,CAAC;AAS7E,MAAM,aAAa;AAEnB,SAAS,mBAAoC;AAC3C,SAAQ,WAAmB,UAAU,KAAK;AAC5C;AAEA,SAAS,iBAAiB,SAAyB;AACjD;AAAC,EAAC,WAAmB,UAAU,IAAI;AACrC;AAEA,SAAS,oBAAoB,OAAwB;AACnD,SAAO,OAAO,KAAK,KAAK,EAAE,KAAK,CAAC,QAAQ,QAAQ,QAAQ,QAAQ,cAAc;AAChF;AAEA,SAAS,uBAAuB,SAA4B;AAC1D,SAAO,QAAQ,SAAS,KAAK,QAAQ,MAAM,CAAC,UAAU,CAAC,oBAAoB,KAAK,CAAC;AACnF;AAEA,SAAS,iBAAiB,UAAoB,UAA8B;AAC1E,QAAM,eAAe,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;AACvE,QAAM,cAAc,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC;AAC7D,QAAM,SAAS,SAAS,IAAI,CAAC,UAAU;AACrC,UAAM,aAAa,aAAa,IAAI,MAAM,EAAE;AAC5C,QAAI,CAAC,YAAY,aAAc,QAAO;AACtC,WAAO;AAAA,MACL,GAAG;AAAA,MACH,cAAc,WAAW;AAAA,IAC3B;AAAA,EACF,CAAC;AAED,aAAW,SAAS,UAAU;AAC5B,QAAI,CAAC,YAAY,IAAI,MAAM,EAAE,EAAG,QAAO,KAAK,KAAK;AAAA,EACnD;AAEA,SAAO;AACT;AAEO,SAAS,gBAAgB,SAAmB;AACjD,QAAM,WAAW,iBAAiB;AAClC,MAAI,aAAa,QAAQ,QAAQ,IAAI,aAAa,eAAe;AAC/D,WAAO,MAAM,mDAAmD;AAAA,EAClE;AACA,QAAM,cAAc,8BAA8B,OAAO;AACzD,QAAM,sBAAsB,aAAa,QACpC,SAAS,KAAK,mBAAmB,KACjC,uBAAuB,WAAW;AACvC,mBAAiB,sBAAsB,iBAAiB,UAAU,WAAW,IAAI,WAAW;AAC5F,4BAA0B;AAC5B;AAEO,SAAS,aAAuB;AACrC,QAAM,UAAU,iBAAiB;AACjC,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,0EAA0E;AAAA,EAC5F;AACA,SAAO;AACT;AAQO,SAAS,gBAAiC;AAC/C,SAAO,iBAAiB;AAC1B;",
+  "sourcesContent": ["import type { Module } from '@open-mercato/shared/modules/registry'\nimport { applyModuleOverridesToModules } from '@open-mercato/shared/modules/overrides'\nimport type { Locale } from '../i18n/config'\nimport { invalidateDictionaryCache, invalidateDictionaryCacheLocales } from '../i18n/dictionary-cache'\nimport { createLogger } from '../logger'\n\nconst logger = createLogger('shared').child({ component: 'modules-registry' })\n\n// Registration pattern for publishable packages.\n// Use globalThis to survive tsx/esbuild module duplication where the same\n// registry.ts file can be loaded as multiple module instances when mixing\n// dynamic and static imports \u2014 for example a standalone integration test\n// bootstraps via the source path while a worker handler resolves it through\n// node_modules/@open-mercato/shared/dist/. Mirrors the same workaround used\n// by `getDiRegistrars()` in `../di/container.ts`.\nconst GLOBAL_KEY = '__openMercatoModulesRegistry__'\n\nfunction getGlobalModules(): Module[] | null {\n  return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalModules(modules: Module[]): void {\n  ;(globalThis as any)[GLOBAL_KEY] = modules\n}\n\nfunction hasRuntimeContracts(entry: Module): boolean {\n  return Object.keys(entry).some((key) => key !== 'id' && key !== 'translations')\n}\n\nfunction isI18nOnlyRegistration(modules: Module[]): boolean {\n  return modules.length > 0 && modules.every((entry) => !hasRuntimeContracts(entry))\n}\n\nfunction mergeI18nModules(existing: Module[], incoming: Module[]): Module[] {\n  const incomingById = new Map(incoming.map((entry) => [entry.id, entry]))\n  const existingIds = new Set(existing.map((entry) => entry.id))\n  const merged = existing.map((entry) => {\n    const i18nModule = incomingById.get(entry.id)\n    if (!i18nModule?.translations) return entry\n    return {\n      ...entry,\n      translations: {\n        ...(entry.translations ?? {}),\n        ...i18nModule.translations,\n      },\n    }\n  })\n\n  for (const entry of incoming) {\n    if (!existingIds.has(entry.id)) merged.push(entry)\n  }\n\n  return merged\n}\n\nfunction getTranslationLocales(modules: Module[]): Locale[] {\n  const locales = new Set<Locale>()\n  for (const entry of modules) {\n    for (const locale of Object.keys(entry.translations ?? {})) {\n      locales.add(locale as Locale)\n    }\n  }\n  return [...locales]\n}\n\nfunction preserveExistingTranslations(existing: Module[], incoming: Module[]): Module[] {\n  const existingById = new Map(existing.map((entry) => [entry.id, entry]))\n  return incoming.map((entry) => {\n    if (entry.translations) return entry\n    const translations = existingById.get(entry.id)?.translations\n    return translations ? { ...entry, translations } : entry\n  })\n}\n\nexport function registerModules(modules: Module[]) {\n  const existing = getGlobalModules()\n  if (existing !== null && process.env.NODE_ENV === 'development') {\n    logger.debug('Modules re-registered (this may occur during HMR)')\n  }\n  const nextModules = applyModuleOverridesToModules(modules)\n  const i18nOnlyRegistration = isI18nOnlyRegistration(nextModules)\n  const shouldMergeI18nOnly = existing !== null && i18nOnlyRegistration\n  const registeredModules = shouldMergeI18nOnly\n    ? mergeI18nModules(existing, nextModules)\n    : preserveExistingTranslations(existing ?? [], nextModules)\n  setGlobalModules(registeredModules)\n  if (i18nOnlyRegistration) {\n    invalidateDictionaryCacheLocales(getTranslationLocales(nextModules))\n  } else {\n    invalidateDictionaryCache()\n  }\n}\n\nexport function getModules(): Module[] {\n  const modules = getGlobalModules()\n  if (!modules) {\n    throw new Error('[Bootstrap] Modules not registered. Call registerModules() at bootstrap.')\n  }\n  return modules\n}\n\n/**\n * Non-throwing counterpart of `getModules()` for call sites that have a\n * meaningful degraded behavior when bootstrap has not run \u2014 route unit tests\n * exercise a single handler without `registerModules()`, and a hard throw there\n * turns an unrelated assertion into a bootstrap error.\n */\nexport function tryGetModules(): Module[] | null {\n  return getGlobalModules()\n}\n"],
+  "mappings": "AACA,SAAS,qCAAqC;AAE9C,SAAS,2BAA2B,wCAAwC;AAC5E,SAAS,oBAAoB;AAE7B,MAAM,SAAS,aAAa,QAAQ,EAAE,MAAM,EAAE,WAAW,mBAAmB,CAAC;AAS7E,MAAM,aAAa;AAEnB,SAAS,mBAAoC;AAC3C,SAAQ,WAAmB,UAAU,KAAK;AAC5C;AAEA,SAAS,iBAAiB,SAAyB;AACjD;AAAC,EAAC,WAAmB,UAAU,IAAI;AACrC;AAEA,SAAS,oBAAoB,OAAwB;AACnD,SAAO,OAAO,KAAK,KAAK,EAAE,KAAK,CAAC,QAAQ,QAAQ,QAAQ,QAAQ,cAAc;AAChF;AAEA,SAAS,uBAAuB,SAA4B;AAC1D,SAAO,QAAQ,SAAS,KAAK,QAAQ,MAAM,CAAC,UAAU,CAAC,oBAAoB,KAAK,CAAC;AACnF;AAEA,SAAS,iBAAiB,UAAoB,UAA8B;AAC1E,QAAM,eAAe,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;AACvE,QAAM,cAAc,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC;AAC7D,QAAM,SAAS,SAAS,IAAI,CAAC,UAAU;AACrC,UAAM,aAAa,aAAa,IAAI,MAAM,EAAE;AAC5C,QAAI,CAAC,YAAY,aAAc,QAAO;AACtC,WAAO;AAAA,MACL,GAAG;AAAA,MACH,cAAc;AAAA,QACZ,GAAI,MAAM,gBAAgB,CAAC;AAAA,QAC3B,GAAG,WAAW;AAAA,MAChB;AAAA,IACF;AAAA,EACF,CAAC;AAED,aAAW,SAAS,UAAU;AAC5B,QAAI,CAAC,YAAY,IAAI,MAAM,EAAE,EAAG,QAAO,KAAK,KAAK;AAAA,EACnD;AAEA,SAAO;AACT;AAEA,SAAS,sBAAsB,SAA6B;AAC1D,QAAM,UAAU,oBAAI,IAAY;AAChC,aAAW,SAAS,SAAS;AAC3B,eAAW,UAAU,OAAO,KAAK,MAAM,gBAAgB,CAAC,CAAC,GAAG;AAC1D,cAAQ,IAAI,MAAgB;AAAA,IAC9B;AAAA,EACF;AACA,SAAO,CAAC,GAAG,OAAO;AACpB;AAEA,SAAS,6BAA6B,UAAoB,UAA8B;AACtF,QAAM,eAAe,IAAI,IAAI,SAAS,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;AACvE,SAAO,SAAS,IAAI,CAAC,UAAU;AAC7B,QAAI,MAAM,aAAc,QAAO;AAC/B,UAAM,eAAe,aAAa,IAAI,MAAM,EAAE,GAAG;AACjD,WAAO,eAAe,EAAE,GAAG,OAAO,aAAa,IAAI;AAAA,EACrD,CAAC;AACH;AAEO,SAAS,gBAAgB,SAAmB;AACjD,QAAM,WAAW,iBAAiB;AAClC,MAAI,aAAa,QAAQ,QAAQ,IAAI,aAAa,eAAe;AAC/D,WAAO,MAAM,mDAAmD;AAAA,EAClE;AACA,QAAM,cAAc,8BAA8B,OAAO;AACzD,QAAM,uBAAuB,uBAAuB,WAAW;AAC/D,QAAM,sBAAsB,aAAa,QAAQ;AACjD,QAAM,oBAAoB,sBACtB,iBAAiB,UAAU,WAAW,IACtC,6BAA6B,YAAY,CAAC,GAAG,WAAW;AAC5D,mBAAiB,iBAAiB;AAClC,MAAI,sBAAsB;AACxB,qCAAiC,sBAAsB,WAAW,CAAC;AAAA,EACrE,OAAO;AACL,8BAA0B;AAAA,EAC5B;AACF;AAEO,SAAS,aAAuB;AACrC,QAAM,UAAU,iBAAiB;AACjC,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,0EAA0E;AAAA,EAC5F;AACA,SAAO;AACT;AAQO,SAAS,gBAAiC;AAC/C,SAAO,iBAAiB;AAC1B;",
   "names": []
 }

package/dist/lib/query/ciphertext-search-warning.js

@@ -1,5 +1,11 @@
 import { createLogger } from "../logger/index.js";
 const logger = createLogger("shared").child({ component: "query" });
+const REASON_HINTS = {
+  "search-disabled": "OM_SEARCH_ENABLED is off, so the filter runs as ILIKE against ciphertext and matches nothing.",
+  "no-indexable-tokens": "The filter value produced no search tokens, so it runs as ILIKE against ciphertext and matches nothing. Use at least OM_SEARCH_MIN_LEN indexable characters, or filter on the deterministic hash column.",
+  "no-search-tokens": "No search_tokens exist for this entity and scope, so the filter runs as ILIKE against ciphertext and matches nothing. Index the entity through query_index and reindex, or filter on the deterministic hash column.",
+  "raw-orm-filter": "This filter bypasses the query engine, so it runs as ILIKE against ciphertext and matches nothing. Resolve ids through findEntityIdsBySearchTokens (@open-mercato/shared/lib/search/tokenLookup), filter on the deterministic hash column, or compare in memory after decryption."
+};
 const WARN_CACHE_CAP = 5e3;
 const warned = /* @__PURE__ */ new Set();
 const warnKey = (entity, tenantId, field) => `${entity}|${tenantId ?? "null"}|${field}`;
@@ -27,7 +33,7 @@ async function warnOnCiphertextLikeFallback(params) {
         entity,
         field,
         reason,
-        hint: reason === "search-disabled" ? "OM_SEARCH_ENABLED is off, so the filter runs as ILIKE against ciphertext and matches nothing." : reason === "no-indexable-tokens" ? "The filter value produced no search tokens, so it runs as ILIKE against ciphertext and matches nothing. Use at least OM_SEARCH_MIN_LEN indexable characters, or filter on the deterministic hash column." : "No search_tokens exist for this entity and scope, so the filter runs as ILIKE against ciphertext and matches nothing. Index the entity through query_index and reindex, or filter on the deterministic hash column."
+        hint: REASON_HINTS[reason]
       });
     }
   } catch (err) {

package/dist/lib/query/ciphertext-search-warning.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/query/ciphertext-search-warning.ts"],
-  "sourcesContent": ["import { createLogger } from '../logger'\nimport type { EntityId } from '../../modules/entities'\n\nconst logger = createLogger('shared').child({ component: 'query' })\n\n/**\n * Minimal slice of `TenantDataEncryptionService` needed to decide whether a\n * text filter targets an encrypted column.\n */\nexport type CiphertextWarningEncryptionService = {\n  getEncryptedFieldNames?: (\n    entityId: EntityId,\n    tenantId?: string | null,\n    organizationId?: string | null,\n  ) => Promise<readonly string[]>\n  isEnabled?: () => boolean\n} | null | undefined\n\nexport type CiphertextLikeFallbackReason = 'no-indexable-tokens' | 'no-search-tokens' | 'search-disabled'\n\n// One warning per entity/tenant/field per process \u2014 the fallback repeats on\n// every request, and an operator only needs to learn about it once.\nconst WARN_CACHE_CAP = 5000\nconst warned = new Set<string>()\n\nconst warnKey = (entity: string, tenantId: string | null, field: string): string =>\n  `${entity}|${tenantId ?? 'null'}|${field}`\n\nexport const normalizeColumnName = (value: string): string =>\n  value.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()\n\n/** Test seam: the warn-once cache is process-global by design. */\nexport function resetCiphertextLikeWarnCache(): void {\n  warned.clear()\n}\n\n/**\n * Warn when a `like`/`ilike` filter is about to run against a column that an\n * encryption map covers while the token index is unavailable.\n *\n * Without this the query degrades silently: the predicate compares a plaintext\n * pattern against ciphertext, matches nothing, and the endpoint returns an\n * empty page that is indistinguishable from a genuine no-result. Issue #2990.\n *\n * Never throws and never blocks the query \u2014 a failure here is logged at debug\n * level and the caller proceeds unchanged.\n */\nexport async function warnOnCiphertextLikeFallback(params: {\n  entity: string\n  fields: readonly string[]\n  tenantId: string | null\n  reason: CiphertextLikeFallbackReason\n  service: CiphertextWarningEncryptionService\n}): Promise<void> {\n  const { entity, tenantId, reason, service } = params\n  if (!service || service.isEnabled?.() === false) return\n  if (typeof service.getEncryptedFieldNames !== 'function') return\n\n  const candidates = params.fields\n    .filter((field) => typeof field === 'string' && !field.startsWith('cf:'))\n    .map((field) => normalizeColumnName(field))\n    .filter((field, index, all) => field.length > 0 && all.indexOf(field) === index)\n    .filter((field) => !warned.has(warnKey(entity, tenantId, field)))\n  if (!candidates.length) return\n\n  try {\n    // `organizationId: null` resolves the global map plus every per-organization\n    // override, so a field encrypted for any organization is reported.\n    const encrypted = new Set(\n      (await service.getEncryptedFieldNames(entity, tenantId, null)).map((field) =>\n        normalizeColumnName(String(field)),\n      ),\n    )\n    for (const field of candidates) {\n      if (!encrypted.has(field)) continue\n      if (warned.size >= WARN_CACHE_CAP) warned.clear()\n      warned.add(warnKey(entity, tenantId, field))\n      logger.warn('Text search filter cannot match an encrypted column', {\n        entity,\n        field,\n        reason,\n        hint: reason === 'search-disabled'\n          ? 'OM_SEARCH_ENABLED is off, so the filter runs as ILIKE against ciphertext and matches nothing.'\n          : reason === 'no-indexable-tokens'\n            ? 'The filter value produced no search tokens, so it runs as ILIKE against ciphertext and matches nothing. Use at least OM_SEARCH_MIN_LEN indexable characters, or filter on the deterministic hash column.'\n            : 'No search_tokens exist for this entity and scope, so the filter runs as ILIKE against ciphertext and matches nothing. Index the entity through query_index and reindex, or filter on the deterministic hash column.',\n      })\n    }\n  } catch (err) {\n    logger.debug('Ciphertext search warning check failed', {\n      entity,\n      err: err instanceof Error ? err.message : String(err),\n    })\n  }\n}\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAG7B,MAAM,SAAS,aAAa,QAAQ,EAAE,MAAM,EAAE,WAAW,QAAQ,CAAC;AAmBlE,MAAM,iBAAiB;AACvB,MAAM,SAAS,oBAAI,IAAY;AAE/B,MAAM,UAAU,CAAC,QAAgB,UAAyB,UACxD,GAAG,MAAM,IAAI,YAAY,MAAM,IAAI,KAAK;AAEnC,MAAM,sBAAsB,CAAC,UAClC,MAAM,QAAQ,sBAAsB,OAAO,EAAE,YAAY;AAGpD,SAAS,+BAAqC;AACnD,SAAO,MAAM;AACf;AAaA,eAAsB,6BAA6B,QAMjC;AAChB,QAAM,EAAE,QAAQ,UAAU,QAAQ,QAAQ,IAAI;AAC9C,MAAI,CAAC,WAAW,QAAQ,YAAY,MAAM,MAAO;AACjD,MAAI,OAAO,QAAQ,2BAA2B,WAAY;AAE1D,QAAM,aAAa,OAAO,OACvB,OAAO,CAAC,UAAU,OAAO,UAAU,YAAY,CAAC,MAAM,WAAW,KAAK,CAAC,EACvE,IAAI,CAAC,UAAU,oBAAoB,KAAK,CAAC,EACzC,OAAO,CAAC,OAAO,OAAO,QAAQ,MAAM,SAAS,KAAK,IAAI,QAAQ,KAAK,MAAM,KAAK,EAC9E,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,QAAQ,QAAQ,UAAU,KAAK,CAAC,CAAC;AAClE,MAAI,CAAC,WAAW,OAAQ;AAExB,MAAI;AAGF,UAAM,YAAY,IAAI;AAAA,OACnB,MAAM,QAAQ,uBAAuB,QAAQ,UAAU,IAAI,GAAG;AAAA,QAAI,CAAC,UAClE,oBAAoB,OAAO,KAAK,CAAC;AAAA,MACnC;AAAA,IACF;AACA,eAAW,SAAS,YAAY;AAC9B,UAAI,CAAC,UAAU,IAAI,KAAK,EAAG;AAC3B,UAAI,OAAO,QAAQ,eAAgB,QAAO,MAAM;AAChD,aAAO,IAAI,QAAQ,QAAQ,UAAU,KAAK,CAAC;AAC3C,aAAO,KAAK,uDAAuD;AAAA,QACjE;AAAA,QACA;AAAA,QACA;AAAA,QACA,MAAM,WAAW,oBACb,kGACA,WAAW,wBACT,6MACA;AAAA,MACR,CAAC;AAAA,IACH;AAAA,EACF,SAAS,KAAK;AACZ,WAAO,MAAM,0CAA0C;AAAA,MACrD;AAAA,MACA,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,IACtD,CAAC;AAAA,EACH;AACF;",
+  "sourcesContent": ["import { createLogger } from '../logger'\nimport type { EntityId } from '../../modules/entities'\n\nconst logger = createLogger('shared').child({ component: 'query' })\n\n/**\n * Minimal slice of `TenantDataEncryptionService` needed to decide whether a\n * text filter targets an encrypted column.\n */\nexport type CiphertextWarningEncryptionService = {\n  getEncryptedFieldNames?: (\n    entityId: EntityId,\n    tenantId?: string | null,\n    organizationId?: string | null,\n  ) => Promise<readonly string[]>\n  isEnabled?: () => boolean\n} | null | undefined\n\nexport type CiphertextLikeFallbackReason =\n  | 'no-indexable-tokens'\n  | 'no-search-tokens'\n  | 'search-disabled'\n  | 'raw-orm-filter'\n\nconst REASON_HINTS: Record<CiphertextLikeFallbackReason, string> = {\n  'search-disabled':\n    'OM_SEARCH_ENABLED is off, so the filter runs as ILIKE against ciphertext and matches nothing.',\n  'no-indexable-tokens':\n    'The filter value produced no search tokens, so it runs as ILIKE against ciphertext and matches nothing. Use at least OM_SEARCH_MIN_LEN indexable characters, or filter on the deterministic hash column.',\n  'no-search-tokens':\n    'No search_tokens exist for this entity and scope, so the filter runs as ILIKE against ciphertext and matches nothing. Index the entity through query_index and reindex, or filter on the deterministic hash column.',\n  'raw-orm-filter':\n    'This filter bypasses the query engine, so it runs as ILIKE against ciphertext and matches nothing. Resolve ids through findEntityIdsBySearchTokens (@open-mercato/shared/lib/search/tokenLookup), filter on the deterministic hash column, or compare in memory after decryption.',\n}\n\n// One warning per entity/tenant/field per process \u2014 the fallback repeats on\n// every request, and an operator only needs to learn about it once.\nconst WARN_CACHE_CAP = 5000\nconst warned = new Set<string>()\n\nconst warnKey = (entity: string, tenantId: string | null, field: string): string =>\n  `${entity}|${tenantId ?? 'null'}|${field}`\n\nexport const normalizeColumnName = (value: string): string =>\n  value.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()\n\n/** Test seam: the warn-once cache is process-global by design. */\nexport function resetCiphertextLikeWarnCache(): void {\n  warned.clear()\n}\n\n/**\n * Warn when a `like`/`ilike` filter is about to run against a column that an\n * encryption map covers while the token index is unavailable.\n *\n * Without this the query degrades silently: the predicate compares a plaintext\n * pattern against ciphertext, matches nothing, and the endpoint returns an\n * empty page that is indistinguishable from a genuine no-result. Issue #2990.\n *\n * Never throws and never blocks the query \u2014 a failure here is logged at debug\n * level and the caller proceeds unchanged.\n */\nexport async function warnOnCiphertextLikeFallback(params: {\n  entity: string\n  fields: readonly string[]\n  tenantId: string | null\n  reason: CiphertextLikeFallbackReason\n  service: CiphertextWarningEncryptionService\n}): Promise<void> {\n  const { entity, tenantId, reason, service } = params\n  if (!service || service.isEnabled?.() === false) return\n  if (typeof service.getEncryptedFieldNames !== 'function') return\n\n  const candidates = params.fields\n    .filter((field) => typeof field === 'string' && !field.startsWith('cf:'))\n    .map((field) => normalizeColumnName(field))\n    .filter((field, index, all) => field.length > 0 && all.indexOf(field) === index)\n    .filter((field) => !warned.has(warnKey(entity, tenantId, field)))\n  if (!candidates.length) return\n\n  try {\n    // `organizationId: null` resolves the global map plus every per-organization\n    // override, so a field encrypted for any organization is reported.\n    const encrypted = new Set(\n      (await service.getEncryptedFieldNames(entity, tenantId, null)).map((field) =>\n        normalizeColumnName(String(field)),\n      ),\n    )\n    for (const field of candidates) {\n      if (!encrypted.has(field)) continue\n      if (warned.size >= WARN_CACHE_CAP) warned.clear()\n      warned.add(warnKey(entity, tenantId, field))\n      logger.warn('Text search filter cannot match an encrypted column', {\n        entity,\n        field,\n        reason,\n        hint: REASON_HINTS[reason],\n      })\n    }\n  } catch (err) {\n    logger.debug('Ciphertext search warning check failed', {\n      entity,\n      err: err instanceof Error ? err.message : String(err),\n    })\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAG7B,MAAM,SAAS,aAAa,QAAQ,EAAE,MAAM,EAAE,WAAW,QAAQ,CAAC;AAqBlE,MAAM,eAA6D;AAAA,EACjE,mBACE;AAAA,EACF,uBACE;AAAA,EACF,oBACE;AAAA,EACF,kBACE;AACJ;AAIA,MAAM,iBAAiB;AACvB,MAAM,SAAS,oBAAI,IAAY;AAE/B,MAAM,UAAU,CAAC,QAAgB,UAAyB,UACxD,GAAG,MAAM,IAAI,YAAY,MAAM,IAAI,KAAK;AAEnC,MAAM,sBAAsB,CAAC,UAClC,MAAM,QAAQ,sBAAsB,OAAO,EAAE,YAAY;AAGpD,SAAS,+BAAqC;AACnD,SAAO,MAAM;AACf;AAaA,eAAsB,6BAA6B,QAMjC;AAChB,QAAM,EAAE,QAAQ,UAAU,QAAQ,QAAQ,IAAI;AAC9C,MAAI,CAAC,WAAW,QAAQ,YAAY,MAAM,MAAO;AACjD,MAAI,OAAO,QAAQ,2BAA2B,WAAY;AAE1D,QAAM,aAAa,OAAO,OACvB,OAAO,CAAC,UAAU,OAAO,UAAU,YAAY,CAAC,MAAM,WAAW,KAAK,CAAC,EACvE,IAAI,CAAC,UAAU,oBAAoB,KAAK,CAAC,EACzC,OAAO,CAAC,OAAO,OAAO,QAAQ,MAAM,SAAS,KAAK,IAAI,QAAQ,KAAK,MAAM,KAAK,EAC9E,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,QAAQ,QAAQ,UAAU,KAAK,CAAC,CAAC;AAClE,MAAI,CAAC,WAAW,OAAQ;AAExB,MAAI;AAGF,UAAM,YAAY,IAAI;AAAA,OACnB,MAAM,QAAQ,uBAAuB,QAAQ,UAAU,IAAI,GAAG;AAAA,QAAI,CAAC,UAClE,oBAAoB,OAAO,KAAK,CAAC;AAAA,MACnC;AAAA,IACF;AACA,eAAW,SAAS,YAAY;AAC9B,UAAI,CAAC,UAAU,IAAI,KAAK,EAAG;AAC3B,UAAI,OAAO,QAAQ,eAAgB,QAAO,MAAM;AAChD,aAAO,IAAI,QAAQ,QAAQ,UAAU,KAAK,CAAC;AAC3C,aAAO,KAAK,uDAAuD;AAAA,QACjE;AAAA,QACA;AAAA,QACA;AAAA,QACA,MAAM,aAAa,MAAM;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,EACF,SAAS,KAAK;AACZ,WAAO,MAAM,0CAA0C;AAAA,MACrD;AAAA,MACA,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,IACtD,CAAC;AAAA,EACH;AACF;",
   "names": []
 }

package/dist/lib/version.js

@@ -1,4 +1,4 @@
-const APP_VERSION = "0.6.8-develop.6889.1.af4501ca97";
+const APP_VERSION = "0.6.8-develop.6892.1.f179677788";
 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.8-develop.6889.1.af4501ca97';\nexport const appVersion = APP_VERSION;\n"],
+  "sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.8-develop.6892.1.f179677788';\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.8-develop.6889.1.af4501ca97",
+  "version": "0.6.8-develop.6892.1.f179677788",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -105,7 +105,7 @@
     "@mikro-orm/core": "^7.1.8",
     "@mikro-orm/decorators": "^7.1.8",
     "@mikro-orm/postgresql": "^7.1.8",
-    "@open-mercato/cache": "0.6.8-develop.6889.1.af4501ca97",
+    "@open-mercato/cache": "0.6.8-develop.6892.1.f179677788",
     "@types/sanitize-html": "^2.16.1",
     "dotenv": "^17.4.2",
     "pino": "^10.3.1",

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

@@ -0,0 +1,126 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+
+const generatedExports: Record<string, string> = {
+  // Jest evaluates file-URL imports through its CommonJS runtime in this suite.
+  'entities.ids.generated.mjs': 'exports.E = {}\n',
+  'modules.cli.generated.mjs': 'exports.modules = []\n',
+  'entities.generated.mjs': 'exports.entities = []\n',
+  'di.generated.mjs': 'exports.diRegistrars = []\n',
+  'search.generated.mjs': 'exports.searchModuleConfigs = []\n',
+  'command-loaders.generated.mjs': 'exports.commandLoaderEntries = []\n',
+}
+
+const mockBuild = jest.fn(async ({ outfile }: { outfile: string }) => {
+  const output = generatedExports[path.basename(outfile)]
+  if (!output) throw new Error(`Unexpected generated output: ${outfile}`)
+  fs.writeFileSync(outfile, output)
+  // compileAndImport records the bundle's inputs in its cache metadata, so the
+  // double has to supply a metafile the way a real esbuild build does.
+  return { metafile: { inputs: {} } }
+})
+const mockStop = jest.fn()
+
+jest.mock('esbuild', () => ({
+  build: mockBuild,
+  stop: mockStop,
+}))
+
+import { loadBootstrapData } from '../dynamicLoader'
+
+const generatedNames = [
+  'entities.ids.generated.ts',
+  'modules.cli.generated.ts',
+  'entities.generated.ts',
+  'di.generated.ts',
+  'search.generated.ts',
+  'command-loaders.generated.ts',
+]
+
+function createGeneratedApp(prefix: string): string {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), prefix))
+  const generatedDir = path.join(root, '.mercato', 'generated')
+  fs.mkdirSync(generatedDir, { recursive: true })
+  // compileAndImport resolves the app tsconfig and folds it into the compile
+  // cache key, so a generated app without one is not loadable.
+  fs.writeFileSync(
+    path.join(root, 'tsconfig.json'),
+    JSON.stringify({ compilerOptions: { target: 'ES2022', module: 'ESNext' } }),
+  )
+  for (const name of generatedNames) {
+    fs.writeFileSync(path.join(generatedDir, name), '// generated test input\n')
+  }
+  return root
+}
+
+describe('loadBootstrapData esbuild lifecycle', () => {
+  let appRoot: string
+
+  beforeEach(() => {
+    appRoot = createGeneratedApp('open-mercato-dynamic-loader-')
+    mockBuild.mockClear()
+    mockStop.mockReset()
+    mockStop.mockResolvedValue(undefined)
+  })
+
+  afterEach(() => {
+    fs.rmSync(appRoot, { recursive: true, force: true })
+  })
+
+  it('stops esbuild after compilation and starts it again for a later changed load', async () => {
+    await loadBootstrapData(appRoot)
+
+    expect(mockBuild).toHaveBeenCalledTimes(generatedNames.length)
+    expect(mockStop).toHaveBeenCalledTimes(1)
+
+    // The compile cache keys off source content, not mtime, so the change that
+    // forces a recompile has to be a real content change.
+    const entityIdsPath = path.join(appRoot, '.mercato', 'generated', 'entities.ids.generated.ts')
+    fs.writeFileSync(entityIdsPath, '// generated test input (changed)\n')
+
+    await loadBootstrapData(appRoot)
+
+    expect(mockBuild).toHaveBeenCalledTimes(generatedNames.length + 1)
+    expect(mockStop).toHaveBeenCalledTimes(2)
+  })
+
+  it('waits for concurrent bootstrap loads before stopping the shared service', async () => {
+    const secondAppRoot = createGeneratedApp('open-mercato-dynamic-loader-concurrent-')
+
+    try {
+      await Promise.all([
+        loadBootstrapData(appRoot),
+        loadBootstrapData(secondAppRoot),
+      ])
+
+      expect(mockBuild).toHaveBeenCalledTimes(generatedNames.length * 2)
+      expect(mockStop).toHaveBeenCalledTimes(1)
+    } finally {
+      fs.rmSync(secondAppRoot, { recursive: true, force: true })
+    }
+  })
+
+  it('waits for an asynchronous service stop before starting a later build', async () => {
+    let releaseStop: () => void = () => undefined
+    const stopPending = new Promise<void>((resolve) => {
+      releaseStop = resolve
+    })
+    mockStop.mockImplementationOnce(() => stopPending)
+
+    const firstLoad = loadBootstrapData(appRoot)
+    await new Promise((resolve) => setImmediate(resolve))
+    expect(mockStop).toHaveBeenCalledTimes(1)
+
+    const entityIdsPath = path.join(appRoot, '.mercato', 'generated', 'entities.ids.generated.ts')
+    fs.writeFileSync(entityIdsPath, '// generated test input (changed during stop)\n')
+    const secondLoad = loadBootstrapData(appRoot)
+    await new Promise((resolve) => setImmediate(resolve))
+
+    expect(mockBuild).toHaveBeenCalledTimes(generatedNames.length)
+
+    releaseStop()
+    await Promise.all([firstLoad, secondLoad])
+    expect(mockBuild).toHaveBeenCalledTimes(generatedNames.length + 1)
+  })
+})

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

@@ -0,0 +1,78 @@
+import type { BootstrapData } from '../types'
+import { createBootstrap, isBootstrapped, resetBootstrapState, waitForAsyncRegistration } from '../factory'
+
+const registerCoreInjectionWidgetsMock = jest.fn()
+const registerCoreInjectionTablesMock = jest.fn()
+const registerEnabledModuleIdsMock = jest.fn()
+
+jest.mock('@open-mercato/core/modules/widgets/lib/injection', () => ({
+  registerCoreInjectionWidgets: registerCoreInjectionWidgetsMock,
+  registerCoreInjectionTables: registerCoreInjectionTablesMock,
+  registerEnabledModuleIds: registerEnabledModuleIdsMock,
+}))
+
+const emptyBootstrapData: BootstrapData = {
+  modules: [],
+  entities: [],
+  diRegistrars: [],
+  entityIds: {},
+  dashboardWidgetEntries: [],
+  injectionWidgetEntries: [],
+  injectionTables: [],
+  searchModuleConfigs: [],
+}
+
+describe('partitioned bootstrap registration', () => {
+  const originalNodeEnv = process.env.NODE_ENV
+
+  beforeEach(() => {
+    resetBootstrapState()
+    process.env.NODE_ENV = 'production'
+    registerCoreInjectionWidgetsMock.mockReset()
+    registerCoreInjectionTablesMock.mockReset()
+    registerEnabledModuleIdsMock.mockReset()
+  })
+
+  afterAll(() => {
+    process.env.NODE_ENV = originalNodeEnv
+  })
+
+  it('runs distinct registration keys once each', async () => {
+    const apiComplete = jest.fn()
+    const fullComplete = jest.fn()
+    const apiBootstrap = createBootstrap(emptyBootstrapData, {
+      registrationKey: 'api',
+      skipUiRegistries: true,
+      onRegistrationComplete: apiComplete,
+    })
+    const fullBootstrap = createBootstrap(emptyBootstrapData, {
+      registrationKey: 'full',
+      onRegistrationComplete: fullComplete,
+    })
+
+    apiBootstrap()
+    apiBootstrap()
+    fullBootstrap()
+    fullBootstrap()
+    await waitForAsyncRegistration()
+
+    expect(apiComplete).toHaveBeenCalledTimes(1)
+    expect(fullComplete).toHaveBeenCalledTimes(1)
+    expect(isBootstrapped()).toBe(true)
+  })
+
+  it('keeps API-only bootstrap from replacing core injection widgets', async () => {
+    const apiBootstrap = createBootstrap(emptyBootstrapData, {
+      registrationKey: 'api-only',
+      skipUiRegistries: true,
+      skipCoreInjectionWidgets: true,
+    })
+
+    apiBootstrap()
+    await waitForAsyncRegistration()
+
+    expect(registerCoreInjectionWidgetsMock).not.toHaveBeenCalled()
+    expect(registerCoreInjectionTablesMock).toHaveBeenCalledWith([])
+    expect(registerEnabledModuleIdsMock).toHaveBeenCalledTimes(1)
+  })
+})

package/src/lib/bootstrap/dynamicLoader.ts

@@ -14,8 +14,47 @@ import crypto from 'node:crypto'
 import { createRequire } from 'node:module'
 import { pathToFileURL } from 'node:url'
 
+let activeBootstrapLoads = 0
+let esbuildRuntime: typeof import('esbuild') | null = null
+let esbuildStopPromise: Promise<void> | null = null
+
 const logger = createLogger('shared').child({ component: 'bootstrap' })
 
+async function getEsbuildRuntime(): Promise<typeof import('esbuild')> {
+  if (esbuildStopPromise) await esbuildStopPromise
+  if (esbuildRuntime) return esbuildRuntime
+
+  const loadedRuntime = await import('esbuild')
+  esbuildRuntime ??= loadedRuntime
+  return esbuildRuntime
+}
+
+async function withEsbuildLifecycle<T>(load: () => Promise<T>): Promise<T> {
+  activeBootstrapLoads += 1
+
+  try {
+    return await load()
+  } finally {
+    activeBootstrapLoads -= 1
+    if (activeBootstrapLoads === 0 && esbuildRuntime) {
+      // esbuild keeps a helper process alive after build(). Bootstrap compilation
+      // is a bounded phase, so release it once every concurrent loader is done.
+      // A later build() call transparently starts a fresh helper process.
+      const runtimeToStop = esbuildRuntime
+      esbuildRuntime = null
+      const stopPromise = runtimeToStop.stop().catch((err) => {
+        logger.warn('Failed to stop the bootstrap compiler service', { err })
+      })
+      esbuildStopPromise = stopPromise
+      try {
+        await stopPromise
+      } finally {
+        if (esbuildStopPromise === stopPromise) esbuildStopPromise = null
+      }
+    }
+  }
+}
+
 /**
  * Thrown when an expected generated source file is absent.
  *
@@ -351,7 +390,7 @@ async function compileAndImport(
   if (needsCompile) {
     fs.mkdirSync(path.dirname(jsPath), { recursive: true })
     // Dynamically import esbuild only when needed
-    const esbuild = await import('esbuild')
+    const esbuild = await getEsbuildRuntime()
 
     // Use esbuild.build with bundling to handle JSON imports
     const result = await esbuild.build({
@@ -509,7 +548,7 @@ async function loadAppDiRegistrar(appDir: string): Promise<AppDiRegistrar | null
  * @returns The loaded bootstrap data
  * @throws Error if app root cannot be found or generated files are missing
  */
-export async function loadBootstrapData(appRoot?: string): Promise<BootstrapData> {
+async function loadBootstrapDataWithActiveEsbuild(appRoot?: string): Promise<BootstrapData> {
   const resolved = resolveAppRootOrThrow(appRoot)
 
   const { generatedDir } = resolved
@@ -569,6 +608,10 @@ export async function loadBootstrapData(appRoot?: string): Promise<BootstrapData
   }
 }
 
+export async function loadBootstrapData(appRoot?: string): Promise<BootstrapData> {
+  return withEsbuildLifecycle(() => loadBootstrapDataWithActiveEsbuild(appRoot))
+}
+
 /**
  * Create and execute bootstrap in CLI context.
  *
@@ -584,8 +627,13 @@ export async function loadBootstrapData(appRoot?: string): Promise<BootstrapData
 export async function bootstrapFromAppRoot(appRoot?: string): Promise<BootstrapData> {
   const { createBootstrap, waitForAsyncRegistration } = await import('./factory.js')
   const resolved = resolveAppRootOrThrow(appRoot)
-  const data = await loadBootstrapData(resolved.appDir)
-  const appDiRegistrar = await loadAppDiRegistrar(resolved.appDir)
+  // Both loads compile through esbuild, so they share one lifecycle scope: without it
+  // `loadBootstrapData` releases the esbuild helper process and `loadAppDiRegistrar`
+  // silently starts a second one that nothing ever stops.
+  const { data, appDiRegistrar } = await withEsbuildLifecycle(async () => ({
+    data: await loadBootstrapData(resolved.appDir),
+    appDiRegistrar: await loadAppDiRegistrar(resolved.appDir),
+  }))
   const bootstrap = createBootstrap(data, appDiRegistrar ? { appDiRegistrar } : {})
   bootstrap()
   // In CLI context, wait for async registrations (UI widgets, search configs, etc.)

package/src/lib/bootstrap/factory.ts

@@ -17,7 +17,7 @@ import { registerNotificationHandlers } from '../notifications/handler-registry'
 import { clearRegisteredIntegrations, registerBundles, registerIntegrations } from '../../modules/integrations/types'
 import { applyComponentOverridesToEntries } from '../../modules/overrides'
 
-let _bootstrapped = false
+const _bootstrappedKeys = new Set<string>()
 
 // Store the async registration promise so callers can await it if needed
 let _asyncRegistrationPromise: Promise<void> | null = null
@@ -34,13 +34,14 @@ let _asyncRegistrationPromise: Promise<void> | null = null
  */
 export function createBootstrap(data: BootstrapData, options: BootstrapOptions = {}) {
   return function bootstrap(): void {
+    const registrationKey = options.registrationKey ?? 'default'
     if (options.appDiRegistrar) {
       registerAppDiRegistrar(options.appDiRegistrar)
     }
     // In development, always re-run registrations to handle HMR
     // (Module state may be reset when Turbopack reloads packages)
-    if (_bootstrapped && process.env.NODE_ENV !== 'development') return
-    _bootstrapped = true
+    if (_bootstrappedKeys.has(registrationKey) && process.env.NODE_ENV !== 'development') return
+    _bootstrappedKeys.add(registrationKey)
 
     // === 1. Foundation: ORM entities and DI registrars ===
     registerOrmEntities(data.entities)
@@ -138,21 +139,26 @@ export async function waitForAsyncRegistration(): Promise<void> {
 }
 
 async function registerWidgetsAndOptionalPackages(data: BootstrapData, options: BootstrapOptions): Promise<void> {
-  // Register UI widgets (dynamic imports to avoid circular deps with ui/core packages)
+  // Register widget data required by server-side injection independently from
+  // browser-facing UI registries. API-only bootstraps avoid loading @open-mercato/ui.
   try {
-    const [dashboardRegistry, injectionRegistry, coreInjection] = await Promise.all([
-      import('@open-mercato/ui/backend/dashboard/widgetRegistry'),
-      import('@open-mercato/ui/backend/injection/widgetRegistry'),
-      import('@open-mercato/core/modules/widgets/lib/injection'),
-    ])
-
-    dashboardRegistry.registerDashboardWidgets(data.dashboardWidgetEntries)
-    injectionRegistry.registerInjectionWidgets(data.injectionWidgetEntries)
-    coreInjection.registerCoreInjectionWidgets(data.injectionWidgetEntries)
+    const coreInjection = await import('@open-mercato/core/modules/widgets/lib/injection')
+    if (!options.skipCoreInjectionWidgets) {
+      coreInjection.registerCoreInjectionWidgets(data.injectionWidgetEntries)
+    }
     coreInjection.registerCoreInjectionTables(data.injectionTables)
     coreInjection.registerEnabledModuleIds(
       data.modules.map((module) => module.id).filter((id): id is string => typeof id === 'string' && id.length > 0),
     )
+
+    if (!options.skipUiRegistries) {
+      const [dashboardRegistry, injectionRegistry] = await Promise.all([
+        import('@open-mercato/ui/backend/dashboard/widgetRegistry'),
+        import('@open-mercato/ui/backend/injection/widgetRegistry'),
+      ])
+      dashboardRegistry.registerDashboardWidgets(data.dashboardWidgetEntries)
+      injectionRegistry.registerInjectionWidgets(data.injectionWidgetEntries)
+    }
   } catch {
     // UI packages may not be available in all contexts
   }
@@ -170,12 +176,12 @@ async function registerWidgetsAndOptionalPackages(data: BootstrapData, options:
  * Check if bootstrap has been called.
  */
 export function isBootstrapped(): boolean {
-  return _bootstrapped
+  return _bootstrappedKeys.size > 0
 }
 
 /**
  * Reset bootstrap state. Useful for testing.
  */
 export function resetBootstrapState(): void {
-  _bootstrapped = false
+  _bootstrappedKeys.clear()
 }

package/src/lib/bootstrap/types.ts

@@ -69,6 +69,12 @@ export interface BootstrapData {
 
 export interface BootstrapOptions {
   skipSearchConfigs?: boolean
+  /** Independent registration scope for partitioned runtime bootstraps. */
+  registrationKey?: string
+  /** Skip browser-facing dashboard/injection registries in API-only runtimes. */
+  skipUiRegistries?: boolean
+  /** Keep an existing core injection-widget registry intact in partitioned runtimes. */
+  skipCoreInjectionWidgets?: boolean
   onRegistrationComplete?: () => void
   appDiRegistrar?: AppDiRegistrar
 }