@open-mercato/core 0.6.4-develop.4371.1.8f3030407e → 0.6.4

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'
@@ -28,6 +30,8 @@ import {
   type PriceKindApiPayload,
   type TaxRateSummary,
   normalizePriceKindSummary,
+  normalizeTaxRateSummary,
+  mergeTaxRateSummaries,
 } from '@open-mercato/core/modules/catalog/components/products/productForm'
 import { parseNumericInput } from '@open-mercato/core/modules/catalog/components/products/productFormUtils'
 import {
@@ -67,6 +71,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 +108,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)
@@ -101,6 +120,32 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
   const [productTaxRateId, setProductTaxRateId] = React.useState<string | null>(null)
   const [productTaxRate, setProductTaxRate] = React.useState<number | null>(null)
 
+  const parseTaxRateSummary = React.useCallback(
+    (item: Record<string, unknown>) =>
+      normalizeTaxRateSummary(
+        item,
+        t('catalog.products.create.taxRates.unnamed', 'Untitled tax rate'),
+      ),
+    [t],
+  )
+
+  const fetchTaxRateById = React.useCallback(
+    async (taxRateId: string): Promise<TaxRateSummary | null> => {
+      const payload = await readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
+        `/api/sales/tax-rates?id=${encodeURIComponent(taxRateId)}&pageSize=1`,
+        undefined,
+        { errorMessage: t('catalog.products.create.taxRates.error', 'Failed to load tax rates.'), fallback: { items: [] } },
+      )
+      const items = Array.isArray(payload.items) ? payload.items : []
+      return (
+        items
+          .map((item) => parseTaxRateSummary(item))
+          .find((item): item is TaxRateSummary => item?.id === taxRateId) ?? null
+      )
+    },
+    [parseTaxRateSummary, t],
+  )
+
   React.useEffect(() => {
     const loadPriceKinds = async () => {
       try {
@@ -129,25 +174,9 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
         )
         const items = Array.isArray(payload.items) ? payload.items : []
         setTaxRates(
-          items.map((item) => {
-            const rawRate = typeof item.rate === 'number' ? item.rate : Number(item.rate ?? Number.NaN)
-            return {
-              id: String(item.id),
-              name:
-                typeof item.name === 'string' && item.name.trim().length
-                  ? item.name
-                  : t('catalog.products.create.taxRates.unnamed', 'Untitled tax rate'),
-              code: typeof item.code === 'string' && item.code.trim().length ? item.code : null,
-              rate: Number.isFinite(rawRate) ? rawRate : null,
-              isDefault: Boolean(
-                typeof item.isDefault === 'boolean'
-                  ? item.isDefault
-                  : typeof item.is_default === 'boolean'
-                    ? item.is_default
-                    : false,
-              ),
-            }
-          }),
+          items
+            .map((item) => parseTaxRateSummary(item))
+            .filter((item): item is TaxRateSummary => item !== null),
         )
       } catch (err) {
         console.error('sales.tax-rates.fetch failed', err)
@@ -155,7 +184,25 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
       }
     }
     loadTaxRates().catch(() => {})
-  }, [t])
+  }, [parseTaxRateSummary, t])
+
+  React.useEffect(() => {
+    const ids = [initialValues?.taxRateId, productTaxRateId].filter(
+      (value): value is string => typeof value === 'string' && value.length > 0,
+    )
+    const missingIds = ids.filter((id) => !taxRates.some((rate) => rate.id === id))
+    if (!missingIds.length) return
+    Promise.all(missingIds.map((id) => fetchTaxRateById(id).catch(() => null)))
+      .then((selectedRates) => {
+        setTaxRates((current) =>
+          selectedRates.reduce(
+            (next, selected) => mergeTaxRateSummaries(next, selected),
+            current,
+          ),
+        )
+      })
+      .catch(() => {})
+  }, [fetchTaxRateById, initialValues?.taxRateId, productTaxRateId, taxRates])
 
   React.useEffect(() => {
     if (!variantId || isCreateSentinel || priceKinds.length === 0) return
@@ -191,10 +238,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) {
@@ -253,6 +305,18 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
             }
           }
         }
+        const variantTaxRateId =
+          typeof (record as any).tax_rate_id === 'string'
+            ? (record as any).tax_rate_id
+            : typeof (record as any).taxRateId === 'string'
+              ? (record as any).taxRateId
+              : null
+        if (variantTaxRateId) {
+          const selectedVariantTaxRate = await fetchTaxRateById(variantTaxRateId).catch(() => null)
+          if (selectedVariantTaxRate && !cancelled) {
+            setTaxRates((current) => mergeTaxRateSummaries(current, selectedVariantTaxRate))
+          }
+        }
         if (!cancelled) {
           const optionValues =
             typeof record.option_values === 'object' && record.option_values
@@ -276,6 +340,7 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
           const base = createVariantInitialValues()
           setInitialValues({
             ...base,
+            id: variantId!,
             mediaDraftId: variantId!,
             name: typeof record.name === 'string' ? record.name : '',
             sku: typeof record.sku === 'string' ? record.sku : '',
@@ -288,18 +353,19 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
             defaultMediaId,
             defaultMediaUrl,
             prices: priceDrafts,
-            taxRateId:
-              typeof (record as any).tax_rate_id === 'string'
-                ? (record as any).tax_rate_id
-                : typeof (record as any).taxRateId === 'string'
-                  ? (record as any).taxRateId
-                  : null,
+            taxRateId: variantTaxRateId,
             customFieldsetCode:
               typeof record.custom_fieldset_code === 'string'
                 ? record.custom_fieldset_code
                 : typeof record.customFieldsetCode === 'string'
                   ? record.customFieldsetCode
                   : null,
+            updatedAt:
+              typeof record.updatedAt === 'string'
+                ? record.updatedAt
+                : typeof record.updated_at === 'string'
+                  ? record.updated_at
+                  : null,
             ...customDefaults,
           })
         }
@@ -315,7 +381,7 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
     }
     load()
     return () => { cancelled = true }
-  }, [variantId, t, currentProductId, priceKinds])
+  }, [variantId, t, currentProductId, fetchTaxRateById, priceKinds])
 
   const groups = React.useMemo<CrudFormGroup[]>(() => {
     const list: CrudFormGroup[] = [
@@ -429,6 +495,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 +618,7 @@ export default function EditVariantPage({ params }: { params?: { productId?: str
               priceKinds,
               priceDrafts: values.prices ?? {},
               existingPriceIds,
+              existingPriceVersions,
               productId: currentProductId,
               variantId,
               taxRates,
@@ -560,9 +630,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 +744,7 @@ async function syncVariantPricesUpdate({
   priceKinds,
   priceDrafts,
   existingPriceIds,
+  existingPriceVersions,
   productId,
   variantId,
   taxRates,
@@ -679,6 +755,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 +777,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 +807,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/[productId]/variants/create/page.tsx

@@ -9,7 +9,7 @@ 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 { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { ErrorMessage } from '@open-mercato/ui/backend/detail'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { E } from '#generated/entities.ids.generated'
 import {
@@ -70,6 +70,7 @@ export default function CreateVariantPage({ params }: { params?: { productId?: s
   const [productTaxRate, setProductTaxRate] = React.useState<number | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
 
   React.useEffect(() => {
     const loadPriceKinds = async () => {
@@ -133,13 +134,17 @@ export default function CreateVariantPage({ params }: { params?: { productId?: s
     async function load() {
       setLoading(true)
       setError(null)
+      setIsNotFound(false)
       try {
         const res = await apiCall<ProductResponse>(
           `/api/catalog/products?id=${encodeURIComponent(productId!)}&page=1&pageSize=1`,
         )
         if (!res.ok) throw new Error(t('catalog.variants.form.errors.load', 'Failed to load product context.'))
         const record = Array.isArray(res.result?.items) ? res.result?.items?.[0] : undefined
-        if (!record) throw new Error(t('catalog.products.edit.errors.notFound', 'Product not found.'))
+        if (!record) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         const metadata = (record.metadata ?? {}) as Record<string, unknown>
         const taxRateId =
           typeof (record as any).tax_rate_id === 'string'
@@ -283,9 +288,21 @@ export default function CreateVariantPage({ params }: { params?: { productId?: s
     return (
       <Page>
         <PageBody>
-          <div className="rounded border border-destructive/40 bg-destructive/10 px-4 py-3 text-sm text-destructive">
-            {t('catalog.variants.form.errors.productMissing', 'Product identifier is missing.')}
-          </div>
+          <ErrorMessage label={t('catalog.variants.form.errors.productMissing', 'Product identifier is missing.')} />
+        </PageBody>
+      </Page>
+    )
+  }
+
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('catalog.products.edit.errors.notFound', 'Product not found.')}
+            backHref="/backend/catalog/products"
+            backLabel={t('catalog.products.edit.actions.backToList', 'Back to products')}
+          />
         </PageBody>
       </Page>
     )

package/src/modules/catalog/backend/catalog/products/create/page.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import * as React from "react";
-import dynamic from "next/dynamic";
 import { useRouter, useSearchParams } from "next/navigation";
 import type { ZodType } from "zod";
 import { Page, PageBody } from "@open-mercato/ui/backend/Page";
@@ -14,6 +13,7 @@ import { createCrud } from "@open-mercato/ui/backend/utils/crud";
 import { createCrudFormError } from "@open-mercato/ui/backend/utils/serverErrors";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
 import { TagsInput } from "@open-mercato/ui/backend/inputs/TagsInput";
+import MarkdownField from "@open-mercato/ui/backend/inputs/MarkdownField";
 import { Button } from "@open-mercato/ui/primitives/button";
 import { Input } from "@open-mercato/ui/primitives/input";
 import { Label } from "@open-mercato/ui/primitives/label";
@@ -108,22 +108,6 @@ type VariantPriceRequest = {
   taxRateValue: number | null;
 };
 
-type UiMarkdownEditorProps = {
-  value?: string;
-  height?: number;
-  onChange?: (value?: string) => void;
-  previewOptions?: { remarkPlugins?: unknown[] };
-};
-
-const MarkdownEditor = dynamic(() => import("@uiw/react-md-editor"), {
-  ssr: false,
-  loading: () => (
-    <div className="flex h-48 items-center justify-center text-sm text-muted-foreground">
-      Loading editor…
-    </div>
-  ),
-}) as unknown as React.ComponentType<UiMarkdownEditorProps>;
-
 type ProductFormStep = (typeof PRODUCT_FORM_STEPS)[number];
 
 const TRUE_BOOLEAN_VALUES = new Set(["true", "1", "yes", "y", "t"]);
@@ -1388,17 +1372,10 @@ function ProductBuilder({
               </Button>
             </div>
             {values.useMarkdown ? (
-              <div
-                data-color-mode="light"
-                className="overflow-hidden rounded-md border"
-              >
-                <MarkdownEditor
-                  value={values.description}
-                  height={260}
-                  onChange={(val) => setValue("description", val ?? "")}
-                  previewOptions={{ remarkPlugins: [] }}
-                />
-              </div>
+              <MarkdownField
+                value={values.description}
+                onChange={(val) => setValue("description", val ?? "")}
+              />
             ) : (
               <textarea
                 className="min-h-[180px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"

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 = {

package/src/modules/catalog/commands/categories.ts

@@ -14,6 +14,7 @@ import {
   type CategoryUpdateInput,
 } from '../data/validators'
 import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload } from './shared'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import { rebuildCategoryHierarchyForOrganization } from '../lib/categoryHierarchy'
 import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
@@ -121,6 +122,27 @@ function normalizeSlug(slug?: string | null): string | null {
   return trimmed.length ? trimmed : null
 }
 
+function categorySeedFromSnapshot(snapshot: CategorySnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    organizationId: snapshot.organizationId,
+    tenantId: snapshot.tenantId,
+    name: snapshot.name,
+    slug: snapshot.slug,
+    description: snapshot.description,
+    parentId: snapshot.parentId,
+    rootId: snapshot.rootId,
+    treePath: snapshot.treePath,
+    depth: snapshot.depth,
+    ancestorIds: snapshot.ancestorIds,
+    childIds: snapshot.childIds,
+    descendantIds: snapshot.descendantIds,
+    isActive: snapshot.isActive,
+    createdAt: new Date(snapshot.createdAt),
+    updatedAt: new Date(snapshot.updatedAt),
+  }
+}
+
 const createCategoryCommand: CommandHandler<CategoryCreateInput, { categoryId: string }> = {
   id: 'catalog.categories.create',
   async execute(input, ctx) {
@@ -246,6 +268,26 @@ const createCategoryCommand: CommandHandler<CategoryCreateInput, { categoryId: s
       })
     }
   },
+  redo: makeCreateRedo<CatalogProductCategory, CategorySnapshot, CategoryCreateInput, { categoryId: string }>({
+    entityClass: CatalogProductCategory,
+    getSnapshotId: (snapshot) => snapshot.id,
+    seedFromSnapshot: categorySeedFromSnapshot,
+    buildResult: (entity) => ({ categoryId: entity.id }),
+    events: categoryCrudEvents,
+    afterRestore: async ({ em, ctx, entity, snapshot }) => {
+      await rebuildCategoryHierarchyForOrganization(em, entity.organizationId, entity.tenantId)
+      if (snapshot.custom && Object.keys(snapshot.custom).length) {
+        await setCustomFieldsIfAny({
+          dataEngine: ctx.container.resolve('dataEngine'),
+          entityId: E.catalog.catalog_product_category,
+          recordId: entity.id,
+          organizationId: entity.organizationId,
+          tenantId: entity.tenantId,
+          values: snapshot.custom,
+        })
+      }
+    },
+  }),
 }
 
 const updateCategoryCommand: CommandHandler<CategoryUpdateInput, { categoryId: string }> = {

package/src/modules/catalog/commands/offers.ts

@@ -24,6 +24,7 @@ import {
   requireProduct,
 } from './shared'
 import { loadCustomFieldSnapshot, buildCustomFieldResetMap } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import { E } from '#generated/entities.ids.generated'
 
 type OfferSnapshot = {
@@ -92,6 +93,24 @@ async function loadOfferSnapshot(em: EntityManager, id: string): Promise<OfferSn
   }
 }
 
+function offerSeedFromSnapshot(snapshot: OfferSnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    product: snapshot.productId,
+    organizationId: snapshot.organizationId,
+    tenantId: snapshot.tenantId,
+    channelId: snapshot.channelId,
+    title: snapshot.title,
+    description: snapshot.description ?? null,
+    defaultMediaId: snapshot.defaultMediaId ?? null,
+    defaultMediaUrl: snapshot.defaultMediaUrl ?? null,
+    metadata: snapshot.metadata ? cloneJson(snapshot.metadata) : null,
+    isActive: snapshot.isActive,
+    createdAt: new Date(snapshot.createdAt),
+    updatedAt: new Date(snapshot.updatedAt),
+  }
+}
+
 const createOfferCommand: CommandHandler<OfferCreateInput, { offerId: string }> = {
   id: 'catalog.offers.create',
   async execute(rawInput, ctx) {
@@ -204,6 +223,31 @@ const createOfferCommand: CommandHandler<OfferCreateInput, { offerId: string }>
       })
     }
   },
+  redo: makeCreateRedo<CatalogOffer, OfferSnapshot, OfferCreateInput, { offerId: string }>({
+    entityClass: CatalogOffer,
+    getSnapshotId: (snapshot) => snapshot.id,
+    seedFromSnapshot: offerSeedFromSnapshot,
+    buildResult: (entity) => ({ offerId: entity.id }),
+    afterRestore: async ({ ctx, entity, snapshot }) => {
+      if (snapshot.custom && Object.keys(snapshot.custom).length) {
+        await setCustomFieldsIfAny({
+          dataEngine: ctx.container.resolve('dataEngine'),
+          entityId: E.catalog.catalog_offer,
+          recordId: entity.id,
+          organizationId: entity.organizationId,
+          tenantId: entity.tenantId,
+          values: snapshot.custom,
+        })
+      }
+      await emitCatalogQueryIndexEvent(ctx, {
+        entityType: E.catalog.catalog_offer,
+        recordId: entity.id,
+        organizationId: entity.organizationId,
+        tenantId: entity.tenantId,
+        action: 'created',
+      })
+    },
+  }),
 }
 
 const updateOfferCommand: CommandHandler<OfferUpdateInput, { offerId: string }> = {

package/src/modules/catalog/commands/optionSchemas.ts

@@ -19,6 +19,7 @@ import {
   extractUndoPayload,
   resolveOptionSchemaCode,
 } from './shared'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 
 type OptionSchemaSnapshot = {
   id: string
@@ -139,6 +140,15 @@ const createOptionSchemaCommand: CommandHandler<
     em.remove(record)
     await em.flush()
   },
+  redo: makeCreateRedo<
+    CatalogOptionSchemaTemplate,
+    OptionSchemaSnapshot,
+    OptionSchemaTemplateCreateInput,
+    { schemaId: string }
+  >({
+    entityClass: CatalogOptionSchemaTemplate,
+    buildResult: (entity) => ({ schemaId: entity.id }),
+  }),
 }
 
 const updateOptionSchemaCommand: CommandHandler<

package/src/modules/catalog/commands/priceKinds.ts

@@ -12,6 +12,7 @@ import {
   type PriceKindUpdateInput,
 } from '../data/validators'
 import { ensureTenantScope, extractUndoPayload } from './shared'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import type { CatalogPriceDisplayMode } from '../data/types'
 
 type PriceKindSnapshot = {
@@ -123,6 +124,10 @@ const createPriceKindCommand: CommandHandler<PriceKindCreateInput, { priceKindId
     em.remove(record)
     await em.flush()
   },
+  redo: makeCreateRedo<CatalogPriceKind, PriceKindSnapshot, PriceKindCreateInput, { priceKindId: string }>({
+    entityClass: CatalogPriceKind,
+    buildResult: (entity) => ({ priceKindId: entity.id }),
+  }),
 }
 
 const updatePriceKindCommand: CommandHandler<PriceKindUpdateInput, { priceKindId: string }> = {

package/src/modules/catalog/commands/prices.ts

@@ -29,6 +29,7 @@ import {
   toNumericString,
 } from './shared'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 
@@ -228,6 +229,36 @@ function applyPriceSnapshot(em: EntityManager, record: CatalogProductPrice, snap
   record.updatedAt = new Date(snapshot.updatedAt)
 }
 
+function priceSeedFromSnapshot(snapshot: PriceSnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    variant: snapshot.variantId ?? null,
+    product: snapshot.productId ?? null,
+    offer: snapshot.offerId ?? null,
+    organizationId: snapshot.organizationId,
+    tenantId: snapshot.tenantId,
+    priceKind: snapshot.priceKindId,
+    currencyCode: snapshot.currencyCode,
+    kind: snapshot.priceKindCode || snapshot.kind,
+    minQuantity: snapshot.minQuantity,
+    maxQuantity: snapshot.maxQuantity ?? null,
+    unitPriceNet: snapshot.unitPriceNet ?? null,
+    unitPriceGross: snapshot.unitPriceGross ?? null,
+    taxRate: snapshot.taxRate ?? null,
+    taxAmount: snapshot.taxAmount ?? null,
+    channelId: snapshot.channelId ?? null,
+    userId: snapshot.userId ?? null,
+    userGroupId: snapshot.userGroupId ?? null,
+    customerId: snapshot.customerId ?? null,
+    customerGroupId: snapshot.customerGroupId ?? null,
+    metadata: snapshot.metadata ? cloneJson(snapshot.metadata) : null,
+    startsAt: snapshot.startsAt ? new Date(snapshot.startsAt) : null,
+    endsAt: snapshot.endsAt ? new Date(snapshot.endsAt) : null,
+    createdAt: new Date(snapshot.createdAt),
+    updatedAt: new Date(snapshot.updatedAt),
+  }
+}
+
 type PriceAmountInput = {
   amount: number
   mode: 'net' | 'gross'
@@ -433,6 +464,25 @@ const createPriceCommand: CommandHandler<PriceCreateInput, { priceId: string }>
       })
     }
   },
+  redo: makeCreateRedo<CatalogProductPrice, PriceSnapshot, PriceCreateInput, { priceId: string }>({
+    entityClass: CatalogProductPrice,
+    getSnapshotId: (snapshot) => snapshot.id,
+    seedFromSnapshot: priceSeedFromSnapshot,
+    buildResult: (entity) => ({ priceId: entity.id }),
+    events: priceCrudEvents,
+    afterRestore: async ({ ctx, entity, snapshot }) => {
+      if (snapshot.custom && Object.keys(snapshot.custom).length) {
+        await setCustomFieldsIfAny({
+          dataEngine: ctx.container.resolve('dataEngine'),
+          entityId: E.catalog.catalog_product_price,
+          recordId: entity.id,
+          organizationId: entity.organizationId,
+          tenantId: entity.tenantId,
+          values: snapshot.custom,
+        })
+      }
+    },
+  }),
 }
 
 const updatePriceCommand: CommandHandler<PriceUpdateInput, { priceId: string }> = {