@open-mercato/core 0.6.7-develop.6862.1.c11a64ce0a → 0.6.7

package/src/modules/directory/i18n/en.json

@@ -7,8 +7,6 @@
   "directory.audit.tenants.update": "Update tenant",
   "directory.branding.actions.reset": "Use default logo",
   "directory.branding.actions.save": "Save branding",
-  "directory.branding.aspectRatio.description": "When disabled, the sidebar crops the logo into the standard icon shape.",
-  "directory.branding.aspectRatio.label": "Keep the aspect ratio",
   "directory.branding.currentScope": "Current organization",
   "directory.branding.description": "Set the logo used in the backend sidebar for the currently selected organization.",
   "directory.branding.errors.blocked": "Branding save was blocked.",
@@ -18,7 +16,7 @@
   "directory.branding.errors.organizationRequired": "Select a single organization before changing sidebar branding.",
   "directory.branding.errors.save": "Failed to update organization branding",
   "directory.branding.errors.upload": "Failed to upload logo",
-  "directory.branding.file.hint": "PNG, JPG, or WebP works best. Uploaded files are stored as organization attachments.",
+  "directory.branding.file.hint": "PNG, JPG, WebP, or SVG works best. Uploaded files are stored as organization attachments.",
   "directory.branding.file.label": "Upload logo",
   "directory.branding.flash.saved": "Organization branding updated",
   "directory.branding.loading": "Loading organization branding...",
@@ -54,7 +52,6 @@
   "directory.organizations.form.field.slug": "Slug",
   "directory.organizations.form.field.slug.description": "URL-safe identifier used for the customer portal (lowercase letters, numbers, hyphens, underscores).",
   "directory.organizations.form.field.tenant": "Tenant",
-  "directory.organizations.form.field.tenantReadonlyDescription": "Tenant cannot be changed for an existing organization.",
   "directory.organizations.form.group.customFields": "Custom Data",
   "directory.organizations.form.group.details": "Details",
   "directory.organizations.form.loading": "Loading organization...",

package/src/modules/directory/i18n/es.json

@@ -7,8 +7,6 @@
   "directory.audit.tenants.update": "Actualizar inquilino",
   "directory.branding.actions.reset": "Usar logo predeterminado",
   "directory.branding.actions.save": "Guardar marca",
-  "directory.branding.aspectRatio.description": "Cuando está desactivado, la barra lateral recorta el logo con la forma de icono estándar.",
-  "directory.branding.aspectRatio.label": "Mantener la relación de aspecto",
   "directory.branding.currentScope": "Organización actual",
   "directory.branding.description": "Define el logo usado en la barra lateral del backend para la organización seleccionada.",
   "directory.branding.errors.blocked": "Se bloqueó el guardado de la marca.",
@@ -18,7 +16,7 @@
   "directory.branding.errors.organizationRequired": "Selecciona una sola organización antes de cambiar la marca de la barra lateral.",
   "directory.branding.errors.save": "No se pudo actualizar la marca de la organización",
   "directory.branding.errors.upload": "No se pudo subir el logo",
-  "directory.branding.file.hint": "PNG, JPG o WebP funcionan mejor. Los archivos subidos se guardan como adjuntos de la organización.",
+  "directory.branding.file.hint": "PNG, JPG, WebP o SVG funcionan mejor. Los archivos subidos se guardan como adjuntos de la organización.",
   "directory.branding.file.label": "Subir logo",
   "directory.branding.flash.saved": "Marca de la organización actualizada",
   "directory.branding.loading": "Cargando marca de la organización...",
@@ -54,7 +52,6 @@
   "directory.organizations.form.field.slug": "Slug",
   "directory.organizations.form.field.slug.description": "Identificador seguro para URL usado en el portal de clientes (minúsculas, números, guiones, guiones bajos).",
   "directory.organizations.form.field.tenant": "Inquilino",
-  "directory.organizations.form.field.tenantReadonlyDescription": "El inquilino no se puede cambiar para una organización existente.",
   "directory.organizations.form.group.customFields": "Datos personalizados",
   "directory.organizations.form.group.details": "Detalles",
   "directory.organizations.form.loading": "Cargando organización...",

package/src/modules/directory/i18n/pl.json

@@ -7,8 +7,6 @@
   "directory.audit.tenants.update": "Aktualizuj najemcę",
   "directory.branding.actions.reset": "Użyj domyślnego logo",
   "directory.branding.actions.save": "Zapisz branding",
-  "directory.branding.aspectRatio.description": "Gdy opcja jest wyłączona, sidebar przycina logo do standardowego kształtu ikony.",
-  "directory.branding.aspectRatio.label": "Zachowaj proporcje",
   "directory.branding.currentScope": "Aktualna organizacja",
   "directory.branding.description": "Ustaw logo używane w sidebarze backendu dla aktualnie wybranej organizacji.",
   "directory.branding.errors.blocked": "Zapis brandingu został zablokowany.",
@@ -18,7 +16,7 @@
   "directory.branding.errors.organizationRequired": "Wybierz pojedynczą organizację przed zmianą brandingu sidebara.",
   "directory.branding.errors.save": "Nie udało się zaktualizować brandingu organizacji",
   "directory.branding.errors.upload": "Nie udało się przesłać logo",
-  "directory.branding.file.hint": "Najlepiej sprawdzi się PNG, JPG albo WebP. Przesłane pliki są zapisywane jako załączniki organizacji.",
+  "directory.branding.file.hint": "Najlepiej sprawdzi się PNG, JPG, WebP albo SVG. Przesłane pliki są zapisywane jako załączniki organizacji.",
   "directory.branding.file.label": "Prześlij logo",
   "directory.branding.flash.saved": "Branding organizacji zaktualizowany",
   "directory.branding.loading": "Ładowanie brandingu organizacji...",
@@ -54,7 +52,6 @@
   "directory.organizations.form.field.slug": "Identyfikator URL",
   "directory.organizations.form.field.slug.description": "Identyfikator używany w adresie portalu klienta (małe litery, cyfry, myślniki, podkreślenia).",
   "directory.organizations.form.field.tenant": "Najemca",
-  "directory.organizations.form.field.tenantReadonlyDescription": "Najemcy nie można zmienić dla istniejącej organizacji.",
   "directory.organizations.form.group.customFields": "Dane niestandardowe",
   "directory.organizations.form.group.details": "Szczegóły",
   "directory.organizations.form.loading": "Ładowanie organizacji...",

package/src/modules/directory/migrations/.snapshot-open-mercato.json

@@ -161,23 +161,6 @@
           "enumItems": [],
           "mappedType": "text"
         },
-        "logo_preserve_aspect_ratio": {
-          "name": "logo_preserve_aspect_ratio",
-          "type": "boolean",
-          "unsigned": false,
-          "autoincrement": false,
-          "primary": false,
-          "nullable": false,
-          "unique": false,
-          "length": null,
-          "precision": null,
-          "scale": null,
-          "default": "false",
-          "comment": null,
-          "collation": null,
-          "enumItems": [],
-          "mappedType": "boolean"
-        },
         "name": {
           "name": "name",
           "type": "text",
@@ -465,4 +448,4 @@
   ],
   "views": [],
   "nativeEnums": {}
-}
+}

package/src/modules/directory/subscribers/invalidateOrgScopeCache.ts

@@ -8,7 +8,6 @@
 // for races where the event fires after a request reads the cache.
 
 import { buildOrgScopeTenantCacheTag } from '@open-mercato/core/modules/directory/utils/organizationScope'
-import { runWithCacheTenant } from '@open-mercato/cache'
 
 type CacheService = {
   deleteByTags(tags: string[]): Promise<number>
@@ -35,9 +34,7 @@ export default async function handle(
   }
   if (!cache) return
   try {
-    await runWithCacheTenant(tenantId, () =>
-      cache.deleteByTags([buildOrgScopeTenantCacheTag(tenantId)]),
-    )
+    await cache.deleteByTags([buildOrgScopeTenantCacheTag(tenantId)])
   } catch {
     // best-effort; TTL is the backstop.
   }

package/src/modules/directory/utils/organizationScope.ts

@@ -5,7 +5,7 @@ import { Organization } from '@open-mercato/core/modules/directory/data/entities
 import { isAllOrganizationsSelection } from '@open-mercato/core/modules/directory/constants'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
 import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
-import { getCurrentCacheTenant, runWithCacheTenant, type CacheStrategy } from '@open-mercato/cache'
+import type { CacheStrategy } from '@open-mercato/cache'
 import { parseSelectedOrganizationCookie, parseSelectedTenantCookie } from './scopeCookies'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
@@ -104,15 +104,11 @@ function resolveCacheFromContainer(container: AwilixContainer | null | undefined
 export async function invalidateOrganizationScopeCacheForUser(
   container: AwilixContainer,
   userId: string,
-  tenantId?: string | null,
 ): Promise<void> {
   const cache = resolveCacheFromContainer(container)
   if (!cache?.deleteByTags) return
   try {
-    const cacheTenantId = tenantId === undefined ? getCurrentCacheTenant() : tenantId
-    await runWithCacheTenant(cacheTenantId, () =>
-      cache.deleteByTags([buildOrgScopeUserCacheTag(userId)]),
-    )
+    await cache.deleteByTags([buildOrgScopeUserCacheTag(userId)])
   } catch (err) {
     logger.warn('Cache invalidate user failed', { err })
   }
@@ -125,9 +121,7 @@ export async function invalidateOrganizationScopeCacheForTenant(
   const cache = resolveCacheFromContainer(container)
   if (!cache?.deleteByTags) return
   try {
-    await runWithCacheTenant(tenantId, () =>
-      cache.deleteByTags([buildOrgScopeTenantCacheTag(tenantId)]),
-    )
+    await cache.deleteByTags([buildOrgScopeTenantCacheTag(tenantId)])
   } catch (err) {
     logger.warn('Cache invalidate tenant failed', { err })
   }

package/src/modules/entities/api/definitions.ts

@@ -14,7 +14,6 @@ import {
 } from './definitions.cache'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { filterSelectableSystemEntityIds, isSystemEntitySelectable } from '@open-mercato/shared/lib/entities/system-entities'
-import { isOrmBackedSystemEntityId } from '@open-mercato/shared/lib/data/engine'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import { loadEntityFieldsetConfigs, CustomFieldsetDefinition } from '../lib/fieldsets'
 import { installCustomEntitiesFromModules } from '../lib/install-from-ce'
@@ -25,12 +24,6 @@ import {
   beginEntitiesMutationGuard,
   FIELD_DEFINITION_RESOURCE_KIND,
 } from './definitions.mutation-guard'
-import {
-  canReadAllEntityMetadata,
-  canReadEntityMetadata,
-  getDeclaredCustomEntityRestriction,
-  resolveEntityAclRequirement,
-} from '../lib/entityAcl'
 import {
   createExactDefinitionWhere,
   createScopedDefinitionTombstone,
@@ -233,8 +226,8 @@ export async function GET(req: Request) {
   const auth = await getAuthFromRequest(req)
   if (!auth) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
 
-  const selectableEntityIds = filterSelectableSystemEntityIds(requestedEntityIds)
-  if (!selectableEntityIds.length) {
+  const entityIds = filterSelectableSystemEntityIds(requestedEntityIds)
+  if (!entityIds.length) {
     return NextResponse.json({ items: [] })
   }
 
@@ -248,48 +241,6 @@ export async function GET(req: Request) {
   const organizationId = definitionScope.organizationId
   const { resolve } = container
   const em = resolve('em') as any
-  const rbac = resolve('rbacService') as RbacService
-  const acl = await rbac.loadAcl(auth.sub ?? '', {
-    tenantId,
-    organizationId,
-  })
-  const designerCanRead = canReadAllEntityMetadata(acl)
-  const customEntityRestrictions = new Map<string, boolean>()
-  for (const entityId of selectableEntityIds) {
-    if (isOrmBackedSystemEntityId(em, entityId)) continue
-    const declaredRestriction = getDeclaredCustomEntityRestriction(entityId)
-    if (declaredRestriction !== undefined) customEntityRestrictions.set(entityId, declaredRestriction)
-  }
-  if (!designerCanRead) {
-    const unresolvedEntityIds = selectableEntityIds.filter(
-      (entityId) => !resolveEntityAclRequirement(entityId) && !customEntityRestrictions.has(entityId),
-    )
-    if (unresolvedEntityIds.length) {
-      const registrations = await em.find(CustomEntity as any, {
-        entityId: { $in: unresolvedEntityIds },
-        isActive: true,
-        $and: [
-          { $or: [{ tenantId }, { tenantId: null }] },
-          { $or: [{ organizationId }, { organizationId: null }] },
-        ],
-      } as any)
-      for (const registration of registrations as any[]) {
-        const entityId = String(registration.entityId)
-        if (!isOrmBackedSystemEntityId(em, entityId)) {
-          customEntityRestrictions.set(entityId, registration.accessRestricted === true)
-        }
-      }
-    }
-  }
-  const entityIds = selectableEntityIds.filter((entityId) => canReadEntityMetadata({
-    entityId,
-    isCustomEntity: customEntityRestrictions.has(entityId),
-    isRestricted: customEntityRestrictions.get(entityId) === true,
-    acl,
-  }))
-  if (!entityIds.length) {
-    return NextResponse.json({ items: [], fieldsetsByEntity: {}, entitySettings: {} })
-  }
   let cache: CacheStrategy | undefined
   try {
     cache = resolve('cache') as CacheStrategy
@@ -298,6 +249,7 @@ export async function GET(req: Request) {
   let canManageDefinitions = false
   if (typeof auth.sub === 'string' && auth.sub.length > 0) {
     try {
+      const rbac = resolve('rbacService') as RbacService
       canManageDefinitions = await rbac.userHasAllFeatures(auth.sub, ['entities.definitions.manage'], {
         tenantId,
         organizationId,
@@ -441,9 +393,6 @@ export async function GET(req: Request) {
         label: d.configJson?.label || d.key,
         description: d.configJson?.description || undefined,
         multi: Boolean(d.configJson?.multi),
-        relatedEntityId: d.kind === 'relation' && typeof d.configJson?.relatedEntityId === 'string'
-          ? d.configJson.relatedEntityId.trim() || undefined
-          : undefined,
         options: (() => {
           if (d.kind === 'currency') return undefined
           const normalizedOptions = normalizeCustomFieldOptions(d.configJson?.options)
@@ -710,7 +659,6 @@ const customFieldDefinitionSchema = z.object({
   label: z.string(),
   description: z.string().optional(),
   multi: z.boolean().optional(),
-  relatedEntityId: z.string().optional(),
   options: z.array(customFieldOptionValueSchema).optional(),
   optionsUrl: z.string().optional(),
   filterable: z.boolean().optional(),

package/src/modules/entities/api/entities.ts

@@ -10,8 +10,6 @@ import { isSystemEntitySelectable } from '@open-mercato/shared/lib/entities/syst
 import { SYSTEM_ENTITY_RECORDS_BLOCKED_CODE, isOrmBackedSystemEntityId } from '@open-mercato/shared/lib/data/engine'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
-import { canReadEntityMetadata, getDeclaredCustomEntityRestriction } from '../lib/entityAcl'
 import {
   beginEntitiesMutationGuard,
   ENTITY_DEFINITION_RESOURCE_KIND,
@@ -31,11 +29,6 @@ export async function GET(req: Request) {
 
   const { resolve } = await createRequestContainer()
   const em = resolve('em') as any
-  const rbac = resolve('rbacService') as RbacService
-  const acl = await rbac.loadAcl(auth.sub ?? '', {
-    tenantId: auth.tenantId,
-    organizationId: auth.orgId ?? null,
-  })
 
   // Generated entities from code
   const AllEntities = getEntityIds()
@@ -86,27 +79,8 @@ export async function GET(req: Request) {
     byId.set(cu.entityId, { ...existing, ...cu, source: existing?.source ?? cu.source })
   }
 
-  const visibleEntityIds = new Set(
-    Array.from(byId.values())
-      .filter((item: any) => {
-        const isOrmBacked = isOrmBackedSystemEntityId(em, item.entityId)
-        const declaredRestriction = isOrmBacked
-          ? undefined
-          : getDeclaredCustomEntityRestriction(item.entityId)
-        return canReadEntityMetadata({
-          entityId: item.entityId,
-          isCustomEntity: !isOrmBacked
-            && (item.source === 'custom' || declaredRestriction !== undefined),
-          isRestricted: declaredRestriction ?? item.accessRestricted === true,
-          acl,
-        })
-      })
-      .map((item: any) => item.entityId),
-  )
-  if (!visibleEntityIds.size) return NextResponse.json({ items: [] })
-
   // Count field definitions scoped to current tenant/org (same scoping as custom entities)
-  const defsWhere: any = { isActive: true, entityId: { $in: Array.from(visibleEntityIds) } }
+  const defsWhere: any = { isActive: true }
   defsWhere.$and = [
     //{ $or: [ { organizationId: auth.orgId ?? undefined as any }, { organizationId: null } ] }, // the entities and custom fields are defined per tenant
     { tenantId: auth.tenantId ?? undefined as any },
@@ -125,9 +99,7 @@ export async function GET(req: Request) {
   const counts: Record<string, number> = {}
   for (const [eid, set] of keySets.entries()) counts[eid] = set.size
 
-  const items = Array.from(byId.values())
-    .filter((item: any) => visibleEntityIds.has(item.entityId))
-    .map((item: any) => ({ ...item, count: counts[item.entityId] || 0 }))
+  const items = Array.from(byId.values()).map((it: any) => ({ ...it, count: counts[it.entityId] || 0 }))
   return NextResponse.json({ items })
 }
 

package/src/modules/entities/api/entity-settings.ts

@@ -3,10 +3,6 @@ import { z } from 'zod'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import { beginEntitiesMutationGuard } from './definitions.mutation-guard'
-import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
-import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import type { ModuleConfigService } from '../../configs/lib/module-config-service'
 
 // Tenant-scoped policy: when true, new custom entities are created with
 // `access_restricted = true` unless the create request explicitly sets the flag.
@@ -18,10 +14,24 @@ export const metadata = {
   PUT: { requireAuth: true, requireFeatures: ['entities.definitions.manage'] },
 }
 
+type ModuleConfigServiceLike = {
+  getValue: (
+    moduleId: string,
+    name: string,
+    options?: { defaultValue?: unknown; scope?: { tenantId?: string | null } },
+  ) => Promise<unknown>
+  setValue: (
+    moduleId: string,
+    name: string,
+    value: unknown,
+    scope?: { tenantId?: string | null },
+  ) => Promise<unknown>
+}
+
 async function readPolicy(tenantId: string | null): Promise<boolean> {
   try {
     const { resolve } = await createRequestContainer()
-    const moduleConfigService = resolve('moduleConfigService') as ModuleConfigService
+    const moduleConfigService = resolve('moduleConfigService') as ModuleConfigServiceLike
     const value = await moduleConfigService.getValue(CONFIG_MODULE, NEW_ENTITIES_RESTRICTED_KEY, {
       defaultValue: false,
       scope: { tenantId },
@@ -35,20 +45,12 @@ async function readPolicy(tenantId: string | null): Promise<boolean> {
 export async function GET(req: Request) {
   const auth = await getAuthFromRequest(req)
   if (!auth || !auth.tenantId) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-  const { resolve } = await createRequestContainer()
-  const moduleConfigService = resolve('moduleConfigService') as ModuleConfigService
-  const record = await moduleConfigService.getRecord(CONFIG_MODULE, NEW_ENTITIES_RESTRICTED_KEY, {
-    tenantId: auth.tenantId ?? null,
-  })
-  return NextResponse.json({
-    newEntitiesRestrictedByDefault: record ? record.value === true : false,
-    updatedAt: record ? record.updatedAt : null,
-  })
+  const newEntitiesRestrictedByDefault = await readPolicy(auth.tenantId ?? null)
+  return NextResponse.json({ newEntitiesRestrictedByDefault })
 }
 
 const putBodySchema = z.object({
   newEntitiesRestrictedByDefault: z.boolean(),
-  expectedUpdatedAt: z.string().optional(),
 })
 
 export async function PUT(req: Request) {
@@ -60,64 +62,19 @@ export async function PUT(req: Request) {
   if (!parsed.success) {
     return NextResponse.json({ error: 'Validation failed', details: parsed.error.flatten() }, { status: 400 })
   }
-  const container = await createRequestContainer()
-  const { resolve } = container
-  const moduleConfigService = resolve('moduleConfigService') as ModuleConfigService
-
-  const currentRecord = await moduleConfigService.getRecord(
-    CONFIG_MODULE,
-    NEW_ENTITIES_RESTRICTED_KEY,
-    { tenantId: auth.tenantId ?? null },
-  )
-
-  const guard = await beginEntitiesMutationGuard({
-    container,
-    auth,
-    req,
-    resourceKind: 'entities.settings',
-    resourceId: NEW_ENTITIES_RESTRICTED_KEY,
-    operation: currentRecord ? 'update' : 'create',
-    mutationPayload: parsed.data as unknown as Record<string, unknown>,
-  })
-  if (guard.blockedResponse) return guard.blockedResponse
-
-  const ifMatchHeader = req.headers.get('If-Match') || req.headers.get('x-om-ext-optimistic-lock-expected-updated-at')
-  const expectedUpdatedAt = ifMatchHeader || parsed.data.expectedUpdatedAt
-
-  try {
-    await enforceCommandOptimisticLockWithGuards(container, {
-      resourceKind: 'entities.settings',
-      resourceId: NEW_ENTITIES_RESTRICTED_KEY,
-      current: currentRecord ? currentRecord.updatedAt : null,
-      expected: expectedUpdatedAt,
-      request: req,
-    })
-  } catch (lockError) {
-    if (isCrudHttpError(lockError)) {
-      return NextResponse.json(lockError.body, { status: lockError.status })
-    }
-    throw lockError
-  }
-
-  const updatedRecord = await moduleConfigService.setValue(
+  const { resolve } = await createRequestContainer()
+  const moduleConfigService = resolve('moduleConfigService') as ModuleConfigServiceLike
+  await moduleConfigService.setValue(
     CONFIG_MODULE,
     NEW_ENTITIES_RESTRICTED_KEY,
     parsed.data.newEntitiesRestrictedByDefault,
     { tenantId: auth.tenantId ?? null },
   )
-
-  await guard.runAfterSuccess()
-
-  return NextResponse.json({
-    ok: true,
-    newEntitiesRestrictedByDefault: parsed.data.newEntitiesRestrictedByDefault,
-    updatedAt: updatedRecord ? updatedRecord.updatedAt : null,
-  })
+  return NextResponse.json({ ok: true, newEntitiesRestrictedByDefault: parsed.data.newEntitiesRestrictedByDefault })
 }
 
 const settingsResponseSchema = z.object({
   newEntitiesRestrictedByDefault: z.boolean(),
-  updatedAt: z.string().nullable().optional(),
 })
 
 export const openApi: OpenApiRouteDoc = {
@@ -137,10 +94,9 @@ export const openApi: OpenApiRouteDoc = {
       description: 'Sets the tenant-scoped default-restricted policy for new custom entities.',
       requestBody: { schema: putBodySchema },
       responses: [
-        { status: 200, description: 'Updated settings', schema: z.object({ ok: z.boolean(), newEntitiesRestrictedByDefault: z.boolean(), updatedAt: z.string().nullable().optional() }) },
+        { status: 200, description: 'Updated settings', schema: z.object({ ok: z.boolean(), newEntitiesRestrictedByDefault: z.boolean() }) },
         { status: 400, description: 'Invalid payload', schema: z.object({ error: z.string() }) },
         { status: 401, description: 'Missing authentication', schema: z.object({ error: z.string() }) },
-        { status: 409, description: 'Optimistic lock conflict', schema: z.object({ code: z.string(), error: z.string() }) },
       ],
     },
   },

package/src/modules/entities/api/records.ts

@@ -14,11 +14,35 @@ import { CustomFieldValue } from '../data/entities'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import { assertEntityAclForRequest, getDeclaredCustomEntityRestriction } from '../lib/entityAcl'
+import { getModules } from '@open-mercato/shared/lib/i18n/server'
+import { assertEntityAclForRequest } from '../lib/entityAcl'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('entities').child({ component: 'records' })
 
+let declaredCustomEntityRestricted: Map<string, boolean> | null = null
+function loadDeclaredCustomEntities(): Map<string, boolean> {
+  if (declaredCustomEntityRestricted === null) {
+    try {
+      const mods = getModules() as Array<{ customEntities?: Array<{ id?: string; accessRestricted?: boolean }> }>
+      const map = new Map<string, boolean>()
+      for (const mod of mods ?? []) {
+        for (const spec of mod?.customEntities ?? []) {
+          if (spec?.id) map.set(spec.id, spec.accessRestricted === true)
+        }
+      }
+      // Cache even when empty so we don't rebuild on every request (and fall back
+      // to the DB lookup unnecessarily). Only a thrown getModules() leaves it null
+      // so a genuinely-uninitialized registry is retried.
+      declaredCustomEntityRestricted = map
+    } catch {}
+  }
+  return declaredCustomEntityRestricted ?? new Map<string, boolean>()
+}
+function isDeclaredCustomEntity(entityId: string): boolean {
+  return loadDeclaredCustomEntities().has(entityId)
+}
+
 type RecordsEntityScope = { tenantId: string | null; organizationId: string | null }
 
 // Resolve the CustomEntity registration that applies to THIS caller, most-specific
@@ -62,8 +86,8 @@ type RecordsEntityClassification = { kind: RecordsEntityKind; restricted: boolea
 // or an active `custom_entities` registration is authoritative.
 async function classifyRecordsEntity(em: any, entityId: string, scope: RecordsEntityScope): Promise<RecordsEntityClassification> {
   if (isOrmBackedSystemEntityId(em, entityId)) return { kind: 'system', restricted: false }
-  const declaredRestriction = getDeclaredCustomEntityRestriction(entityId)
-  if (declaredRestriction !== undefined) return { kind: 'custom', restricted: declaredRestriction }
+  const declared = loadDeclaredCustomEntities()
+  if (declared.has(entityId)) return { kind: 'custom', restricted: declared.get(entityId) === true }
   try {
     const { CustomEntity } = await import('../data/entities')
     // Restriction is decided from the row that applies to THIS caller's scope so

package/src/modules/entities/api/relations/options.ts

@@ -8,6 +8,8 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import type { QueryEngine } from '@open-mercato/shared/lib/query/types'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
+import { resolveRegisteredEntityTableName } from '@open-mercato/shared/lib/query/engine'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['entities.definitions.view'] },
@@ -15,6 +17,8 @@ export const metadata = {
 
 const ALLOWED_ROUTE_CONTEXT_FIELDS = new Set(['kind', 'entity_id', 'product_id'])
 
+const logger = createLogger('entities')
+
 export async function GET(req: Request) {
   const url = new URL(req.url)
   const entityId = url.searchParams.get('entityId') || ''
@@ -44,17 +48,27 @@ export async function GET(req: Request) {
   const qe = container.resolve('queryEngine') as QueryEngine
   const em = container.resolve('em') as EntityManager
 
-  if (!labelField) {
-    const cfg = await em.findOne(CustomEntity, {
-      entityId,
-      $and: [
-        { $or: [ { organizationId: auth.orgId ?? undefined as any }, { organizationId: null } ] },
-        { $or: [ { tenantId: auth.tenantId ?? undefined as any }, { tenantId: null } ] },
-      ],
-      isActive: true,
-    })
-    labelField = (cfg?.labelField as string | undefined) || ''
+  const customEntity = await em.findOne(CustomEntity, {
+    entityId,
+    $and: [
+      { $or: [ { organizationId: auth.orgId ?? undefined as any }, { organizationId: null } ] },
+      { $or: [ { tenantId: auth.tenantId ?? undefined as any }, { tenantId: null } ] },
+    ],
+    isActive: true,
+  })
+
+  // A relation field can point at an entity that does not exist — most often a half-configured
+  // `relatedEntityId` that was never filled in (#4949 reported `entityId=p:0`). The query engine
+  // falls back to a pluralized table-name guess for ids it cannot resolve, so such a lookup used
+  // to reach Postgres as `select ... from "0s"` and escape this handler as an unhandled 500 on
+  // every render of the section holding the field. Resolve the id first and answer with an empty
+  // option list instead, mirroring the empty-`entityId` contract above.
+  if (!customEntity && resolveRegisteredEntityTableName(em, entityId) === null) {
+    logger.warn('Relation options requested for an unresolvable entity id', { entityId })
+    return NextResponse.json({ items: [] })
   }
+
+  if (!labelField) labelField = (customEntity?.labelField as string | undefined) || ''
   if (!labelField) {
     const candidates = ['name', 'title', 'code', 'email']
     const table = tableNameFromEntityId(entityId)
@@ -122,7 +136,7 @@ export const openApi: OpenApiRouteDoc = {
   methods: {
     GET: {
       summary: 'List relation options',
-      description: 'Returns up to 200 option entries for populating relation dropdowns, automatically resolving label fields when omitted.',
+      description: 'Returns up to 200 option entries for populating relation dropdowns, automatically resolving label fields when omitted. An entityId that matches neither an active custom entity nor a registered ORM entity yields an empty option list.',
       query: relationOptionsQuerySchema,
       responses: [
         {