@open-mercato/core 0.6.5-develop.4534.1.b459babe6d → 0.6.5-develop.4559.1.839e136509

package/src/modules/business_rules/backend/rules/page.tsx

@@ -8,7 +8,8 @@ import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import type { ColumnDef } from '@tanstack/react-table'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
-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 { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -92,9 +93,13 @@ export default function RulesListPage() {
     })
     if (!confirmed) return
 
-    const result = await apiCall(`/api/business_rules/rules?id=${id}`, {
-      method: 'DELETE',
-    })
+    const record = (data || []).find((item) => item.id === id)
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(record?.updatedAt),
+      () => apiCall(`/api/business_rules/rules?id=${id}`, {
+        method: 'DELETE',
+      }),
+    )
 
     if (result.ok) {
       flash(t('business_rules.messages.deleted'), 'success')
@@ -105,14 +110,18 @@ export default function RulesListPage() {
   }
 
   const handleToggleEnabled = async (id: string, currentEnabled: boolean) => {
-    const result = await apiCall('/api/business_rules/rules', {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        id,
-        enabled: !currentEnabled,
+    const record = (data || []).find((item) => item.id === id)
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(record?.updatedAt),
+      () => apiCall('/api/business_rules/rules', {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          id,
+          enabled: !currentEnabled,
+        }),
       }),
-    })
+    )
 
     if (result.ok) {
       flash(t('business_rules.messages.updated'), 'success')

package/src/modules/business_rules/backend/sets/[id]/page.tsx

@@ -9,8 +9,11 @@ import { CrudForm } from '@open-mercato/ui/backend/CrudForm'
 import type { CrudField } from '@open-mercato/ui/backend/CrudForm'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { apiFetch } from '@open-mercato/ui/backend/utils/api'
+import { apiFetch, withScopedApiHeaders } from '@open-mercato/ui/backend/utils/api'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { readJsonSafe } from '@open-mercato/ui/backend/utils/serverErrors'
+import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
@@ -85,15 +88,23 @@ export default function EditRuleSetPage() {
       ...values,
     }
 
-    const response = await apiFetch('/api/business_rules/sets', {
+    const updateSet = () => apiFetch('/api/business_rules/sets', {
       method: 'PUT',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(payload),
     })
+    const headers = buildOptimisticLockHeader(ruleSet?.updatedAt ?? null)
+    const response = Object.keys(headers).length
+      ? await withScopedApiHeaders(headers, updateSet)
+      : await updateSet()
 
     if (!response.ok) {
-      const error = await response.json()
-      throw new Error(error.error || error.message || t('business_rules.sets.errors.updateFailed'))
+      const body = (await readJsonSafe<Record<string, unknown>>(response)) ?? {}
+      const message =
+        (typeof body.error === 'string' && body.error) ||
+        (typeof body.message === 'string' && body.message) ||
+        t('business_rules.sets.errors.updateFailed')
+      throw new CrudHttpError(response.status, { ...body, error: message })
     }
 
     flash(t('business_rules.sets.messages.updated'), 'success')
@@ -265,6 +276,7 @@ export default function EditRuleSetPage() {
           schema={ruleSetFormSchema}
           fields={fields}
           initialValues={initialValues}
+          optimisticLockUpdatedAt={ruleSet.updatedAt}
           onSubmit={handleSubmit}
           cancelHref="/backend/sets"
           submitLabel={t('business_rules.sets.form.update')}

package/src/modules/business_rules/backend/sets/page.tsx

@@ -8,7 +8,8 @@ import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import type { ColumnDef } from '@tanstack/react-table'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
-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 { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -83,9 +84,13 @@ export default function RuleSetsListPage() {
     })
     if (!confirmed) return
 
-    const result = await apiCall(`/api/business_rules/sets?id=${id}`, {
-      method: 'DELETE',
-    })
+    const record = (data || []).find((item) => item.id === id)
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(record?.updatedAt),
+      () => apiCall(`/api/business_rules/sets?id=${id}`, {
+        method: 'DELETE',
+      }),
+    )
 
     if (result.ok) {
       flash(t('business_rules.sets.messages.deleted'), 'success')
@@ -96,14 +101,18 @@ export default function RuleSetsListPage() {
   }
 
   const handleToggleEnabled = async (id: string, currentEnabled: boolean) => {
-    const result = await apiCall('/api/business_rules/sets', {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        id,
-        enabled: !currentEnabled,
+    const record = (data || []).find((item) => item.id === id)
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(record?.updatedAt),
+      () => apiCall('/api/business_rules/sets', {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          id,
+          enabled: !currentEnabled,
+        }),
       }),
-    })
+    )
 
     if (result.ok) {
       flash(t('business_rules.sets.messages.updated'), 'success')

package/src/modules/catalog/api/categories/route.ts

@@ -99,6 +99,7 @@ type ManageCategoryRow = {
   childCount: number
   descendantCount: number
   isActive: boolean
+  updatedAt: string | null
   organizationId: string
   tenantId: string
 }
@@ -262,6 +263,7 @@ export async function GET(req: Request) {
       childCount: node.childIds.length,
       descendantCount: node.descendantIds.length,
       isActive: node.isActive,
+      updatedAt: category?.updatedAt ? new Date(category.updatedAt).toISOString() : null,
       organizationId,
       tenantId,
       ...(cfValues[recordId] ?? {}),
@@ -297,6 +299,7 @@ const categoryListItemSchema = z.object({
   childCount: z.number(),
   descendantCount: z.number(),
   isActive: z.boolean(),
+  updatedAt: z.string().nullable().optional(),
   organizationId: z.string().uuid(),
   tenantId: z.string().uuid(),
 })

package/src/modules/catalog/api/products/route.ts

@@ -425,6 +425,10 @@ async function decorateProductsAfterList(
         defaultMediaId: offer.defaultMediaId ?? null,
         defaultMediaUrl: offer.defaultMediaUrl ?? null,
         metadata: offer.metadata ?? null,
+        updatedAt:
+          offer.updatedAt instanceof Date
+            ? offer.updatedAt.toISOString()
+            : (typeof offer.updatedAt === "string" ? offer.updatedAt : null),
       });
       offersByProduct.set(productId, entry);
     }

package/src/modules/catalog/backend/catalog/categories/[id]/edit/page.tsx

@@ -22,6 +22,8 @@ type CategoryRow = {
   description: string | null
   parentId: string | null
   isActive: boolean
+  updatedAt?: string | null
+  updated_at?: string | null
   pathLabel?: string
 }
 
@@ -36,6 +38,7 @@ type CategoryFormValues = {
   description?: string
   parentId?: string | null
   isActive?: boolean
+  updatedAt?: string | null
 }
 
 async function submitCategoryUpdate(
@@ -116,6 +119,7 @@ export default function EditCatalogCategoryPage({ params }: { params?: { id?: st
           description: record.description ?? '',
           parentId: record.parentId ?? '',
           isActive: record.isActive,
+          updatedAt: record.updatedAt ?? record.updated_at ?? null,
           ...customValues,
         })
         setPathLabel(record.pathLabel ?? '')
@@ -238,6 +242,7 @@ export default function EditCatalogCategoryPage({ params }: { params?: { id?: st
           groups={groups}
           entityId={E.catalog.catalog_product_category}
           initialValues={initialValues ?? { id: categoryId, name: '', slug: '', description: '', parentId: '', isActive: true }}
+          optimisticLockUpdatedAt={initialValues?.updatedAt}
           isLoading={loading}
           loadingMessage={t('catalog.categories.form.loading', 'Loading category...')}
           submitLabel={t('catalog.categories.form.action.save', 'Save')}

package/src/modules/catalog/backend/catalog/products/[id]/page.tsx

@@ -37,7 +37,10 @@ import { Spinner } from "@open-mercato/ui/primitives/spinner";
 import {
   apiCall,
   readApiResultOrThrow,
+  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 { E } from "#generated/entities.ids.generated";
@@ -157,6 +160,8 @@ type VariantSummaryApi = {
   default_media_id?: string | null;
   defaultMediaId?: string | null;
   metadata?: Record<string, unknown> | null;
+  updated_at?: string | null;
+  updatedAt?: string | null;
 };
 
 type AttachmentListResponse = {
@@ -181,6 +186,7 @@ type VariantSummary = {
   defaultMediaId: string | null;
   prices: VariantPriceSummary[];
   optionValues: Record<string, string> | null;
+  updatedAt: string | null;
 };
 
 type VariantPriceListResponse = {
@@ -221,6 +227,7 @@ type OfferSnapshot = {
   isActive: boolean;
   channelName: string | null;
   channelCode: string | null;
+  updatedAt: string | null;
 };
 
 function mapVariantPriceSummary(
@@ -273,7 +280,7 @@ function readProductConversionRows(
 ): ProductUnitConversionDraft[] {
   const rows = Array.isArray(items) ? items : [];
   return rows
-    .map((item) => {
+    .map((item): ProductUnitConversionDraft | null => {
       const id = toTrimmedOrNull(item.id);
       const unitCode = canonicalizeUnitCode(item.unit_code ?? item.unitCode);
       const factor = toPositiveNumberOrNull(
@@ -298,6 +305,12 @@ function readProductConversionRows(
         toBaseFactor: String(factor),
         sortOrder: String(sortOrderRaw),
         isActive,
+        updatedAt:
+          typeof item.updated_at === "string"
+            ? item.updated_at
+            : typeof item.updatedAt === "string"
+              ? item.updatedAt
+              : null,
       } satisfies ProductUnitConversionDraft;
     })
     .filter((entry): entry is ProductUnitConversionDraft => Boolean(entry));
@@ -405,6 +418,12 @@ export default function EditCatalogProductPage({
                   : null,
             prices: priceMap[variantId] ?? [],
             optionValues,
+            updatedAt:
+              typeof variant.updatedAt === "string"
+                ? variant.updatedAt
+                : typeof variant.updated_at === "string"
+                  ? variant.updated_at
+                  : null,
           };
         })
         .filter((entry): entry is VariantSummary => Boolean(entry));
@@ -712,6 +731,12 @@ export default function EditCatalogProductPage({
           categoryIds,
           channelIds,
           tags: tagValues,
+          updatedAt:
+            typeof record.updatedAt === "string"
+              ? record.updatedAt
+              : typeof record.updated_at === "string"
+                ? record.updated_at
+                : null,
         };
         if (!cancelled) {
           setInitialValues({ ...initial, ...customValues });
@@ -1225,12 +1250,18 @@ export default function EditCatalogProductPage({
         try {
           for (const offer of removedOffers) {
             if (!offer.id) continue;
-            await deleteCrud("catalog/offers", offer.id, {
-              errorMessage: t(
-                "catalog.products.edit.offers.deleteError",
-                "Failed to remove sales channel offer.",
-              ),
-            });
+            const offerId = offer.id;
+            // Send the offer's own version, overriding the product header the
+            // parent CrudForm submit scope put on the stack (#2055).
+            await withScopedApiRequestHeaders(
+              buildOptimisticLockHeader(offer.updatedAt),
+              () => deleteCrud("catalog/offers", offerId, {
+                errorMessage: t(
+                  "catalog.products.edit.offers.deleteError",
+                  "Failed to remove sales channel offer.",
+                ),
+              }),
+            );
           }
         } catch (err) {
           console.error("catalog.products.edit.offers.delete", err);
@@ -1248,6 +1279,15 @@ export default function EditCatalogProductPage({
           .map((entry) => toTrimmedOrNull(entry.id))
           .filter((id): id is string => Boolean(id)),
       );
+      // Loaded conversion id → version, so the sync sends each row's own
+      // optimistic-lock version (overriding the product header leaked by the
+      // parent CrudForm submit scope onto the catalog/product-unit-conversions
+      // guard) (#2055).
+      const conversionVersions = new Map<string, string | null>();
+      for (const entry of initialConversionsRef.current) {
+        const cid = toTrimmedOrNull(entry.id);
+        if (cid) conversionVersions.set(cid, entry.updatedAt ?? null);
+      }
       const nextConversionIds = new Set(
         conversionInputs
           .map((entry) =>
@@ -1259,23 +1299,30 @@ export default function EditCatalogProductPage({
         (id) => !nextConversionIds.has(id),
       );
       for (const conversionId of removedConversionIds) {
-        await deleteCrud("catalog/product-unit-conversions", conversionId, {
-          errorMessage: t(
-            "catalog.products.uom.errors.sync",
-            "Failed to synchronize product conversions.",
-          ),
-        });
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(conversionVersions.get(conversionId) ?? null),
+          () => deleteCrud("catalog/product-unit-conversions", conversionId, {
+            errorMessage: t(
+              "catalog.products.uom.errors.sync",
+              "Failed to synchronize product conversions.",
+            ),
+          }),
+        );
       }
       const persistedConversions: ProductUnitConversionDraft[] = [];
       for (const conversion of conversionInputs) {
         if (conversion.id) {
-          await updateCrud("catalog/product-unit-conversions", {
-            id: conversion.id,
-            unitCode: conversion.unitCode,
-            toBaseFactor: conversion.toBaseFactor,
-            sortOrder: conversion.sortOrder,
-            isActive: conversion.isActive,
-          });
+          const conversionId = conversion.id;
+          await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(conversionVersions.get(conversionId) ?? null),
+            () => updateCrud("catalog/product-unit-conversions", {
+              id: conversionId,
+              unitCode: conversion.unitCode,
+              toBaseFactor: conversion.toBaseFactor,
+              sortOrder: conversion.sortOrder,
+              isActive: conversion.isActive,
+            }),
+          );
           persistedConversions.push({
             id: conversion.id,
             unitCode: conversion.unitCode,
@@ -1766,23 +1813,29 @@ function ProductOptionsSection({ values, setValue }: ProductFormGroupProps) {
 
   const handleDeleteSchema = React.useCallback(
     async (id: string) => {
+      const target = schemaTemplates.find((entry) => entry.id === id);
+      const lockVersion = target?.updatedAt ?? target?.updated_at ?? null;
       try {
-        await deleteCrud("catalog/option-schemas", id, {
-          errorMessage: t(
-            "catalog.products.edit.schemas.deleteError",
-            "Failed to delete schema.",
-          ),
-        });
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(lockVersion),
+          () => deleteCrud("catalog/option-schemas", id, {
+            errorMessage: t(
+              "catalog.products.edit.schemas.deleteError",
+              "Failed to delete schema.",
+            ),
+          }),
+        );
         flash(
           t("catalog.products.edit.schemas.deleted", "Schema deleted."),
           "success",
         );
         void loadSchemas();
       } catch (err) {
+        if (surfaceRecordConflict(err, t)) { void loadSchemas(); return; }
         console.error("catalog.option-schemas.delete failed", err);
       }
     },
-    [loadSchemas, t],
+    [loadSchemas, schemaTemplates, t],
   );
 
   const handleSaveSchema = React.useCallback(
@@ -1814,8 +1867,25 @@ function ProductOptionsSection({ values, setValue }: ProductFormGroupProps) {
         isActive: true,
       };
       if (schemaToEdit?.id) payload.id = schemaToEdit.id;
-      if (schemaToEdit?.id) await updateCrud("catalog/option-schemas", payload);
-      else await createCrud("catalog/option-schemas", payload);
+      try {
+        if (schemaToEdit?.id) {
+          const lockVersion = schemaToEdit.updatedAt ?? schemaToEdit.updated_at ?? null;
+          await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(lockVersion),
+            () => updateCrud("catalog/option-schemas", payload),
+          );
+        } else {
+          await createCrud("catalog/option-schemas", payload);
+        }
+      } catch (err) {
+        if (surfaceRecordConflict(err, t)) {
+          setSaveSchemaOpen(false);
+          setSchemaToEdit(null);
+          void loadSchemas();
+          return;
+        }
+        throw err;
+      }
       flash(
         t("catalog.products.edit.schemas.saved", "Schema saved."),
         "success",
@@ -2138,18 +2208,23 @@ function ProductVariantsSection({
       if (!confirmed) return;
       setDeletingId(variant.id);
       try {
-        await deleteCrud("catalog/variants", variant.id, {
-          errorMessage: t(
-            "catalog.variants.form.deleteError",
-            "Failed to delete variant.",
-          ),
-        });
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(variant.updatedAt),
+          () =>
+            deleteCrud("catalog/variants", variant.id, {
+              errorMessage: t(
+                "catalog.variants.form.deleteError",
+                "Failed to delete variant.",
+              ),
+            }),
+        );
         flash(
           t("catalog.variants.form.deleted", "Variant deleted."),
           "success",
         );
         onVariantDeleted(variant.id);
       } catch (err) {
+        if (surfaceRecordConflict(err, t)) return;
         console.error("catalog.products.edit.variants.delete", err);
         flash(
           t("catalog.variants.form.deleteError", "Failed to delete variant."),
@@ -2767,6 +2842,7 @@ function readOfferSnapshots(record: Record<string, unknown>): OfferSnapshot[] {
         getString(offer.channelName) ?? getString(offer.channel_name),
       channelCode:
         getString(offer.channelCode) ?? getString(offer.channel_code),
+      updatedAt: getString(offer.updatedAt) ?? getString(offer.updated_at) ?? null,
     });
   }
   return snapshots;
@@ -2867,6 +2943,7 @@ function mergeOfferSnapshots(
       isActive: entry.isActive ?? previous?.isActive ?? true,
       channelName: previous?.channelName ?? null,
       channelCode: previous?.channelCode ?? null,
+      updatedAt: previous?.updatedAt ?? null,
     };
   });
 }

package/src/modules/catalog/backend/catalog/products/[productId]/variants/[variantId]/page.tsx

@@ -7,7 +7,9 @@ import { CrudForm, type CrudFormGroup } from '@open-mercato/ui/backend/CrudForm'
 import { createCrud, updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
-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 { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -67,6 +69,17 @@ type AttachmentListResponse = {
   items?: ProductMediaItem[]
 }
 
+export function handleVariantDeleteError(
+  err: unknown,
+  t: (key: string, fallback?: string) => string,
+): void {
+  if (surfaceRecordConflict(err, t)) return
+  const message = err instanceof Error && err.message
+    ? err.message
+    : t('catalog.variants.form.deleteError', 'Failed to delete variant.')
+  flash(message, 'error')
+}
+
 function resolveVariantPriceLabel(prices: Record<string, VariantPriceDraft> | undefined): string | null {
   if (!prices || typeof prices !== 'object') return null
   const entries = Object.values(prices)
@@ -93,6 +106,10 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
   const [optionDefinitions, setOptionDefinitions] = React.useState<OptionDefinition[]>([])
   const [initialValues, setInitialValues] = React.useState<VariantFormValues | null>(null)
   const [existingPriceIds, setExistingPriceIds] = React.useState<Record<string, string>>({})
+  // price-kind id → loaded price `updatedAt`, so the price sync sends each price's
+  // own optimistic-lock version (the variant CrudForm submit scope would otherwise
+  // leak the variant's version onto the catalog/prices guard) (#2055).
+  const [existingPriceVersions, setExistingPriceVersions] = React.useState<Record<string, string | null>>({})
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [isNotFound, setIsNotFound] = React.useState(false)
@@ -191,10 +208,15 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
         const attachments = await fetchVariantAttachments(variantId!)
         const priceDrafts = await loadVariantPrices(variantId!, priceKinds)
         const priceIdMap: Record<string, string> = {}
+        const priceVersionMap: Record<string, string | null> = {}
         Object.entries(priceDrafts).forEach(([kindId, draft]) => {
-          if (draft.priceId) priceIdMap[kindId] = draft.priceId
+          if (draft.priceId) {
+            priceIdMap[kindId] = draft.priceId
+            priceVersionMap[kindId] = draft.updatedAt ?? null
+          }
         })
         setExistingPriceIds(priceIdMap)
+        setExistingPriceVersions(priceVersionMap)
         const customDefaults = extractCustomFieldEntries(record)
         let loadedOptionDefinitions: OptionDefinition[] = []
         if (resolvedProductId) {
@@ -300,6 +322,12 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
                 : typeof record.customFieldsetCode === 'string'
                   ? record.customFieldsetCode
                   : null,
+            updatedAt:
+              typeof record.updatedAt === 'string'
+                ? record.updatedAt
+                : typeof record.updated_at === 'string'
+                  ? record.updated_at
+                  : null,
             ...customDefaults,
           })
         }
@@ -429,6 +457,9 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
     : t('catalog.variants.form.editTitle', 'Edit variant')
   const productVariantsHref = `/backend/catalog/products/${currentProductId}#variants`
 
+  // When the variant was deleted (e.g. concurrently in another tab) the GET
+  // returns no record. Render a dedicated not-found state with a recovery link
+  // instead of an empty CrudForm that throws runtime errors (#2055 QA).
   if (isNotFound) {
     return (
       <Page>
@@ -549,6 +580,7 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
               priceKinds,
               priceDrafts: values.prices ?? {},
               existingPriceIds,
+              existingPriceVersions,
               productId: currentProductId,
               variantId,
               taxRates,
@@ -560,9 +592,14 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
             router.push(productVariantsHref)
           }}
           onDelete={async () => {
-            await deleteCrud('catalog/variants', variantId!, {
-              errorMessage: t('catalog.variants.form.deleteError', 'Failed to delete variant.'),
-            })
+            try {
+              await deleteCrud('catalog/variants', variantId!, {
+                errorMessage: t('catalog.variants.form.deleteError', 'Failed to delete variant.'),
+              })
+            } catch (err) {
+              handleVariantDeleteError(err, t)
+              throw err
+            }
             flash(t('catalog.variants.form.deleted', 'Variant deleted.'), 'success')
             router.push(productVariantsHref)
           }}
@@ -669,6 +706,7 @@ async function syncVariantPricesUpdate({
   priceKinds,
   priceDrafts,
   existingPriceIds,
+  existingPriceVersions,
   productId,
   variantId,
   taxRates,
@@ -679,6 +717,7 @@ async function syncVariantPricesUpdate({
   priceKinds: PriceKindSummary[]
   priceDrafts: Record<string, VariantPriceDraft>
   existingPriceIds: Record<string, string>
+  existingPriceVersions: Record<string, string | null>
   productId: string
   variantId: string
   taxRates: TaxRateSummary[]
@@ -700,10 +739,17 @@ async function syncVariantPricesUpdate({
     const draft = priceDrafts?.[kind.id]
     const amount = typeof draft?.amount === 'string' ? draft.amount.trim() : ''
     const existingId = draft?.priceId ?? existingPriceIds[kind.id]
+    // The price's own version — overrides the variant header the parent CrudForm
+    // submit scope put on the stack, so the catalog/prices guard compares the
+    // right row (otherwise a stale/false 409). #2055.
+    const lockVersion = draft?.updatedAt ?? existingPriceVersions[kind.id] ?? null
     if (!amount) {
       if (existingId) {
         try {
-          await deleteCrud('catalog/prices', existingId)
+          await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(lockVersion),
+            () => deleteCrud('catalog/prices', existingId),
+          )
         } catch (err) {
           console.error('catalog.prices.delete', err)
         }
@@ -723,7 +769,10 @@ async function syncVariantPricesUpdate({
     if (kind.displayMode === 'including-tax') payload.unitPriceGross = numeric
     else payload.unitPriceNet = numeric
     if (existingId) {
-      await updateCrud('catalog/prices', { id: existingId, ...payload })
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(lockVersion),
+        () => updateCrud('catalog/prices', { id: existingId, ...payload }),
+      )
     } else {
       await createCrud('catalog/prices', payload)
     }

package/src/modules/catalog/backend/catalog/products/optionSchemaClient.ts

@@ -20,6 +20,8 @@ export type OptionSchemaTemplateSummary = {
   name?: string | null
   description?: string | null
   schema?: OptionSchemaRecord | null
+  updatedAt?: string | null
+  updated_at?: string | null
 }
 
 type OptionSchemaTemplateListResponse = {