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

package/src/modules/customers/backend/config/customers/pipeline-stages/page.tsx

@@ -3,7 +3,8 @@
 import * as React from 'react'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-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 { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
@@ -24,6 +25,7 @@ type Pipeline = {
   id: string
   name: string
   isDefault: boolean
+  updatedAt?: string | null
 }
 
 type PipelineStage = {
@@ -33,6 +35,7 @@ type PipelineStage = {
   order: number
   color: string | null
   icon: string | null
+  updatedAt?: string | null
 }
 
 type PipelineDialogState =
@@ -146,11 +149,14 @@ export default function PipelineStagesPage() {
         await loadPipelines()
         if (newId) setSelectedPipelineId(newId)
       } else if (pipelineDialog?.mode === 'edit') {
-        const result = await apiCall('/api/customers/pipelines', {
-          method: 'PUT',
-          body: JSON.stringify({ id: pipelineDialog.pipeline.id, name: pipelineName.trim(), isDefault: pipelineIsDefault }),
-          headers: { 'Content-Type': 'application/json' },
-        })
+        const result = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(pipelineDialog.pipeline.updatedAt),
+          () => apiCall('/api/customers/pipelines', {
+            method: 'PUT',
+            body: JSON.stringify({ id: pipelineDialog.pipeline.id, name: pipelineName.trim(), isDefault: pipelineIsDefault }),
+            headers: { 'Content-Type': 'application/json' },
+          }),
+        )
         if (!result.ok) {
           flash(t('customers.config.pipelineStages.errorUpdatePipeline', 'Failed to update pipeline'), 'error')
           return
@@ -175,11 +181,14 @@ export default function PipelineStagesPage() {
       variant: 'destructive',
     })
     if (!confirmed) return
-    const result = await apiCall('/api/customers/pipelines', {
-      method: 'DELETE',
-      body: JSON.stringify({ id: pipeline.id }),
-      headers: { 'Content-Type': 'application/json' },
-    })
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(pipeline.updatedAt),
+      () => apiCall('/api/customers/pipelines', {
+        method: 'DELETE',
+        body: JSON.stringify({ id: pipeline.id }),
+        headers: { 'Content-Type': 'application/json' },
+      }),
+    )
     if (!result.ok) {
       const error = (result.result as { error?: string })?.error
       flash(error ?? t('customers.config.pipelineStages.errorDeletePipeline', 'Failed to delete pipeline'), 'error')
@@ -224,11 +233,14 @@ export default function PipelineStagesPage() {
         }
         flash(t('customers.config.pipelineStages.createdStage', 'Stage created'), 'success')
       } else if (stageDialog?.mode === 'edit') {
-        const result = await apiCall('/api/customers/pipeline-stages', {
-          method: 'PUT',
-          body: JSON.stringify({ id: stageDialog.stage.id, label: stageName.trim(), color: stageColor, icon: stageIcon }),
-          headers: { 'Content-Type': 'application/json' },
-        })
+        const result = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(stageDialog.stage.updatedAt),
+          () => apiCall('/api/customers/pipeline-stages', {
+            method: 'PUT',
+            body: JSON.stringify({ id: stageDialog.stage.id, label: stageName.trim(), color: stageColor, icon: stageIcon }),
+            headers: { 'Content-Type': 'application/json' },
+          }),
+        )
         if (!result.ok) {
           flash(t('customers.config.pipelineStages.errorUpdateStage', 'Failed to update stage'), 'error')
           return
@@ -253,11 +265,14 @@ export default function PipelineStagesPage() {
       variant: 'destructive',
     })
     if (!confirmed) return
-    const result = await apiCall('/api/customers/pipeline-stages', {
-      method: 'DELETE',
-      body: JSON.stringify({ id: stage.id }),
-      headers: { 'Content-Type': 'application/json' },
-    })
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(stage.updatedAt),
+      () => apiCall('/api/customers/pipeline-stages', {
+        method: 'DELETE',
+        body: JSON.stringify({ id: stage.id }),
+        headers: { 'Content-Type': 'application/json' },
+      }),
+    )
     if (!result.ok) {
       const error = (result.result as { error?: string })?.error
       flash(error ?? t('customers.config.pipelineStages.errorDeleteStage', 'Failed to delete stage'), 'error')

package/src/modules/customers/backend/customers/companies/[id]/page.tsx

@@ -8,7 +8,8 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Separator } from '@open-mercato/ui/primitives/separator'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { mapCrudServerErrorToFormErrors } from '@open-mercato/ui/backend/utils/serverErrors'
 import { E } from '#generated/entities.ids.generated'
@@ -70,6 +71,7 @@ type CompanyOverview = {
     nextInteractionIcon?: string | null
     nextInteractionColor?: string | null
     organizationId?: string | null
+    updatedAt?: string | null
   }
   profile: {
     id: string
@@ -324,19 +326,31 @@ export default function CustomerCompanyDetailPage({ params }: { params?: { id?:
     async (patch: Record<string, unknown>, apply: (prev: CompanyOverview) => CompanyOverview) => {
       if (!data) return
       const payload = { id: data.company.id, ...patch }
-      await runMutationWithContext(
-        () => apiCallOrThrow(
-          '/api/customers/companies',
-          {
-            method: 'PUT',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(payload),
-          },
-          { errorMessage: t('customers.companies.detail.inline.error', 'Unable to update company.') },
+      const result = await runMutationWithContext(
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader((data?.company as { updatedAt?: string } | undefined)?.updatedAt),
+          () => apiCallOrThrow<{ ok?: boolean; updatedAt?: string | null }>(
+            '/api/customers/companies',
+            {
+              method: 'PUT',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify(payload),
+            },
+            { errorMessage: t('customers.companies.detail.inline.error', 'Unable to update company.') },
+          ),
         ),
         payload,
       )
-      setData((prev) => (prev ? apply(prev) : prev))
+      // Refresh the optimistic-lock token so the next sequential inline edit does
+      // not send a stale updatedAt and falsely 409 (#2055, default-ON locking).
+      const nextUpdatedAt = result?.result?.updatedAt ?? null
+      setData((prev) => {
+        if (!prev) return prev
+        const applied = apply(prev)
+        return nextUpdatedAt
+          ? { ...applied, company: { ...applied.company, updatedAt: nextUpdatedAt } }
+          : applied
+      })
     },
     [data, runMutationWithContext, t],
   )
@@ -417,19 +431,24 @@ export default function CustomerCompanyDetailPage({ params }: { params?: { id?:
         id: data.company.id,
         customFields: customPayload,
       }
+      let customFieldsUpdatedAt: string | null = null
       try {
-        await runMutationWithContext(
-          () => apiCallOrThrow(
-            '/api/customers/companies',
-            {
-              method: 'PUT',
-              headers: { 'content-type': 'application/json' },
-              body: JSON.stringify(payload),
-            },
-            { errorMessage: t('customers.companies.detail.inline.error', 'Unable to update company.') },
+        const result = await runMutationWithContext(
+          () => withScopedApiRequestHeaders(
+            buildOptimisticLockHeader((data?.company as { updatedAt?: string } | undefined)?.updatedAt),
+            () => apiCallOrThrow<{ ok?: boolean; updatedAt?: string | null }>(
+              '/api/customers/companies',
+              {
+                method: 'PUT',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify(payload),
+              },
+              { errorMessage: t('customers.companies.detail.inline.error', 'Unable to update company.') },
+            ),
           ),
           payload,
         )
+        customFieldsUpdatedAt = result?.result?.updatedAt ?? null
       } catch (err) {
         const { message: helperMessage, fieldErrors } = mapCrudServerErrorToFormErrors(err)
         const message = helperMessage ?? t('customers.companies.detail.inline.error', 'Unable to update company.')
@@ -448,6 +467,9 @@ export default function CustomerCompanyDetailPage({ params }: { params?: { id?:
         if (!prev) return prev
         return {
           ...prev,
+          company: customFieldsUpdatedAt
+            ? { ...prev.company, updatedAt: customFieldsUpdatedAt }
+            : prev.company,
           customFields: {
             ...prev.customFields,
             ...normalized,
@@ -493,13 +515,16 @@ export default function CustomerCompanyDetailPage({ params }: { params?: { id?:
     setIsDeleting(true)
     try {
       await runMutationWithContext(
-        () => apiCallOrThrow(
-          `/api/customers/companies?id=${encodeURIComponent(currentCompanyId)}`,
-          {
-            method: 'DELETE',
-            headers: { 'content-type': 'application/json' },
-          },
-          { errorMessage: t('customers.companies.list.deleteError', 'Failed to delete company.') },
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader((data?.company as { updatedAt?: string } | undefined)?.updatedAt),
+          () => apiCallOrThrow(
+            `/api/customers/companies?id=${encodeURIComponent(currentCompanyId)}`,
+            {
+              method: 'DELETE',
+              headers: { 'content-type': 'application/json' },
+            },
+            { errorMessage: t('customers.companies.list.deleteError', 'Failed to delete company.') },
+          ),
         ),
         { id: currentCompanyId },
       )

package/src/modules/customers/backend/customers/companies/page.tsx

@@ -448,6 +448,7 @@ export default function CustomersCompaniesPage() {
     try {
       await runSingleMutation({
         operation: async () => {
+          // optimistic-lock-exempt: delete-only mutation — no field-level lost-update
           await apiCallOrThrow(
             `/api/customers/companies?id=${encodeURIComponent(company.id)}`,
             {
@@ -487,6 +488,7 @@ export default function CustomersCompaniesPage() {
         runBulkDelete(
           selectedRows,
           async (row) => {
+            // optimistic-lock-exempt: bulk delete-only mutation — no field-level lost-update
             await apiCallOrThrow(`/api/customers/companies?id=${encodeURIComponent(row.id)}`, {
               method: 'DELETE',
               headers: { 'content-type': 'application/json' },

package/src/modules/customers/backend/customers/companies-v2/[id]/page.tsx

@@ -6,8 +6,10 @@ import { useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Building2, Hash, Users, BarChart3, StickyNote } from 'lucide-react'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
-import { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { 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 { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { AttachmentsSection, ErrorMessage, LoadingMessage, RecordNotFoundState, type SectionAction } from '@open-mercato/ui/backend/detail'
@@ -204,6 +206,7 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
     // moment instead of "today" (#1807 prefill).
     const editPayload = {
       id: activity.id,
+      updatedAt: typeof raw.updatedAt === 'string' ? raw.updatedAt as string : typeof raw.updated_at === 'string' ? raw.updated_at as string : null,
       interactionType: typeof activity.interactionType === 'string' ? activity.interactionType : undefined,
       title: typeof activity.title === 'string' ? activity.title : null,
       body: typeof activity.body === 'string' ? activity.body : null,
@@ -323,10 +326,28 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
       variant: 'destructive',
     })
     if (!approved) return
-    await runMutationWithContext(
-      () => deleteCrud('customers/companies', { id: companyId }),
-      { id: companyId, operation: 'deleteCompany' },
-    )
+    try {
+      await runMutationWithContext(
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader((data?.company as { updatedAt?: string } | undefined)?.updatedAt),
+          () => deleteCrud('customers/companies', { id: companyId }),
+        ),
+        { id: companyId, operation: 'deleteCompany' },
+      )
+    } catch (err) {
+      // The guarded mutation already routes a 409 to the unified conflict bar;
+      // surface any other server error (e.g. "Cannot delete company: linked
+      // deals…") as a flash instead of letting it crash the page.
+      if (!surfaceRecordConflict(err, t)) {
+        flash(
+          err instanceof Error && err.message.trim().length > 0
+            ? err.message
+            : t('customers.companies.detail.deleteError', 'Failed to delete company.'),
+          'error',
+        )
+      }
+      return
+    }
     flash(t('customers.companies.list.deleteSuccess', 'Company deleted.'), 'success')
     router.push('/backend/customers/companies')
   }, [confirm, data?.company?.id, router, runMutationWithContext, t])
@@ -457,6 +478,7 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
                   initialValues={initialValues}
                   onSubmit={handleFormSubmit}
                   onDelete={handleDelete}
+                  optimisticLockUpdatedAt={(data?.company as { updatedAt?: string } | undefined)?.updatedAt}
                   hideFooterActions
                   collapsibleGroups={{ pageType: 'company-v2', chevronPosition: 'right' }}
                   sortableGroups={{ pageType: 'company-v2' }}

package/src/modules/customers/backend/customers/deals/[id]/hooks/useDealFormHandlers.ts

@@ -1,7 +1,10 @@
 import * as React from 'react'
 import { useRouter } from 'next/navigation'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { deleteCrud, updateCrud } from '@open-mercato/ui/backend/utils/crud'
+import { withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import type { DealFormSubmitPayload } from '../../../../../components/detail/DealForm'
@@ -40,11 +43,23 @@ export function useDealFormHandlers({
       if (!data) return
       setIsSaving(true)
       try {
-        await updateCrud('customers/deals', {
+        const body: Record<string, unknown> = {
           id: data.deal.id,
           ...payload.base,
-          ...payload.custom,
-        })
+        }
+        // Custom-field values MUST travel under `customFields` (bare keys). The
+        // deal update route's `splitCustomFieldPayload` only routes
+        // `customFields`/`customValues`/`cf_`/`cf:` entries to the custom-field
+        // writer; spreading bare keys into the body would land them in `base`
+        // where `dealUpdateSchema.parse` silently drops them, so edits never
+        // persisted (boolean/select/multi all reverted on refresh).
+        if (payload.custom && Object.keys(payload.custom).length) {
+          body.customFields = payload.custom
+        }
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(data.deal.updatedAt),
+          () => updateCrud('customers/deals', body),
+        )
         flash(t('customers.deals.detail.updateSuccess', 'Deal updated.'), 'success')
         await loadData()
       } finally {
@@ -64,10 +79,27 @@ export function useDealFormHandlers({
       variant: 'destructive',
     })
     if (!approved) return
-    await runMutationWithContext(
-      () => deleteCrud('customers/deals', currentDealId),
-      { id: currentDealId, operation: 'deleteDeal' },
-    )
+    try {
+      await runMutationWithContext(
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(data.deal.updatedAt),
+          () => deleteCrud('customers/deals', currentDealId),
+        ),
+        { id: currentDealId, operation: 'deleteDeal' },
+      )
+    } catch (err) {
+      // The guarded mutation routes a 409 to the unified conflict bar; surface
+      // any other server error as a flash instead of letting it crash the page.
+      if (!surfaceRecordConflict(err, t)) {
+        flash(
+          err instanceof Error && err.message.trim().length > 0
+            ? err.message
+            : t('customers.deals.detail.deleteError', 'Failed to delete deal.'),
+          'error',
+        )
+      }
+      return
+    }
     flash(t('customers.deals.detail.deleteSuccess', 'Deal deleted.'), 'success')
     router.push('/backend/customers/deals')
   }, [confirm, currentDealId, data, router, runMutationWithContext, t])

package/src/modules/customers/backend/customers/deals/[id]/page.tsx

@@ -228,6 +228,7 @@ export default function DealDetailPage({ params }: { params?: { id?: string } })
     const rawActivity = activity as unknown as Record<string, unknown>
     openScheduleEdit({
       id: activity.id,
+      updatedAt: typeof rawActivity.updatedAt === 'string' ? rawActivity.updatedAt as string : typeof rawActivity.updated_at === 'string' ? rawActivity.updated_at as string : null,
       interactionType: activity.interactionType,
       title: activity.title ?? null,
       body: activity.body ?? null,

package/src/modules/customers/backend/customers/deals/page.tsx

@@ -11,7 +11,9 @@ import type { AdvancedFilterTree } from '@open-mercato/shared/lib/query/advanced
 import { createEmptyTree, makeRuleTree, makeMultiRuleTree } from '@open-mercato/shared/lib/query/advanced-filter-tree'
 import { deserializeTree, deserializeAdvancedFilter, flatToTree, mapDictionaryColorToTone, serializeTree, type FilterFieldDef, type FilterOption as AdvancedFilterOption } from '@open-mercato/shared/lib/query/advanced-filter'
 import { useCurrentUserId } from '@open-mercato/ui/backend/utils/useCurrentUserId'
-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 { buildCrudExportUrl, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { groupBulkDeleteFailures, runBulkDelete } from '@open-mercato/ui/backend/utils/bulkDelete'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
@@ -447,14 +449,18 @@ export default function CustomersDealsPage() {
         variant: 'destructive',
       })
       if (!confirmed) return
+      const lockVersion = rows.find((row) => row.id === dealId)?.updatedAt ?? null
       setPendingDeleteId(dealId)
       try {
         await runSingleMutation({
           operation: async () => {
-            await deleteCrud('customers/deals', {
-              body: { id: dealId },
-              errorMessage: t('customers.deals.list.deleteError', 'Failed to delete deal.'),
-            })
+            await withScopedApiRequestHeaders(
+              buildOptimisticLockHeader(lockVersion),
+              () => deleteCrud('customers/deals', {
+                body: { id: dealId },
+                errorMessage: t('customers.deals.list.deleteError', 'Failed to delete deal.'),
+              }),
+            )
           },
           context: {
             formId: singleMutationContextId,
@@ -468,6 +474,12 @@ export default function CustomersDealsPage() {
         setTotal((prev) => Math.max(0, prev - 1))
         handleRefresh()
       } catch (err) {
+        // A stale delete surfaces the unified conflict bar (via the guarded
+        // mutation) — skip the generic error flash to avoid a double message (#2332).
+        if (surfaceRecordConflict(err, t)) {
+          handleRefresh()
+          return
+        }
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -477,7 +489,7 @@ export default function CustomersDealsPage() {
         setPendingDeleteId(null)
       }
     },
-    [confirm, handleRefresh, pendingDeleteId, retrySingleMutation, runSingleMutation, singleMutationContextId, t],
+    [confirm, handleRefresh, pendingDeleteId, retrySingleMutation, rows, runSingleMutation, singleMutationContextId, t],
   )
 
   const handlePageSizeChange = React.useCallback((newSize: number) => {

package/src/modules/customers/backend/customers/deals/pipeline/page.tsx

@@ -41,7 +41,9 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@open-mercato/ui/primitives/select'
-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 { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { useCurrentUserId } from '@open-mercato/ui/backend/utils/useCurrentUserId'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
@@ -1107,22 +1109,29 @@ export default function DealsKanbanPage(): React.ReactElement {
       }
       setPendingDealId(dealId)
 
+      // The moved deal's version, so a concurrent edit/move from another tab is
+      // refused instead of silently overwritten (#2055).
+      const dealVersion = typeof movingItem?.updated_at === 'string' ? movingItem.updated_at : null
+
       runMoveMutation({
         operation: async () => {
-          await apiCallOrThrow(
-            '/api/customers/deals',
-            {
-              method: 'PUT',
-              headers: { 'content-type': 'application/json' },
-              body: JSON.stringify({ id: dealId, pipelineStageId: targetStageId }),
-            },
-            {
-              errorMessage: translateWithFallback(
-                t,
-                'customers.deals.pipeline.moveError',
-                'Failed to update deal stage.',
-              ),
-            },
+          await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(dealVersion),
+            () => apiCallOrThrow(
+              '/api/customers/deals',
+              {
+                method: 'PUT',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify({ id: dealId, pipelineStageId: targetStageId }),
+              },
+              {
+                errorMessage: translateWithFallback(
+                  t,
+                  'customers.deals.pipeline.moveError',
+                  'Failed to update deal stage.',
+                ),
+              },
+            ),
           )
         },
         context: {
@@ -1145,6 +1154,8 @@ export default function DealsKanbanPage(): React.ReactElement {
           }
           // Restore extra-pages cache to pre-move snapshot
           setExtraCardsByStage(extraSnapshot)
+          // A stale move surfaces the unified conflict bar — skip the generic flash.
+          if (surfaceRecordConflict(error, t)) return
           const message =
             error instanceof Error && error.message
               ? error.message
@@ -1740,24 +1751,28 @@ export default function DealsKanbanPage(): React.ReactElement {
 
   const updateDealStatus = React.useCallback(
     async (dealId: string, status: 'win' | 'loose') => {
+      const dealVersion = deals.find((deal) => deal.id === dealId)?.updatedAt ?? null
       setPendingDealId(dealId)
       try {
         await runDealMutation({
           operation: async () => {
-            await apiCallOrThrow(
-              '/api/customers/deals',
-              {
-                method: 'PUT',
-                headers: { 'content-type': 'application/json' },
-                body: JSON.stringify({ id: dealId, status }),
-              },
-              {
-                errorMessage: translateWithFallback(
-                  t,
-                  'customers.deals.kanban.menu.error.status',
-                  'Failed to update deal status.',
-                ),
-              },
+            await withScopedApiRequestHeaders(
+              buildOptimisticLockHeader(dealVersion),
+              () => apiCallOrThrow(
+                '/api/customers/deals',
+                {
+                  method: 'PUT',
+                  headers: { 'content-type': 'application/json' },
+                  body: JSON.stringify({ id: dealId, status }),
+                },
+                {
+                  errorMessage: translateWithFallback(
+                    t,
+                    'customers.deals.kanban.menu.error.status',
+                    'Failed to update deal status.',
+                  ),
+                },
+              ),
             )
           },
           context: {
@@ -1783,6 +1798,7 @@ export default function DealsKanbanPage(): React.ReactElement {
         )
         invalidateKanbanData()
       } catch (error) {
+        if (surfaceRecordConflict(error, t)) { invalidateKanbanData(); return }
         const message =
           error instanceof Error && error.message
             ? error.message
@@ -1796,7 +1812,7 @@ export default function DealsKanbanPage(): React.ReactElement {
         setPendingDealId(null)
       }
     },
-    [invalidateKanbanData, retryDealMutation, runDealMutation, t],
+    [deals, invalidateKanbanData, retryDealMutation, runDealMutation, t],
   )
 
   const deleteDeal = React.useCallback(
@@ -1818,18 +1834,22 @@ export default function DealsKanbanPage(): React.ReactElement {
       })
       if (!confirmed) return
 
+      const lockVersion = deals.find((deal) => deal.id === dealId)?.updatedAt ?? null
       setPendingDealId(dealId)
       try {
         await runDealMutation({
           operation: async () => {
-            await deleteCrud('customers/deals', {
-              body: { id: dealId },
-              errorMessage: translateWithFallback(
-                t,
-                'customers.deals.kanban.menu.delete.error',
-                'Failed to delete deal.',
-              ),
-            })
+            await withScopedApiRequestHeaders(
+              buildOptimisticLockHeader(lockVersion),
+              () => deleteCrud('customers/deals', {
+                body: { id: dealId },
+                errorMessage: translateWithFallback(
+                  t,
+                  'customers.deals.kanban.menu.delete.error',
+                  'Failed to delete deal.',
+                ),
+              }),
+            )
           },
           context: {
             formId: dealMutationContextId,
@@ -1844,6 +1864,11 @@ export default function DealsKanbanPage(): React.ReactElement {
         )
         invalidateKanbanData()
       } catch (error) {
+        // A stale delete surfaces the unified conflict bar — skip the generic flash (#2332).
+        if (surfaceRecordConflict(error, t)) {
+          invalidateKanbanData()
+          return
+        }
         const message =
           error instanceof Error && error.message
             ? error.message
@@ -1857,7 +1882,7 @@ export default function DealsKanbanPage(): React.ReactElement {
         setPendingDealId(null)
       }
     },
-    [confirm, invalidateKanbanData, retryDealMutation, runDealMutation, t],
+    [confirm, deals, invalidateKanbanData, retryDealMutation, runDealMutation, t],
   )
 
   const bulkSelectionSummary = React.useMemo(() => {