@open-mercato/core 0.6.5-develop.4534.1.b459babe6d → 0.6.5-develop.4544.1.71c003c861

package/src/modules/dictionaries/api/[dictionaryId]/route.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 import { Dictionary } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { resolveDictionariesRouteContext } from '@open-mercato/core/modules/dictionaries/api/context'
 import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import {
   resolveDictionaryEntrySortMode,
@@ -16,10 +17,18 @@ import {
   dictionaryUpdateSchema,
   upsertDictionarySchema,
 } from '../openapi'
+import { dictionaryKeySchema } from '@open-mercato/core/modules/dictionaries/data/validators'
 
 const paramsSchema = z.object({ dictionaryId: z.string().uuid() })
+// System dictionaries use namespaced keys (e.g. `sales.deal_loss_reason`,
+// `resources.activity-types`) that the strict create-key regex rejects. The
+// manager edit dialog disables the key field but still resubmits the existing
+// key, so the update parse must accept any stored key verbatim. The strict
+// user-key regex is only enforced below when the key actually changes.
+const updateKeySchema = z.string().trim().min(1).max(100)
 const updateSchema = upsertDictionarySchema
   .partial()
+  .extend({ key: updateKeySchema.optional() })
   .refine((data) => Object.keys(data).length > 0, {
     message: 'Provide at least one field to update.',
   })
@@ -102,6 +111,13 @@ export async function PATCH(req: Request, ctx: { params?: { dictionaryId?: strin
     const payload = updateSchema.parse(await req.json().catch(() => ({})))
     const dictionary = await loadDictionary(context, dictionaryId)
 
+    enforceCommandOptimisticLock({
+      resourceKind: 'dictionaries.dictionary',
+      resourceId: dictionary.id,
+      current: dictionary.updatedAt ?? null,
+      request: req,
+    })
+
     if (isProtectedCurrencyDictionary(dictionary)) {
       if (payload.key && payload.key.trim().toLowerCase() !== dictionary.key) {
         throw new CrudHttpError(400, { error: context.translate('dictionaries.errors.currency_protected', 'The currency dictionary cannot be modified or deleted.') })
@@ -114,6 +130,10 @@ export async function PATCH(req: Request, ctx: { params?: { dictionaryId?: strin
     if (payload.key) {
       const key = payload.key.trim().toLowerCase()
       if (key !== dictionary.key) {
+        const strictKey = dictionaryKeySchema.safeParse(key)
+        if (!strictKey.success) {
+          throw new CrudHttpError(400, { error: context.translate('dictionaries.errors.invalid_key', 'Use lowercase letters, numbers, hyphen, or underscore.') })
+        }
         const organizationId = context.organizationId
         if (!organizationId) {
           throw new CrudHttpError(400, { error: context.translate('dictionaries.errors.organization_required', 'Organization context is required') })
@@ -168,6 +188,9 @@ export async function PATCH(req: Request, ctx: { params?: { dictionaryId?: strin
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: err.issues[0]?.message ?? 'Validation failed' }, { status: 400 })
+    }
     console.error('[dictionaries/:id.PATCH] Unexpected error', err)
     return NextResponse.json({ error: 'Failed to update dictionary' }, { status: 500 })
   }

package/src/modules/dictionaries/components/DictionariesManager.tsx

@@ -15,7 +15,9 @@ import {
 } from '@open-mercato/ui/primitives/select'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { DictionaryEntriesEditor } from './DictionaryEntriesEditor'
@@ -36,6 +38,7 @@ export type DictionarySummary = {
   organizationId: string
   isInherited: boolean
   managerVisibility: 'default' | 'hidden'
+  updatedAt?: string | null
 }
 
 type DialogState = {
@@ -113,6 +116,7 @@ export function DictionariesManager() {
             isInherited: item.isInherited === true,
             managerVisibility:
               item.managerVisibility === 'hidden' ? 'hidden' : 'default',
+            updatedAt: typeof item.updatedAt === 'string' ? item.updatedAt : null,
           }))
         : []
       const filtered = list.filter((dictionary: DictionarySummary) => dictionary.managerVisibility !== 'hidden')
@@ -232,13 +236,20 @@ export function DictionariesManager() {
         }
         flash(t('dictionaries.config.success.create', 'Dictionary created.'), 'success')
       } else if (dialog.dictionary) {
-        const call = await apiCall<Record<string, unknown>>(`/api/dictionaries/${dialog.dictionary.id}`, {
-          method: 'PATCH',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify(payload),
-        })
+        const call = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(dialog.dictionary.updatedAt),
+          () =>
+            apiCall<Record<string, unknown>>(`/api/dictionaries/${dialog.dictionary!.id}`, {
+              method: 'PATCH',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify(payload),
+            }),
+        )
         if (!call.ok) {
-          throw new Error(typeof call.result?.error === 'string' ? call.result.error : 'Failed to update dictionary')
+          throw Object.assign(
+            new Error(typeof call.result?.error === 'string' ? call.result.error : 'Failed to update dictionary'),
+            { status: call.status, ...(call.result && typeof call.result === 'object' ? call.result : {}) },
+          )
         }
         flash(t('dictionaries.config.success.update', 'Dictionary updated.'), 'success')
       }
@@ -246,6 +257,9 @@ export function DictionariesManager() {
       await loadDictionaries()
       setErrors({})
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) {
+        return
+      }
       console.error('Failed to save dictionary', err)
       flash(t('dictionaries.config.error.save', 'Failed to save dictionary.'), 'error')
     } finally {
@@ -274,13 +288,22 @@ export function DictionariesManager() {
       if (!confirmed) return
       setDeleting(dictionary.id)
       try {
-        const call = await apiCall<Record<string, unknown>>(`/api/dictionaries/${dictionary.id}`, { method: 'DELETE' })
+        const call = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(dictionary.updatedAt),
+          () => apiCall<Record<string, unknown>>(`/api/dictionaries/${dictionary.id}`, { method: 'DELETE' }),
+        )
         if (!call.ok) {
-          throw new Error(typeof call.result?.error === 'string' ? call.result.error : 'Failed to delete dictionary')
+          throw Object.assign(
+            new Error(typeof call.result?.error === 'string' ? call.result.error : 'Failed to delete dictionary'),
+            { status: call.status, ...(call.result && typeof call.result === 'object' ? call.result : {}) },
+          )
         }
         flash(t('dictionaries.config.success.delete', 'Dictionary deleted.'), 'success')
         await loadDictionaries()
       } catch (err) {
+        if (surfaceRecordConflict(err, t)) {
+          return
+        }
         console.error('Failed to delete dictionary', err)
         flash(t('dictionaries.config.error.delete', 'Failed to delete dictionary.'), 'error')
       } finally {

package/src/modules/dictionaries/components/DictionaryEntriesEditor.tsx

@@ -14,7 +14,9 @@ import {
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@open-mercato/ui/primitives/table'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { useQueryClient } from '@tanstack/react-query'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -45,6 +47,7 @@ type FormState = {
   label: string
   color: string | null
   icon: string | null
+  updatedAt?: string | null
 }
 
 export function DictionaryEntriesEditor({ dictionaryId, dictionaryName, readOnly = false }: DictionaryEntriesEditorProps) {
@@ -93,6 +96,7 @@ export function DictionaryEntriesEditor({ dictionaryId, dictionaryName, readOnly
           label: entry.label,
           color: entry.color ?? null,
           icon: entry.icon ?? null,
+          updatedAt: entry.updatedAt ?? null,
         })
         appearance.setColor(entry.color ?? null)
         appearance.setIcon(entry.icon ?? null)
@@ -136,17 +140,22 @@ export function DictionaryEntriesEditor({ dictionaryId, dictionaryName, readOnly
         icon: appearance.icon,
       }
       if (formState.id) {
-        const call = await apiCall<Record<string, unknown>>(
-          `/api/dictionaries/${dictionaryId}/entries/${formState.id}`,
-          {
-            method: 'PATCH',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(payload),
-          },
+        const call = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(formState.updatedAt),
+          () =>
+            apiCall<Record<string, unknown>>(
+              `/api/dictionaries/${dictionaryId}/entries/${formState.id}`,
+              {
+                method: 'PATCH',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify(payload),
+              },
+            ),
         )
         if (!call.ok) {
-          throw new Error(
-            typeof call.result?.error === 'string' ? call.result.error : 'Failed to save dictionary entry',
+          throw Object.assign(
+            new Error(typeof call.result?.error === 'string' ? call.result.error : 'Failed to save dictionary entry'),
+            { status: call.status, ...(call.result && typeof call.result === 'object' ? call.result : {}) },
           )
         }
         flash(t('dictionaries.config.entries.success.update', 'Dictionary entry updated.'), 'success')
@@ -173,12 +182,15 @@ export function DictionaryEntriesEditor({ dictionaryId, dictionaryName, readOnly
       appearance.setIcon(null)
       setErrors({})
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) {
+        return
+      }
       console.error('Failed to save dictionary entry', err)
       flash(t('dictionaries.config.entries.error.save', 'Failed to save dictionary entry.'), 'error')
     } finally {
       setIsSaving(false)
     }
-  }, [appearance, dictionaryId, formState.id, formState.label, formState.value, queryClient, readOnly, readOnlyMessage, t])
+  }, [appearance, dictionaryId, formState.id, formState.label, formState.updatedAt, formState.value, queryClient, readOnly, readOnlyMessage, t])
 
   const handleDelete = React.useCallback(
     async (entry: Entry) => {
@@ -194,9 +206,13 @@ export function DictionaryEntriesEditor({ dictionaryId, dictionaryName, readOnly
       if (!confirmDelete) return
       setIsDeleting(true)
       try {
-        const call = await apiCall<Record<string, unknown>>(
-          `/api/dictionaries/${dictionaryId}/entries/${entry.id}`,
-          { method: 'DELETE' },
+        const call = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(entry.updatedAt),
+          () =>
+            apiCall<Record<string, unknown>>(
+              `/api/dictionaries/${dictionaryId}/entries/${entry.id}`,
+              { method: 'DELETE' },
+            ),
         )
         if (!call.ok) {
           throw new Error(

package/src/modules/dictionaries/i18n/de.json

@@ -109,6 +109,7 @@
   "dictionaries.errors.entry_not_found": "Wörterbucheintrag nicht gefunden",
   "dictionaries.errors.entry_required": "Wert ist erforderlich",
   "dictionaries.errors.entry_update_failed": "Wörterbucheintrag konnte nicht aktualisiert werden.",
+  "dictionaries.errors.invalid_key": "Verwenden Sie Kleinbuchstaben, Zahlen, Bindestrich oder Unterstrich.",
   "dictionaries.errors.not_found": "Wörterbuch nicht gefunden",
   "dictionaries.errors.organization_required": "Organisationskontext ist erforderlich",
   "dictionaries.errors.unauthorized": "Nicht autorisiert",

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

@@ -109,6 +109,7 @@
   "dictionaries.errors.entry_not_found": "Dictionary entry not found",
   "dictionaries.errors.entry_required": "Value is required",
   "dictionaries.errors.entry_update_failed": "Failed to update dictionary entry.",
+  "dictionaries.errors.invalid_key": "Use lowercase letters, numbers, hyphen, or underscore.",
   "dictionaries.errors.not_found": "Dictionary not found",
   "dictionaries.errors.organization_required": "Organization context is required",
   "dictionaries.errors.unauthorized": "Unauthorized",

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

@@ -109,6 +109,7 @@
   "dictionaries.errors.entry_not_found": "Entrada de diccionario no encontrada",
   "dictionaries.errors.entry_required": "El valor es obligatorio",
   "dictionaries.errors.entry_update_failed": "Error al actualizar la entrada de diccionario.",
+  "dictionaries.errors.invalid_key": "Usa letras minúsculas, números, guion o guion bajo.",
   "dictionaries.errors.not_found": "Diccionario no encontrado",
   "dictionaries.errors.organization_required": "Se requiere un contexto de organización",
   "dictionaries.errors.unauthorized": "No autorizado",

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

@@ -109,6 +109,7 @@
   "dictionaries.errors.entry_not_found": "Nie znaleziono wpisu słownika",
   "dictionaries.errors.entry_required": "Wartość jest wymagana",
   "dictionaries.errors.entry_update_failed": "Nie udało się zaktualizować wpisu słownikowego.",
+  "dictionaries.errors.invalid_key": "Użyj małych liter, cyfr, łącznika lub podkreślenia.",
   "dictionaries.errors.not_found": "Nie znaleziono słownika",
   "dictionaries.errors.organization_required": "Wymagany jest kontekst organizacji",
   "dictionaries.errors.unauthorized": "Brak autoryzacji",

package/src/modules/directory/api/organizations/route.ts

@@ -446,8 +446,10 @@ export async function GET(req: Request) {
   const orgs = await em.find(Organization, orgListFilter, { orderBy: { name: 'ASC' } })
   const hierarchy = computeHierarchyForOrganizations(orgs, tenantId)
   const slugByOrgId = new Map<string, string | null>()
+  const updatedAtByOrgId = new Map<string, string | null>()
   for (const org of orgs) {
     slugByOrgId.set(String(org.id), org.slug ?? null)
+    updatedAtByOrgId.set(String(org.id), org.updatedAt instanceof Date ? org.updatedAt.toISOString() : null)
   }
 
   // Manage view: paginated flat list for a single tenant
@@ -510,6 +512,7 @@ export async function GET(req: Request) {
       id: node.id,
       name: node.name,
       slug: slugByOrgId.get(recordId) ?? null,
+      updatedAt: updatedAtByOrgId.get(recordId) ?? null,
       tenantId: node.tenantId,
       tenantName,
       parentId: node.parentId,

package/src/modules/directory/backend/directory/organizations/[id]/edit/page.tsx

@@ -35,6 +35,8 @@ type OrganizationResponse = {
     descendantIds: string[]
     isActive: boolean
     pathLabel: string
+    updatedAt?: string | null
+    updated_at?: string | null
   } & Record<string, unknown>>
 }
 
@@ -145,6 +147,11 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
           parentId: record.parentId || '',
           isActive: record.isActive,
           tenantId: resolvedTenantId,
+          updatedAt: typeof record.updatedAt === 'string'
+            ? record.updatedAt
+            : typeof record.updated_at === 'string'
+              ? record.updated_at
+              : null,
           ...customValues,
         })
         setPathLabel(record.pathLabel)
@@ -310,6 +317,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
           groups={groups}
           entityId={E.directory.organization}
           initialValues={initialValues ?? { id: orgId, tenantId: tenantId ?? null, name: '', slug: '', parentId: '', isActive: true, childIds: [] }}
+          optimisticLockUpdatedAt={typeof initialValues?.updatedAt === 'string' ? initialValues.updatedAt : null}
           isLoading={loading}
           loadingMessage={t('directory.organizations.form.loading', 'Loading organization...')}
           submitLabel={t('directory.organizations.form.action.save', 'Save')}

package/src/modules/directory/backend/directory/organizations/page.tsx

@@ -9,7 +9,8 @@ import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import type { FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { apiCall, apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
@@ -32,6 +33,7 @@ type OrganizationRow = {
   childrenCount: number
   descendantsCount: number
   isActive: boolean
+  updatedAt?: string | null
 }
 
 type OrganizationsResponse = {
@@ -184,10 +186,13 @@ export default function DirectoryOrganizationsPage() {
     if (!confirmed) return
 
     try {
-      await apiCallOrThrow(
-        `/api/directory/organizations?id=${encodeURIComponent(org.id)}`,
-        { method: 'DELETE' },
-        { errorMessage: t('directory.organizations.list.error.delete', 'Failed to delete organization') },
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(org.updatedAt),
+        () => apiCallOrThrow(
+          `/api/directory/organizations?id=${encodeURIComponent(org.id)}`,
+          { method: 'DELETE' },
+          { errorMessage: t('directory.organizations.list.error.delete', 'Failed to delete organization') },
+        ),
       )
       await queryClient.invalidateQueries({ queryKey: ['directory-organizations'] })
       flash(t('directory.organizations.flash.deleted', 'Organization deleted'), 'success')

package/src/modules/directory/backend/directory/tenants/[id]/edit/page.tsx

@@ -6,7 +6,8 @@ import { CrudForm, type CrudField, type CrudFormGroup } from '@open-mercato/ui/b
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
-import { readApiResultOrThrow, apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
@@ -15,6 +16,7 @@ type TenantFormValues = {
   id: string
   name: string
   isActive: boolean
+  updatedAt?: string | null
 } & Record<string, unknown>
 
 export default function EditTenantPage({ params }: { params?: { id?: string } }) {
@@ -57,6 +59,11 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
           id: String(row.id),
           name: String(row.name),
           isActive: !!row.isActive,
+          updatedAt: typeof row.updatedAt === 'string'
+            ? row.updatedAt
+            : typeof row.updated_at === 'string'
+              ? row.updated_at
+              : null,
           ...cfValues,
         }
         if (!cancelled) setInitial(values)
@@ -114,6 +121,7 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
           groups={groups}
           entityId={E.directory.tenant}
           initialValues={(initial || { id: tenantId, name: '', isActive: true }) as Partial<TenantFormValues>}
+          optimisticLockUpdatedAt={initial?.updatedAt}
           isLoading={loading}
           loadingMessage={t('directory.tenants.form.loading', 'Loading tenant…')}
           submitLabel={t('common.save', 'Save')}
@@ -137,10 +145,13 @@ export default function EditTenantPage({ params }: { params?: { id?: string } })
             await updateCrud('directory/tenants', payload)
           }}
           onDelete={async () => {
-            const call = await apiCall(
-              `/api/directory/tenants?id=${encodeURIComponent(tenantId)}`,
-              { method: 'DELETE' },
-            )
+            const headers = buildOptimisticLockHeader(initial?.updatedAt)
+            const call = await withScopedApiRequestHeaders(headers, () => (
+              apiCall(
+                `/api/directory/tenants?id=${encodeURIComponent(tenantId)}`,
+                { method: 'DELETE' },
+              )
+            ))
             if (!call.ok) {
               await raiseCrudError(call.response, t('directory.tenants.form.errors.delete', 'Failed to delete tenant'))
             }

package/src/modules/directory/backend/directory/tenants/page.tsx

@@ -9,7 +9,8 @@ import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import type { FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
@@ -125,9 +126,12 @@ export default function DirectoryTenantsPage() {
     if (!confirmed) return
 
     try {
-      const call = await apiCall(
-        `/api/directory/tenants?id=${encodeURIComponent(tenant.id)}`,
-        { method: 'DELETE' },
+      const call = await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(tenant.updatedAt),
+        () => apiCall(
+          `/api/directory/tenants?id=${encodeURIComponent(tenant.id)}`,
+          { method: 'DELETE' },
+        ),
       )
       if (!call.ok) {
         await raiseCrudError(call.response, t('directory.tenants.list.error.delete', 'Failed to delete tenant'))

package/src/modules/directory/commands/organizations.ts

@@ -689,7 +689,10 @@ const deleteOrganizationCommand: CommandHandler<{ body: any; query: Record<strin
         setInternalTenantId(deleted, tenantId)
         deleted.isActive = false
         deleted.parentId = null
-
+        resolvedDeleted = deleted
+      },
+      async () => {
+        const deleted = resolvedDeleted
         const childrenFilter: FilterQuery<Organization> = { tenant: tenantId, parentId: id, deletedAt: null }
         const children = await em.find(Organization, childrenFilter)
         const toPersist: Organization[] = []
@@ -698,11 +701,11 @@ const deleteOrganizationCommand: CommandHandler<{ body: any; query: Record<strin
           toPersist.push(child)
         }
         toPersist.push(deleted)
-        if (toPersist.length) await em.persist(toPersist).flush()
+        if (toPersist.length) em.persist(toPersist)
         setUndoMeta(deleted, { childParentsBefore: childSnapshotsBefore })
-
+      },
+      async () => {
         await rebuildHierarchyForTenant(em, tenantId)
-        resolvedDeleted = deleted
       },
     ], { transaction: true })
 

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

@@ -10,6 +10,34 @@ import { parseBooleanToken, parseBooleanWithDefault } from '@open-mercato/shared
 import { setRecordCustomFields } from '../lib/helpers'
 import { CustomFieldValue } from '../data/entities'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+
+const CUSTOM_ENTITY_RECORD_RESOURCE_KIND = 'entities.record'
+
+async function readCustomEntityRecordUpdatedAt(
+  em: any,
+  input: { entityType: string; entityId: string; organizationId: string | null },
+): Promise<string | null> {
+  try {
+    const db = em.getKysely()
+    let query = db
+      .selectFrom('custom_entities_storage' as any)
+      .select(['updated_at' as any])
+      .where('entity_type' as any, '=', input.entityType)
+      .where('entity_id' as any, '=', input.entityId)
+    query = input.organizationId === null
+      ? query.where('organization_id' as any, 'is', null as any)
+      : query.where('organization_id' as any, '=', input.organizationId)
+    const row = await query.executeTakeFirst()
+    const value = (row as any)?.updated_at
+    if (value instanceof Date) return value.toISOString()
+    if (typeof value === 'string' && value.length > 0) return value
+    return null
+  } catch {
+    return null
+  }
+}
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['entities.records.view'] },
@@ -85,6 +113,23 @@ export async function GET(req: Request) {
       const found = await em.findOne(CustomEntity as any, { entityId, isActive: true })
       isCustomEntity = !!found
     } catch {}
+    // Read/write symmetry: this endpoint writes every record to custom_entities_storage
+    // via the data engine, including module-declared custom entities whose id is a
+    // frozen system id and therefore never registered in `custom_entities`. Detect
+    // those by their doc-storage rows so `mapRow` strips the `cf_` prefix and the edit
+    // form can read back the saved values (mirrors HybridQueryEngine.isCustomEntity).
+    if (!isCustomEntity) {
+      try {
+        const db = em.getKysely()
+        const row = await db
+          .selectFrom('custom_entities_storage' as any)
+          .select(['entity_id' as any])
+          .where('entity_type' as any, '=', entityId)
+          .limit(1)
+          .executeTakeFirst()
+        isCustomEntity = !!row
+      } catch {}
+    }
     if (organizationIds && organizationIds.length === 0) {
       return NextResponse.json({ items: [], total: 0, page, pageSize, totalPages: 0 })
     }
@@ -164,6 +209,41 @@ export async function GET(req: Request) {
     const rawItems = res.items || []
     const viewPageItems = rawItems.map(mapRow)
     const fullPageItems = rawItems.map(mapFullRow)
+
+    // Expose `updated_at` on custom-entity records. The query engine returns only
+    // the `doc` fields + `id`, dropping the base `updated_at` column — which made
+    // optimistic locking impossible end-to-end (no version for the edit page to
+    // round-trip as the lock header). Batch-read it from storage and merge it in.
+    if (isCustomEntity && viewPageItems.length) {
+      try {
+        const recordIds = viewPageItems
+          .map((it: any) => it?.id)
+          .filter((v: any): v is string => typeof v === 'string' && v.length > 0)
+        if (recordIds.length) {
+          const db = em.getKysely()
+          const rows = await db
+            .selectFrom('custom_entities_storage' as any)
+            .select(['entity_id' as any, 'updated_at' as any])
+            .where('entity_type' as any, '=', entityId)
+            .where('entity_id' as any, 'in', recordIds as any)
+            .execute()
+          const updatedById = new Map<string, string>()
+          for (const row of rows as any[]) {
+            const value = row?.updated_at
+            const iso = value instanceof Date ? value.toISOString() : (typeof value === 'string' && value.length > 0 ? value : null)
+            if (iso && row?.entity_id) updatedById.set(String(row.entity_id), iso)
+          }
+          for (const item of viewPageItems as any[]) {
+            const iso = updatedById.get(String(item?.id))
+            if (iso) {
+              item.updated_at = iso
+              item.updatedAt = iso
+            }
+          }
+        }
+      } catch { /* best-effort: locking simply will not engage if storage is unavailable */ }
+    }
+
     const total = typeof res.total === 'number' ? res.total : rawItems.length
     const effectivePageSize = res.pageSize || pageSize
     const payload = {
@@ -343,6 +423,25 @@ export async function PUT(req: Request) {
       return NextResponse.json({ ok: true, item: { entityId, recordId: created.id } })
     }
 
+    try {
+      const currentUpdatedAt = await readCustomEntityRecordUpdatedAt(em, {
+        entityType: entityId,
+        entityId: rid,
+        organizationId: targetOrgId,
+      })
+      enforceCommandOptimisticLock({
+        resourceKind: CUSTOM_ENTITY_RECORD_RESOURCE_KIND,
+        resourceId: rid,
+        current: currentUpdatedAt,
+        request: req,
+      })
+    } catch (lockError) {
+      if (isCrudHttpError(lockError)) {
+        return NextResponse.json(lockError.body, { status: lockError.status })
+      }
+      throw lockError
+    }
+
     await de.updateCustomEntityRecord({
       entityId,
       recordId: rid,

package/src/modules/entities/backend/entities/user/[entityId]/records/[recordId]/page.tsx

@@ -79,6 +79,13 @@ export default function EditRecordPage({ params }: { params: { entityId?: string
       entityId={entityId}
       customEntity
       initialValues={initialValues || {}}
+      optimisticLockUpdatedAt={
+        typeof initialValues?.updatedAt === 'string'
+          ? initialValues.updatedAt
+          : typeof initialValues?.updated_at === 'string'
+            ? initialValues.updated_at
+            : null
+      }
       isLoading={loading}
       loadingMessage={t('entities.userEntities.records.loading', 'Loading record...')}
       submitLabel={t('entities.userEntities.records.form.submitSave', 'Save')}

package/src/modules/entities/backend/entities/user/[entityId]/records/page.tsx

@@ -11,7 +11,8 @@ import { ContextHelp } from '@open-mercato/ui/backend/ContextHelp'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import Link from 'next/link'
-import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
@@ -349,9 +350,12 @@ export RECORD_ID="<record uuid>"`}</code></pre>
                       variant: 'destructive',
                     })
                     if (!confirmed) return
-                    const deleteCall = await apiCall(
-                      `/api/entities/records?entityId=${encodeURIComponent(entityId)}&recordId=${encodeURIComponent(String((row as any).id))}`,
-                      { method: 'DELETE' },
+                    const deleteCall = await withScopedApiRequestHeaders(
+                      buildOptimisticLockHeader((row as any).updatedAt),
+                      () => apiCall(
+                        `/api/entities/records?entityId=${encodeURIComponent(entityId)}&recordId=${encodeURIComponent(String((row as any).id))}`,
+                        { method: 'DELETE' },
+                      ),
                     )
                     if (!deleteCall.ok) {
                       await raiseCrudError(deleteCall.response, 'Failed to delete record')