@open-mercato/core 0.6.6-develop.6229.1.ebe6706732 → 0.6.6-develop.6241.1.47c01ad4ed

package/src/modules/payment_gateways/backend/payment-gateways/page.tsx

@@ -290,19 +290,35 @@ export default function PaymentTransactionsPage() {
   const handleRefreshStatus = React.useCallback(async () => {
     if (!selectedId) return
     setIsRefreshingStatus(true)
-    const call = await apiCall(`/api/payment_gateways/status?transactionId=${encodeURIComponent(selectedId)}`, undefined, { fallback: null })
-    if (!call.ok) {
-      flash(t('payment_gateways.transactions.error.refreshStatus', 'Failed to refresh transaction status'), 'error')
+    try {
+      await runMutation({
+        operation: async () => {
+          await apiCallOrThrow('/api/payment_gateways/status', {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ transactionId: selectedId }),
+          })
+        },
+        context: {
+          entityType: 'payment_gateways:gateway_transaction',
+          entityId: selectedId,
+        },
+        mutationPayload: { transactionId: selectedId },
+      })
+      await Promise.all([
+        loadRows(),
+        loadDetail(selectedId),
+      ])
+      flash(t('payment_gateways.transactions.success.refreshStatus', 'Transaction status refreshed'), 'success')
+    } catch (error) {
+      const message = error instanceof Error && error.message
+        ? error.message
+        : t('payment_gateways.transactions.error.refreshStatus', 'Failed to refresh transaction status')
+      flash(message, 'error')
+    } finally {
       setIsRefreshingStatus(false)
-      return
     }
-    await Promise.all([
-      loadRows(),
-      loadDetail(selectedId),
-    ])
-    flash(t('payment_gateways.transactions.success.refreshStatus', 'Transaction status refreshed'), 'success')
-    setIsRefreshingStatus(false)
-  }, [loadDetail, loadRows, selectedId, t])
+  }, [loadDetail, loadRows, runMutation, selectedId, t])
 
   const handleCapturePayment = React.useCallback(async () => {
     if (!selectedId) return

package/src/modules/sales/backend/sales/channels/offers/page.tsx

@@ -14,6 +14,7 @@ import { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { mapOfferRow, renderOfferPriceSummary, type OfferRow } from '@open-mercato/core/modules/sales/components/channels/offerTableUtils'
@@ -26,9 +27,27 @@ type OffersResponse = {
 
 const PAGE_SIZE = 25
 
+const SAVE_CONTEXT_ID = 'sales-channel-offers-list'
+
 export default function SalesChannelOffersListPage() {
   const t = useT()
   const router = useRouter()
+  const { runMutation, retryLastMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: SAVE_CONTEXT_ID,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const mutationContext = React.useMemo(
+    () => ({
+      formId: SAVE_CONTEXT_ID,
+      resourceKind: 'sales.channels.offers',
+      retryLastMutation,
+    }),
+    [retryLastMutation],
+  )
   const scopeVersion = useOrganizationScopeVersion()
   const channelOptionsRef = React.useRef<Map<string, FilterOption>>(new Map())
   const [rows, setRows] = React.useState<OfferRow[]>([])
@@ -282,19 +301,24 @@ export default function SalesChannelOffersListPage() {
 
   const handleDelete = React.useCallback(async (row: OfferRow) => {
     try {
-      await withScopedApiRequestHeaders(
-        buildOptimisticLockHeader(row.updatedAt),
-        () => deleteCrud('catalog/offers', row.id, {
-          errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),
-        }),
-      )
+      await runMutation({
+        operation: () =>
+          withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(row.updatedAt),
+            () => deleteCrud('catalog/offers', row.id, {
+              errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),
+            }),
+          ),
+        context: mutationContext,
+        mutationPayload: { action: 'delete', id: row.id },
+      })
       flash(t('sales.channels.offers.messages.deleted', 'Offer deleted.'), 'success')
       handleRefresh()
     } catch (err) {
       if (surfaceRecordConflict(err, t)) { handleRefresh(); return }
       console.error('sales.channels.offers.delete', err)
     }
-  }, [handleRefresh, t])
+  }, [handleRefresh, mutationContext, runMutation, t])
 
   const tableTitle = (
     <div className="flex flex-col gap-1">

package/src/modules/sales/backend/sales/channels/page.tsx

@@ -13,6 +13,7 @@ import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { buildOptimisticLockHeader, extractOptimisticLockConflict } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 
@@ -34,9 +35,27 @@ type ChannelsResponse = {
 
 const PAGE_SIZE = 25
 
+const SAVE_CONTEXT_ID = 'sales-channels-list'
+
 export default function SalesChannelsPage() {
   const t = useT()
   const router = useRouter()
+  const { runMutation, retryLastMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: SAVE_CONTEXT_ID,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const mutationContext = React.useMemo(
+    () => ({
+      formId: SAVE_CONTEXT_ID,
+      resourceKind: 'sales.channels',
+      retryLastMutation,
+    }),
+    [retryLastMutation],
+  )
   const scopeVersion = useOrganizationScopeVersion()
   const [rows, setRows] = React.useState<ChannelRow[]>([])
   const [page, setPage] = React.useState(1)
@@ -139,12 +158,17 @@ export default function SalesChannelsPage() {
 
   const handleDelete = React.useCallback(async (row: ChannelRow) => {
     try {
-      await withScopedApiRequestHeaders(
-        buildOptimisticLockHeader(row.updatedAt),
-        () => deleteCrud('sales/channels', row.id, {
-          errorMessage: t('sales.channels.table.errors.delete', 'Failed to delete channel.'),
-        }),
-      )
+      await runMutation({
+        operation: () =>
+          withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(row.updatedAt),
+            () => deleteCrud('sales/channels', row.id, {
+              errorMessage: t('sales.channels.table.errors.delete', 'Failed to delete channel.'),
+            }),
+          ),
+        context: mutationContext,
+        mutationPayload: { action: 'delete', id: row.id },
+      })
       flash(t('sales.channels.table.messages.deleted', 'Channel deleted.'), 'success')
       handleRefresh()
     } catch (err) {
@@ -161,7 +185,7 @@ export default function SalesChannelsPage() {
       }
       console.error('sales.channels.delete', err)
     }
-  }, [handleRefresh, t])
+  }, [handleRefresh, mutationContext, runMutation, t])
 
   return (
     <Page>

package/src/modules/sales/components/AdjustmentKindSettings.tsx

@@ -18,6 +18,7 @@ import { Label } from '@open-mercato/ui/primitives/label'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCall, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { AppearanceSelector } from '@open-mercato/core/modules/dictionaries/components/AppearanceSelector'
@@ -75,10 +76,28 @@ const normalizeEntry = (raw: any): AdjustmentKind | null => {
   }
 }
 
+const SAVE_CONTEXT_ID = 'sales-adjustment-kind-settings'
+
 export function AdjustmentKindSettings() {
   const t = useT()
   const scopeVersion = useOrganizationScopeVersion()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
+  const { runMutation, retryLastMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: SAVE_CONTEXT_ID,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const mutationContext = React.useMemo(
+    () => ({
+      formId: SAVE_CONTEXT_ID,
+      resourceKind: 'sales.adjustmentKinds',
+      retryLastMutation,
+    }),
+    [retryLastMutation],
+  )
   const [items, setItems] = React.useState<AdjustmentKind[]>([])
   const [search, setSearch] = React.useState('')
   const [loading, setLoading] = React.useState(false)
@@ -222,16 +241,26 @@ export function AdjustmentKindSettings() {
 
       const lockHeader =
         dialog.mode === 'edit' ? buildOptimisticLockHeader(dialog.entry.updatedAt) : {}
-      const call = await withScopedApiRequestHeaders(lockHeader, () =>
-        apiCall('/api/sales/adjustment-kinds', {
-          method,
-          headers: { 'content-type': 'application/json' },
-          body,
-        })
-      )
-      if (!call.ok) {
-        await raiseCrudError(call.response, labels.saveError)
-      }
+      await runMutation({
+        operation: async () => {
+          const call = await withScopedApiRequestHeaders(lockHeader, () =>
+            apiCall('/api/sales/adjustment-kinds', {
+              method,
+              headers: { 'content-type': 'application/json' },
+              body,
+            })
+          )
+          if (!call.ok) {
+            await raiseCrudError(call.response, labels.saveError)
+          }
+          return call
+        },
+        context: mutationContext,
+        mutationPayload:
+          dialog.mode === 'create'
+            ? { action: 'create', ...payload }
+            : { action: 'update', id: dialog.entry.id, ...payload },
+      })
       flash(dialog.mode === 'create' ? labels.created : labels.updated, 'success')
       closeDialog()
       await loadItems()
@@ -242,7 +271,7 @@ export function AdjustmentKindSettings() {
     } finally {
       setSubmitting(false)
     }
-  }, [closeDialog, dialog, form.color, form.icon, form.label, form.value, labels, loadItems])
+  }, [closeDialog, dialog, form.color, form.icon, form.label, form.value, labels, loadItems, mutationContext, runMutation])
 
   const handleDelete = React.useCallback(
     async (entry: AdjustmentKind) => {
@@ -253,18 +282,25 @@ export function AdjustmentKindSettings() {
       })
       if (!confirmed) return
       try {
-        const call = await withScopedApiRequestHeaders(
-          buildOptimisticLockHeader(entry.updatedAt),
-          () =>
-            apiCall('/api/sales/adjustment-kinds', {
-              method: 'DELETE',
-              headers: { 'content-type': 'application/json' },
-              body: JSON.stringify({ id: entry.id }),
-            })
-        )
-        if (!call.ok) {
-          await raiseCrudError(call.response, labels.deleteError)
-        }
+        await runMutation({
+          operation: async () => {
+            const call = await withScopedApiRequestHeaders(
+              buildOptimisticLockHeader(entry.updatedAt),
+              () =>
+                apiCall('/api/sales/adjustment-kinds', {
+                  method: 'DELETE',
+                  headers: { 'content-type': 'application/json' },
+                  body: JSON.stringify({ id: entry.id }),
+                })
+            )
+            if (!call.ok) {
+              await raiseCrudError(call.response, labels.deleteError)
+            }
+            return call
+          },
+          context: mutationContext,
+          mutationPayload: { action: 'delete', id: entry.id },
+        })
         flash(labels.deleted, 'success')
         await loadItems()
       } catch (err) {
@@ -273,7 +309,7 @@ export function AdjustmentKindSettings() {
         flash(message, 'error')
       }
     },
-    [confirm, labels, loadItems]
+    [confirm, labels, loadItems, mutationContext, runMutation]
   )
 
   const formKeyHandler = React.useCallback(

package/src/modules/sales/components/DocumentNumberSettings.tsx

@@ -6,6 +6,7 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -56,6 +57,8 @@ const normalizeState = (payload?: Partial<SettingsResponse> | null): FormState =
       : '1',
 })
 
+const SAVE_CONTEXT_ID = 'sales-document-number-settings'
+
 export function DocumentNumberSettings() {
   const t = useT()
   const scopeVersion = useOrganizationScopeVersion()
@@ -64,6 +67,15 @@ export function DocumentNumberSettings() {
   const [saving, setSaving] = React.useState(false)
   const [tokens, setTokens] = React.useState(DOCUMENT_NUMBER_TOKENS)
 
+  const { runMutation, retryLastMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: SAVE_CONTEXT_ID,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+
   const translations = React.useMemo(() => ({
     title: t('sales.config.numbering.title', 'Document numbers'),
     description: t(
@@ -128,16 +140,26 @@ export function DocumentNumberSettings() {
         orderNextNumber: Number.parseInt(formState.orderNextNumber, 10) || undefined,
         quoteNextNumber: Number.parseInt(formState.quoteNextNumber, 10) || undefined,
       }
-      // optimistic-lock-exempt: single-row tenant numbering settings blob — no per-record version / concurrent record edit
-      const call = await apiCall<SettingsResponse>('/api/sales/settings/document-numbers', {
-        method: 'PUT',
-        headers: { 'content-type': 'application/json' },
-        body: JSON.stringify(payload),
+      const call = await runMutation({
+        // optimistic-lock-exempt: single-row tenant numbering settings blob — no per-record version / concurrent record edit
+        operation: async () => {
+          const response = await apiCall<SettingsResponse>('/api/sales/settings/document-numbers', {
+            method: 'PUT',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(payload),
+          })
+          if (!response.ok) {
+            throw new Error(translations.errors.save)
+          }
+          return response
+        },
+        context: {
+          formId: SAVE_CONTEXT_ID,
+          resourceKind: 'sales.settings',
+          retryLastMutation,
+        },
+        mutationPayload: payload,
       })
-      if (!call.ok) {
-        flash(translations.errors.save, 'error')
-        return
-      }
       setFormState(normalizeState(call.result))
       setTokens(Array.isArray(call.result?.tokens) && call.result.tokens.length ? call.result.tokens : DOCUMENT_NUMBER_TOKENS)
       flash(translations.messages.saved, 'success')
@@ -147,7 +169,7 @@ export function DocumentNumberSettings() {
     } finally {
       setSaving(false)
     }
-  }, [formState.orderNextNumber, formState.orderNumberFormat, formState.quoteNextNumber, formState.quoteNumberFormat, translations.errors.save, translations.messages.saved])
+  }, [formState.orderNextNumber, formState.orderNumberFormat, formState.quoteNextNumber, formState.quoteNumberFormat, retryLastMutation, runMutation, translations.errors.save, translations.messages.saved])
 
   const handleReset = React.useCallback(() => {
     setFormState(DEFAULT_STATE)

package/src/modules/sales/components/OrderEditingSettings.tsx

@@ -6,6 +6,7 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Switch } from '@open-mercato/ui/primitives/switch'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 
@@ -35,6 +36,8 @@ const normalizeStatusList = (list: unknown): string[] | null => {
   return Array.from(set)
 }
 
+const SAVE_CONTEXT_ID = 'sales-order-editing-settings'
+
 export function OrderEditingSettings() {
   const t = useT()
   const scopeVersion = useOrganizationScopeVersion()
@@ -44,6 +47,15 @@ export function OrderEditingSettings() {
   const [customerStatuses, setCustomerStatuses] = React.useState<string[] | null>(null)
   const [addressStatuses, setAddressStatuses] = React.useState<string[] | null>(null)
 
+  const { runMutation, retryLastMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: SAVE_CONTEXT_ID,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+
   const translations = React.useMemo(
     () => ({
       title: t('sales.config.orderEditing.title', 'Order editing guards'),
@@ -121,16 +133,26 @@ export function OrderEditingSettings() {
         orderCustomerEditableStatuses: customerStatuses,
         orderAddressEditableStatuses: addressStatuses,
       }
-      // optimistic-lock-exempt: single-row tenant order-editing settings blob — no per-record version / concurrent record edit
-      const call = await apiCall<SettingsResponse>('/api/sales/settings/order-editing', {
-        method: 'PUT',
-        headers: { 'content-type': 'application/json' },
-        body: JSON.stringify(payload),
+      const call = await runMutation({
+        // optimistic-lock-exempt: single-row tenant order-editing settings blob — no per-record version / concurrent record edit
+        operation: async () => {
+          const response = await apiCall<SettingsResponse>('/api/sales/settings/order-editing', {
+            method: 'PUT',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(payload),
+          })
+          if (!response.ok) {
+            throw new Error(translations.messages.saveError)
+          }
+          return response
+        },
+        context: {
+          formId: SAVE_CONTEXT_ID,
+          resourceKind: 'sales.settings',
+          retryLastMutation,
+        },
+        mutationPayload: payload,
       })
-      if (!call.ok) {
-        flash(translations.messages.saveError, 'error')
-        return
-      }
       setCustomerStatuses(normalizeStatusList(call.result?.orderCustomerEditableStatuses))
       setAddressStatuses(normalizeStatusList(call.result?.orderAddressEditableStatuses))
       setOptions(Array.isArray(call.result?.orderStatuses) ? call.result.orderStatuses : [])
@@ -141,7 +163,7 @@ export function OrderEditingSettings() {
     } finally {
       setSaving(false)
     }
-  }, [addressStatuses, customerStatuses, translations.messages.saveError, translations.messages.saved])
+  }, [addressStatuses, customerStatuses, retryLastMutation, runMutation, translations.messages.saveError, translations.messages.saved])
 
   const renderStatusList = React.useCallback(
     (kind: 'customer' | 'address', values: string[] | null, label: string) => {

package/src/modules/sales/components/StatusSettings.tsx

@@ -10,6 +10,7 @@ import {
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCall, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
@@ -43,6 +44,8 @@ const DEFAULT_FORM_VALUES: DictionaryFormValues = {
   icon: null,
 }
 
+const SAVE_CONTEXT_ID = 'sales-status-settings'
+
 export function StatusSettings() {
   const t = useT()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
@@ -51,6 +54,23 @@ export function StatusSettings() {
     return value === key ? fallback : value
   }, [t])
 
+  const { runMutation, retryLastMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: SAVE_CONTEXT_ID,
+    blockedMessage: translate('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const mutationContext = React.useMemo(
+    () => ({
+      formId: SAVE_CONTEXT_ID,
+      resourceKind: 'sales.statuses',
+      retryLastMutation,
+    }),
+    [retryLastMutation],
+  )
+
   const sections = React.useMemo<SectionDefinition[]>(() => [
     {
       kind: 'order-statuses',
@@ -198,18 +218,25 @@ export function StatusSettings() {
     })
     if (!confirmed) return
     try {
-      const call = await withScopedApiRequestHeaders(
-        buildOptimisticLockHeader(entry.updatedAt),
-        () =>
-          apiCall(apiPaths[kind], {
-            method: 'DELETE',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ id: entry.id }),
-          })
-      )
-      if (!call.ok) {
-        await raiseCrudError(call.response, translate('sales.config.statuses.error.delete', 'Failed to delete status.'))
-      }
+      await runMutation({
+        operation: async () => {
+          const call = await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(entry.updatedAt),
+            () =>
+              apiCall(apiPaths[kind], {
+                method: 'DELETE',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify({ id: entry.id }),
+              })
+          )
+          if (!call.ok) {
+            await raiseCrudError(call.response, translate('sales.config.statuses.error.delete', 'Failed to delete status.'))
+          }
+          return call
+        },
+        context: mutationContext,
+        mutationPayload: { action: 'delete', kind, id: entry.id },
+      })
       flash(translate('sales.config.statuses.success.delete', 'Status deleted.'), 'success')
       await loadEntries(kind)
     } catch (err) {
@@ -217,7 +244,7 @@ export function StatusSettings() {
       const message = err instanceof Error ? err.message : translate('sales.config.statuses.error.delete', 'Failed to delete status.')
       flash(message, 'error')
     }
-  }, [apiPaths, confirm, loadEntries, translate])
+  }, [apiPaths, confirm, loadEntries, mutationContext, runMutation, translate])
 
   const submitForm = React.useCallback(async (values: DictionaryFormValues) => {
     if (!dialog) return
@@ -225,14 +252,21 @@ export function StatusSettings() {
     setSubmitting(true)
     try {
       if (dialog.mode === 'create') {
-        const call = await apiCall(path, {
-          method: 'POST',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify(values),
+        await runMutation({
+          operation: async () => {
+            const call = await apiCall(path, {
+              method: 'POST',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify(values),
+            })
+            if (!call.ok) {
+              await raiseCrudError(call.response, translate('sales.config.statuses.error.save', 'Failed to save status.'))
+            }
+            return call
+          },
+          context: mutationContext,
+          mutationPayload: { action: 'create', kind: dialog.kind, ...values },
         })
-        if (!call.ok) {
-          await raiseCrudError(call.response, translate('sales.config.statuses.error.save', 'Failed to save status.'))
-        }
         flash(translate('sales.config.statuses.success.save', 'Status saved.'), 'success')
       } else if (dialog.mode === 'edit') {
         const entry = dialog.entry
@@ -243,18 +277,25 @@ export function StatusSettings() {
         if (nextColor !== (entry.color ?? null)) body.color = nextColor
         const nextIcon = values.icon ?? null
         if (nextIcon !== (entry.icon ?? null)) body.icon = nextIcon
-        const call = await withScopedApiRequestHeaders(
-          buildOptimisticLockHeader(entry.updatedAt),
-          () =>
-            apiCall(path, {
-              method: 'PUT',
-              headers: { 'content-type': 'application/json' },
-              body: JSON.stringify(body),
-            })
-        )
-        if (!call.ok) {
-          await raiseCrudError(call.response, translate('sales.config.statuses.error.save', 'Failed to save status.'))
-        }
+        await runMutation({
+          operation: async () => {
+            const call = await withScopedApiRequestHeaders(
+              buildOptimisticLockHeader(entry.updatedAt),
+              () =>
+                apiCall(path, {
+                  method: 'PUT',
+                  headers: { 'content-type': 'application/json' },
+                  body: JSON.stringify(body),
+                })
+            )
+            if (!call.ok) {
+              await raiseCrudError(call.response, translate('sales.config.statuses.error.save', 'Failed to save status.'))
+            }
+            return call
+          },
+          context: mutationContext,
+          mutationPayload: { action: 'update', kind: dialog.kind, ...body },
+        })
         flash(translate('sales.config.statuses.success.save', 'Status saved.'), 'success')
       }
       closeDialog()
@@ -267,7 +308,7 @@ export function StatusSettings() {
     } finally {
       setSubmitting(false)
     }
-  }, [apiPaths, closeDialog, dialog, loadEntries, translate])
+  }, [apiPaths, closeDialog, dialog, loadEntries, mutationContext, runMutation, translate])
 
   const currentValues = React.useMemo<DictionaryFormValues>(() => {
     if (dialog && dialog.mode === 'edit') {