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

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

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

@@ -7,7 +7,8 @@ import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Button } from '@open-mercato/ui/primitives/button'
 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'
@@ -68,6 +69,7 @@ type PersonOverview = {
     nextInteractionIcon?: string | null
     nextInteractionColor?: string | null
     organizationId?: string | null
+    updatedAt?: string | null
   }
   profile: {
     id: string
@@ -317,19 +319,31 @@ export default function CustomerPersonDetailPage({ params }: { params?: { id?: s
     async (patch: Record<string, unknown>, apply: (prev: PersonOverview) => PersonOverview) => {
       if (!data) return
       const payload = { id: data.person.id, ...patch }
-      await runMutationWithContext(
-        () => apiCallOrThrow(
-          '/api/customers/people',
-          {
-            method: 'PUT',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(payload),
-          },
-          { errorMessage: t('customers.people.detail.inline.error') },
+      const result = await runMutationWithContext(
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader((data?.person as { updatedAt?: string } | undefined)?.updatedAt),
+          () => apiCallOrThrow<{ ok?: boolean; updatedAt?: string | null }>(
+            '/api/customers/people',
+            {
+              method: 'PUT',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify(payload),
+            },
+            { errorMessage: t('customers.people.detail.inline.error') },
+          ),
         ),
         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, person: { ...applied.person, updatedAt: nextUpdatedAt } }
+          : applied
+      })
     },
     [data, runMutationWithContext, t]
   )
@@ -382,13 +396,16 @@ export default function CustomerPersonDetailPage({ params }: { params?: { id?: s
     setIsDeleting(true)
     try {
       await runMutationWithContext(
-        () => apiCallOrThrow(
-          `/api/customers/people?id=${encodeURIComponent(personId)}`,
-          {
-            method: 'DELETE',
-            headers: { 'content-type': 'application/json' },
-          },
-          { errorMessage: t('customers.people.list.deleteError') },
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader((data?.person as { updatedAt?: string } | undefined)?.updatedAt),
+          () => apiCallOrThrow(
+            `/api/customers/people?id=${encodeURIComponent(personId)}`,
+            {
+              method: 'DELETE',
+              headers: { 'content-type': 'application/json' },
+            },
+            { errorMessage: t('customers.people.list.deleteError') },
+          ),
         ),
         { id: personId },
       )
@@ -428,14 +445,17 @@ export default function CustomerPersonDetailPage({ params }: { params?: { id?: s
           customFields: customPayload,
         }
         await runMutationWithContext(
-          () => apiCallOrThrow(
-            '/api/customers/people',
-            {
-              method: 'PUT',
-              headers: { 'content-type': 'application/json' },
-              body: JSON.stringify(payload),
-            },
-            { errorMessage: t('customers.people.detail.inline.error') },
+          () => withScopedApiRequestHeaders(
+            buildOptimisticLockHeader((data?.person as { updatedAt?: string } | undefined)?.updatedAt),
+            () => apiCallOrThrow(
+              '/api/customers/people',
+              {
+                method: 'PUT',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify(payload),
+              },
+              { errorMessage: t('customers.people.detail.inline.error') },
+            ),
           ),
           payload,
         )

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

@@ -44,6 +44,7 @@ import { useAutoDiscoveredFields } from '@open-mercato/ui/backend/utils/useAutoD
 import { useAdvancedFilterTree } from '@open-mercato/ui/backend/hooks/useAdvancedFilter'
 import { AdvancedFilterPanel } from '@open-mercato/ui/backend/filters/AdvancedFilterPanel'
 import { ActiveFilterChips } from '@open-mercato/ui/backend/filters/ActiveFilterChips'
+import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
 import type { FilterPreset } from '@open-mercato/ui/backend/filters/QuickFilters'
 import { useQueryClient } from '@tanstack/react-query'
 import { ensureCustomerDictionary } from '../../../components/detail/hooks/useCustomerDictionary'
@@ -461,6 +462,7 @@ export default function CustomersPeoplePage() {
     try {
       await runSingleMutation({
         operation: async () => {
+          // optimistic-lock-exempt: delete-only mutation — no field-level lost-update
           await apiCallOrThrow(
             `/api/customers/people?id=${encodeURIComponent(person.id)}`,
             {
@@ -500,6 +502,7 @@ export default function CustomersPeoplePage() {
         runBulkDelete(
           selectedRows,
           async (row) => {
+            // optimistic-lock-exempt: bulk delete-only mutation — no field-level lost-update
             await apiCallOrThrow(`/api/customers/people?id=${encodeURIComponent(row.id)}`, {
               method: 'DELETE',
               headers: { 'content-type': 'application/json' },
@@ -963,7 +966,7 @@ export default function CustomersPeoplePage() {
           }}
           activeFilterChips={(
             <ActiveFilterChips
-              tree={filterPanel.tree}
+              tree={filterPanel.appliedTree}
               fields={advancedFilterFields}
               popoverOpen={filtersOpen}
               onRemoveNode={(id) => filterPanel.dispatch({ type: 'removeNode', nodeId: id })}
@@ -977,6 +980,13 @@ export default function CustomersPeoplePage() {
             onClearAll: handleAdvancedFilterClear,
             onRemoveLast: () => filterPanel.dispatch({ type: 'removeLast' }),
           }}
+          emptyState={(
+            <ListEmptyState
+              entityName={t('customers.people.entityPlural', 'people')}
+              createHref="/backend/customers/people/create"
+              createLabel={t('customers.people.list.actions.new')}
+            />
+          )}
           virtualized
           pagination={{ page, pageSize, total, totalPages, onPageChange: setPage, cacheStatus, pageSizeOptions: [10, 25, 50, 100], onPageSizeChange: handlePageSizeChange }}
           isLoading={isLoading}

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

@@ -7,12 +7,16 @@ import { User, Hash, Users, Building2 } from 'lucide-react'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { CrudForm } from '@open-mercato/ui/backend/CrudForm'
 import { CollapsibleZoneLayout, type ZoneSectionDescriptor } from '@open-mercato/ui/backend/crud/CollapsibleZoneLayout'
+import { useIsMobile } from '@open-mercato/ui/hooks/useIsMobile'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { E } from '#generated/entities.ids.generated'
 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 { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -23,6 +27,7 @@ import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuarde
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 
 import { ActivitiesSection } from '../../../../components/detail/ActivitiesSection'
+import { PersonEmailThreadsTab } from '../../../../components/detail/PersonEmailThreadsTab'
 import { ActivitiesCard } from '../../../../components/detail/ActivitiesCard'
 import type { ActivityKind } from '../../../../components/detail/ActivitiesAddNewMenu'
 import { DealsSection } from '../../../../components/detail/DealsSection'
@@ -52,6 +57,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
   const router = useRouter()
   const searchParams = useSearchParams()
   const { organizationId } = useOrganizationScopeDetail()
+  const isMobile = useIsMobile()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
 
   const detailTranslator = React.useMemo(() => createTranslatorWithFallback(t), [t])
@@ -61,6 +67,15 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
   const fields = React.useMemo(() => createPersonEditFields(t), [t])
 
   const [data, setData] = React.useState<PersonOverview | null>(null)
+  // Mirror the latest `data` into a ref so save handlers always read the current
+  // optimistic-lock token (`person.updatedAt`) instead of the value captured in
+  // their `useCallback` closure. Without this, a header-field save issued after a
+  // prior in-page reload would send a stale token (or none), letting a concurrent
+  // two-tab overwrite slip through without the 409 + conflict bar (#2055, Alina A7).
+  const dataRef = React.useRef<PersonOverview | null>(null)
+  React.useEffect(() => {
+    dataRef.current = data
+  }, [data])
   const [isLoading, setIsLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [isNotFound, setIsNotFound] = React.useState(false)
@@ -123,7 +138,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
 
   // Data loading
   const initialLoadDoneRef = React.useRef(false)
-  const loadData = React.useCallback(async () => {
+  const loadData = React.useCallback(async (lockTokenOverride?: string | null) => {
     if (!id) {
       setIsNotFound(true)
       setIsLoading(false)
@@ -140,7 +155,15 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
         undefined,
         { errorMessage: t('customers.people.detail.error.load', 'Failed to load person.') },
       )
-      setData(payload as PersonOverview)
+      // When the caller is the save handler, pin the optimistic-lock token to the
+      // value the write itself returned rather than the one this GET observed — a
+      // concurrent third-party bump between save and reload must stay stale so the
+      // next in-page save 409s (#2055, Alina A7). Applied in the same state update
+      // as the refresh to avoid a redundant second re-render.
+      const next = lockTokenOverride && payload?.person
+        ? { ...payload, person: { ...payload.person, updatedAt: lockTokenOverride, updated_at: lockTokenOverride } }
+        : payload
+      setData(next as PersonOverview)
     } catch (err) {
       if ((err as { status?: number }).status === 404) {
         setIsNotFound(true)
@@ -229,6 +252,7 @@ export default function PersonDetailV2Page({ 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,
@@ -328,9 +352,27 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
           throw err
         }
 
-        await updateCrud('customers/people', payload)
+        // Attach the current optimistic-lock token directly on this write path so
+        // every header-field edit (displayName/status/…) carries `updatedAt`, not
+        // just the fields the embedded CrudForm intercepts. Read from `dataRef` so
+        // the token reflects the latest in-page reload rather than a stale closure
+        // capture, and let the 409 propagate to CrudForm's surfaceRecordConflict so
+        // the unified conflict bar renders (#2055, Alina A7).
+        const lockedUpdatedAt = dataRef.current?.person?.updatedAt
+          ?? dataRef.current?.person?.updated_at
+          ?? null
+        const updateResponse = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(lockedUpdatedAt),
+          () => updateCrud<{ updatedAt?: string | null }>('customers/people', payload),
+        )
         flash(t('customers.people.form.updateSuccess', 'Person updated.'), 'success')
-        await loadData()
+        // Refresh the view and pin the optimistic-lock token to the write's OWN
+        // authoritative `updatedAt` in a single reload (see loadData) so a
+        // concurrent third-party bump stays stale on the next save (#2055, Alina A7).
+        const savedUpdatedAt = typeof updateResponse.result?.updatedAt === 'string'
+          ? updateResponse.result.updatedAt
+          : null
+        await loadData(savedUpdatedAt)
       } finally {
         setIsSaving(false)
       }
@@ -350,10 +392,28 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
         variant: 'destructive',
       })
       if (!approved) return
-      await runMutationWithContext(
-        () => deleteCrud('customers/people', { id: personId }),
-        { id: personId, operation: 'deletePerson' },
-      )
+      try {
+        await runMutationWithContext(
+          () => withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(data?.person?.updatedAt ?? data?.person?.updated_at ?? null),
+            () => deleteCrud('customers/people', { id: personId }),
+          ),
+          { id: personId, operation: 'deletePerson' },
+        )
+      } catch (err) {
+        // The guarded mutation routes a 409 to the unified conflict bar; surface
+        // any other server error (e.g. a linked-records delete guard) 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.people.detail.deleteError', 'Failed to delete person.'),
+            'error',
+          )
+        }
+        return
+      }
       flash(t('customers.people.list.deleteSuccess', 'Person deleted.'), 'success')
       router.push('/backend/customers/people')
     },
@@ -421,7 +481,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
     <Page>
       <PageBody>
         <div className="space-y-4">
-          {/* UMES header injection */}
+          {/* UMES header injection (third-party extensions) */}
           <InjectionSpot spotId="detail:customers.person:header" context={injectionContext} data={data} />
           <InjectionSpot spotId="detail:customers.person:status-badges" context={injectionContext} data={data} />
 
@@ -463,6 +523,7 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
                   fields={fields}
                   groups={groups}
                   initialValues={initialValues}
+                  optimisticLockUpdatedAt={data.person.updatedAt ?? data.person.updated_at ?? null}
                   onSubmit={handleFormSubmit}
                   onDelete={handleFormDelete}
                   hideFooterActions
@@ -519,6 +580,15 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
                     )
                   }
 
+                  if (activeTab === 'emails') {
+                    return (
+                      <PersonEmailThreadsTab
+                        personId={personId}
+                        defaultRecipient={data.person?.primaryEmail ?? null}
+                      />
+                    )
+                  }
+
                   if (activeTab === 'deals') {
                     return (
                       <DealsSection
@@ -592,22 +662,22 @@ export default function PersonDetailV2Page({ params }: { params?: { id?: string
                 </div>
               </PersonDetailTabs>
             )
-            return (
-              <>
-                <div className="md:hidden">
-                  <MobilePersonDetail zone1={zone1Content} zone2={zone2Content} />
-                </div>
-                <div className="hidden md:block">
-                  <CollapsibleZoneLayout
-                    pageType="person-v2"
-                    entityName={personName}
-                    isDirty={isDirty}
-                    sections={zoneSections}
-                    zone1={zone1Content}
-                    zone2={zone2Content}
-                  />
-                </div>
-              </>
+            // Render only the layout variant that matches the viewport. Mounting
+            // both the mobile and desktop layouts at once would create two
+            // CrudForm instances bound to one `formWrapperRef`, so header Save
+            // could submit the hidden instance's stale values and silently
+            // discard the edit (#2453). `useIsMobile` is SSR-safe.
+            return isMobile ? (
+              <MobilePersonDetail zone1={zone1Content} zone2={zone2Content} />
+            ) : (
+              <CollapsibleZoneLayout
+                pageType="person-v2"
+                entityName={personName}
+                isDirty={isDirty}
+                sections={zoneSections}
+                zone1={zone1Content}
+                zone2={zone2Content}
+              />
             )
           })()}
 

package/src/modules/customers/commands/activities.ts

@@ -182,6 +182,34 @@ const createActivityCommand: CommandHandler<ActivityCreateInput, { activityId: s
       logEntry: normalizeUndoCreateLogEntry(logEntry, payload),
     })
   },
+  redo: async ({ logEntry, ctx }) => {
+    const payload = extractUndoPayload<InteractionUndoPayload>(logEntry)
+    const canonicalCreate = getRequiredHandler<
+      InteractionCreateInput & { customValues?: Record<string, unknown> },
+      { interactionId: string; entityId: string }
+    >('customers.interactions.create')
+    if (!canonicalCreate.redo) {
+      throw new Error('[internal] Missing redo handler: customers.interactions.create')
+    }
+    const result = await canonicalCreate.redo({
+      input: {
+        tenantId:
+          payload?.after?.interaction.tenantId ??
+          (typeof logEntry.tenantId === 'string' ? logEntry.tenantId : '00000000-0000-0000-0000-000000000000'),
+        organizationId:
+          payload?.after?.interaction.organizationId ??
+          (typeof logEntry.organizationId === 'string'
+            ? logEntry.organizationId
+            : '00000000-0000-0000-0000-000000000000'),
+        entityId: payload?.after?.interaction.entityId ?? '00000000-0000-0000-0000-000000000000',
+        interactionType: payload?.after?.interaction.interactionType ?? 'compatibility',
+        status: 'planned',
+      },
+      ctx,
+      logEntry: normalizeUndoCreateLogEntry(logEntry, payload),
+    })
+    return { activityId: result.interactionId }
+  },
 }
 
 /** @deprecated Use interaction commands instead. Maintained as a compatibility bridge per SPEC-046b. */