@open-mercato/core 0.6.4-develop.4382.1.6b4f656b77 → 0.6.4

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

@@ -26,6 +26,7 @@ import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { emitCustomersEvent } from '../events'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 
 const tagCrudEvents: CrudEventsConfig = {
   module: 'customers',
@@ -152,6 +153,11 @@ const createTagCommand: CommandHandler<TagCreateInput, { tagId: string }> = {
       await em.flush()
     }
   },
+  redo: makeCreateRedo<CustomerTag, TagSnapshot, TagCreateInput, { tagId: string }>({
+    entityClass: CustomerTag,
+    buildResult: (entity) => ({ tagId: entity.id }),
+    events: tagCrudEvents,
+  }),
 }
 
 const updateTagCommand: CommandHandler<TagUpdateInput, { tagId: string }> = {
@@ -462,6 +468,59 @@ const assignTagCommand: CommandHandler<TagAssignmentInput, { assignmentId: strin
       organizationId: before.organizationId,
     })
   },
+  redo: async ({ logEntry, ctx }) => {
+    const payload = extractUndoPayload<TagAssignmentUndoPayload>(logEntry)
+    const before = payload?.before
+    if (!before) {
+      throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for tag assign' })
+    }
+    const assignmentId = logEntry?.resourceId ?? null
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const tag = await em.findOne(CustomerTag, { id: before.tagId })
+    if (!tag) throw new CrudHttpError(404, { error: 'Tag not found' })
+    const entity = await requireCustomerEntity(em, before.entityId, undefined, 'Customer not found')
+    ensureSameScope(entity, before.organizationId, before.tenantId)
+
+    let assignment = await em.findOne(CustomerTagAssignment, {
+      tag,
+      entity,
+      tenantId: before.tenantId,
+      organizationId: before.organizationId,
+    })
+    if (!assignment) {
+      assignment = em.create(CustomerTagAssignment, {
+        ...(assignmentId ? { id: assignmentId } : {}),
+        tag,
+        entity,
+        organizationId: before.organizationId,
+        tenantId: before.tenantId,
+      })
+      em.persist(assignment)
+      await em.flush()
+    }
+
+    const de = (ctx.container.resolve('dataEngine') as DataEngine)
+    await emitCrudSideEffects({
+      dataEngine: de,
+      action: 'updated',
+      entity: assignment,
+      identifiers: {
+        id: String(assignment.id),
+        organizationId: before.organizationId,
+        tenantId: before.tenantId,
+      },
+    })
+
+    await emitCustomersEvent('customers.tag.assigned', {
+      id: String(assignment.id),
+      tagId: before.tagId,
+      entityId: before.entityId,
+      organizationId: before.organizationId,
+      tenantId: before.tenantId,
+    }, { persistent: true })
+
+    return { assignmentId: assignment.id }
+  },
 }
 
 const unassignTagCommand: CommandHandler<TagAssignmentInput, { assignmentId: string | null }> = {

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

@@ -464,6 +464,34 @@ const createTodoCommand: CommandHandler<TodoLinkWithTodoCreateInput, { linkId: 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: 'task',
+        status: 'planned',
+      },
+      ctx,
+      logEntry: normalizeUndoCreateLogEntry(logEntry, payload),
+    })
+    return { linkId: result.interactionId, todoId: result.interactionId }
+  },
 }
 
 registerCommand(unlinkTodoCommand)

package/src/modules/customers/components/AddressFormatSettings.tsx

@@ -87,6 +87,7 @@ export function AddressFormatSettings() {
       setPending(next)
       setError(null)
       try {
+        // optimistic-lock-exempt: single-row tenant address-format preference toggle — no per-record version / concurrent record edit
         const call = await apiCall<Record<string, unknown>>(
           '/api/customers/settings/address-format',
           {

package/src/modules/customers/components/CustomersConfigurationSections.tsx

@@ -3,6 +3,7 @@
 import * as React from 'react'
 import { AddressFormatSettings } from './AddressFormatSettings'
 import PipelineSettings from './PipelineSettings'
+import DictionarySortSettings from './DictionarySortSettings'
 import DictionarySettings from './DictionarySettings'
 
 function SettingsSectionSkeleton() {
@@ -22,6 +23,7 @@ export default function CustomersConfigurationSections() {
         <SettingsSectionSkeleton />
         <SettingsSectionSkeleton />
         <SettingsSectionSkeleton />
+        <SettingsSectionSkeleton />
       </>
     )
   }
@@ -30,6 +32,7 @@ export default function CustomersConfigurationSections() {
     <>
       <AddressFormatSettings />
       <PipelineSettings />
+      <DictionarySortSettings />
       <DictionarySettings />
     </>
   )

package/src/modules/customers/components/DictionarySettings.tsx

@@ -8,7 +8,8 @@ import {
   DialogTitle,
 } from '@open-mercato/ui/primitives/dialog'
 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 { 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'
@@ -220,10 +221,12 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
     })
     if (!confirmed) return
     try {
-      await apiCallOrThrow(
-        `/api/customers/dictionaries/${kind}/${encodeURIComponent(entry.id)}`,
-        { method: 'DELETE' },
-        { errorMessage: errorDelete },
+      await withScopedApiRequestHeaders(buildOptimisticLockHeader(entry.updatedAt), () =>
+        apiCallOrThrow(
+          `/api/customers/dictionaries/${kind}/${encodeURIComponent(entry.id)}`,
+          { method: 'DELETE' },
+          { errorMessage: errorDelete },
+        ),
       )
       flash(successDelete, 'success')
       await loadEntries()
@@ -281,14 +284,16 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
           closeDialog()
           return
         }
-        await apiCallOrThrow(
-          `/api/customers/dictionaries/${kind}/${encodeURIComponent(target.id)}`,
-          {
-            method: 'PATCH',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(body),
-          },
-          { errorMessage: errorSave },
+        await withScopedApiRequestHeaders(buildOptimisticLockHeader(target.updatedAt), () =>
+          apiCallOrThrow(
+            `/api/customers/dictionaries/${kind}/${encodeURIComponent(target.id)}`,
+            {
+              method: 'PATCH',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify(body),
+            },
+            { errorMessage: errorSave },
+          ),
         )
         flash(successSave, 'success')
       }

package/src/modules/customers/components/DictionarySortSettings.tsx

@@ -0,0 +1,268 @@
+"use client"
+
+import * as React from 'react'
+import { Spinner } from '@open-mercato/ui/primitives/spinner'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@open-mercato/ui/primitives/select'
+import { flash } from '@open-mercato/ui/backend/FlashMessages'
+import { apiCallOrThrow, readApiResultOrThrow } 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'
+import {
+  DEFAULT_DICTIONARY_ENTRY_SORT_MODE,
+  dictionaryEntrySortModes,
+  type DictionaryEntrySortMode,
+} from '@open-mercato/core/modules/dictionaries/lib/entrySort'
+import type { CustomerDictionaryKind } from '../lib/dictionaries'
+
+const SAVE_CONTEXT_ID = 'customers-dictionary-sort-modes'
+
+type SortModeMap = Partial<Record<CustomerDictionaryKind, DictionaryEntrySortMode>>
+
+type DictionarySortSection = {
+  kind: CustomerDictionaryKind
+  title: string
+  description: string
+}
+
+function isDictionaryEntrySortMode(value: string): value is DictionaryEntrySortMode {
+  return dictionaryEntrySortModes.includes(value as DictionaryEntrySortMode)
+}
+
+export function DictionarySortSettings() {
+  const t = useT()
+  const scopeVersion = useOrganizationScopeVersion()
+  const [sortModes, setSortModes] = React.useState<SortModeMap>({})
+  const [loading, setLoading] = React.useState(true)
+  const [savingKind, setSavingKind] = React.useState<CustomerDictionaryKind | null>(null)
+  const [error, setError] = React.useState<string | null>(null)
+
+  const sections = React.useMemo<DictionarySortSection[]>(() => [
+    {
+      kind: 'statuses',
+      title: t('customers.config.dictionaries.sections.statuses.title', 'Statuses'),
+      description: t('customers.config.dictionaries.sections.statuses.description', 'Define the statuses available for customer records.'),
+    },
+    {
+      kind: 'sources',
+      title: t('customers.config.dictionaries.sections.sources.title', 'Sources'),
+      description: t('customers.config.dictionaries.sections.sources.description', 'Capture how customers were acquired.'),
+    },
+    {
+      kind: 'lifecycle-stages',
+      title: t('customers.config.dictionaries.sections.lifecycle.title', 'Lifecycle stages'),
+      description: t('customers.config.dictionaries.sections.lifecycle.description', 'Configure lifecycle stages to track customer progress.'),
+    },
+    {
+      kind: 'deal-statuses',
+      title: t('customers.config.dictionaries.sections.dealStatuses.title', 'Deal statuses'),
+      description: t('customers.config.dictionaries.sections.dealStatuses.description', 'Manage the statuses available for deals.'),
+    },
+    {
+      kind: 'pipeline-stages',
+      title: t('customers.config.dictionaries.sections.pipelineStages.title', 'Pipeline stages'),
+      description: t('customers.config.dictionaries.sections.pipelineStages.description', 'Define the stages used in your deal pipeline.'),
+    },
+    {
+      kind: 'person-company-roles',
+      title: t('customers.config.dictionaries.sections.personCompanyRoles.title', 'Role types'),
+      description: t('customers.config.dictionaries.sections.personCompanyRoles.description', 'Manage the ownership roles available in People tab assignments.'),
+    },
+    {
+      kind: 'job-titles',
+      title: t('customers.config.dictionaries.sections.jobTitles.title', 'Job titles'),
+      description: t('customers.config.dictionaries.sections.jobTitles.description', 'Configure job titles with their appearance.'),
+    },
+    {
+      kind: 'industries',
+      title: t('customers.config.dictionaries.sections.industries.title', 'Industries'),
+      description: t('customers.config.dictionaries.sections.industries.description', 'Manage the industries used by companies.'),
+    },
+    {
+      kind: 'activity-types',
+      title: t('customers.config.dictionaries.sections.activityTypes.title', 'Activity types'),
+      description: t('customers.config.dictionaries.sections.activityTypes.description', 'Define the activity types used for customer interactions.'),
+    },
+    {
+      kind: 'address-types',
+      title: t('customers.config.dictionaries.sections.addressTypes.title', 'Address types'),
+      description: t('customers.config.dictionaries.sections.addressTypes.description', 'Define the available address types.'),
+    },
+  ], [t])
+
+  const sortOptions = React.useMemo(
+    () => dictionaryEntrySortModes.map((mode) => ({
+      value: mode,
+      label:
+        mode === 'label_asc'
+          ? t('dictionaries.config.sortModes.labelAsc', 'A to Z')
+          : mode === 'label_desc'
+            ? t('dictionaries.config.sortModes.labelDesc', 'Z to A')
+            : mode === 'value_asc'
+              ? t('dictionaries.config.sortModes.valueAsc', 'Value A to Z')
+              : mode === 'value_desc'
+                ? t('dictionaries.config.sortModes.valueDesc', 'Value Z to A')
+                : mode === 'created_at_asc'
+                  ? t('dictionaries.config.sortModes.createdAtAsc', 'Oldest first')
+                  : t('dictionaries.config.sortModes.createdAtDesc', 'Newest first'),
+    })),
+    [t],
+  )
+
+  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'),
+  })
+
+  React.useEffect(() => {
+    let cancelled = false
+    async function load() {
+      setLoading(true)
+      setError(null)
+      try {
+        const data = await readApiResultOrThrow<{ dictionarySortModes?: Record<string, string> }>(
+          '/api/customers/settings/dictionary-sort-modes',
+          undefined,
+          { errorMessage: t('customers.config.dictionarySorting.errorLoad', 'Failed to load dictionary sorting settings.') },
+        )
+        const next: SortModeMap = {}
+        for (const section of sections) {
+          const value = data?.dictionarySortModes?.[section.kind]
+          next[section.kind] = value && isDictionaryEntrySortMode(value)
+            ? value
+            : DEFAULT_DICTIONARY_ENTRY_SORT_MODE
+        }
+        if (!cancelled) setSortModes(next)
+      } catch (err) {
+        console.error('customers.dictionarySorting.load failed', err)
+        if (!cancelled) {
+          const message = err instanceof Error && err.message
+            ? err.message
+            : t('customers.config.dictionarySorting.errorLoad', 'Failed to load dictionary sorting settings.')
+          setError(message)
+          flash(message, 'error')
+        }
+      } finally {
+        if (!cancelled) setLoading(false)
+      }
+    }
+    load().catch(() => {})
+    return () => {
+      cancelled = true
+    }
+  }, [scopeVersion, sections, t])
+
+  const handleChange = React.useCallback(async (kind: CustomerDictionaryKind, mode: DictionaryEntrySortMode) => {
+    const previous = sortModes
+    const next = { ...sortModes, [kind]: mode }
+    setSortModes(next)
+    setSavingKind(kind)
+    setError(null)
+    try {
+      await runMutation({
+        // optimistic-lock-exempt: tenant-scoped settings blob (dictionary sort
+        // modes), not a versioned per-record entity — there is no `updatedAt`
+        // round-trip to lock against, and concurrent writes converge on the
+        // last-selected preference. Mirrors other singleton settings PATCHes.
+        operation: async () => {
+          await apiCallOrThrow(
+            '/api/customers/settings/dictionary-sort-modes',
+            {
+              method: 'PATCH',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({ dictionarySortModes: next }),
+            },
+            { errorMessage: t('customers.config.dictionarySorting.errorSave', 'Failed to save dictionary sorting settings.') },
+          )
+        },
+        context: {
+          formId: SAVE_CONTEXT_ID,
+          resourceKind: 'customers.settings',
+          retryLastMutation,
+        },
+      })
+      flash(t('customers.config.dictionarySorting.success', 'Dictionary sorting settings saved.'), 'success')
+    } catch (err) {
+      setSortModes(previous)
+      const message = err instanceof Error && err.message
+        ? err.message
+        : t('customers.config.dictionarySorting.errorSave', 'Failed to save dictionary sorting settings.')
+      setError(message)
+      flash(message, 'error')
+    } finally {
+      setSavingKind(null)
+    }
+  }, [retryLastMutation, runMutation, sortModes, t])
+
+  return (
+    <section className="space-y-4 rounded-lg border bg-background p-4">
+      <header className="space-y-1">
+        <h2 className="text-lg font-semibold">
+          {t('customers.config.dictionarySorting.title', 'Dictionary sorting')}
+        </h2>
+        <p className="text-sm text-muted-foreground">
+          {t('customers.config.dictionarySorting.description', 'Choose how customer dictionary values are ordered in dropdowns and settings.')}
+        </p>
+      </header>
+      {loading ? (
+        <div className="flex items-center gap-2 text-sm text-muted-foreground">
+          <Spinner className="h-4 w-4" />
+          {t('customers.config.dictionarySorting.loading', 'Loading dictionary sorting settings…')}
+        </div>
+      ) : (
+        <div className="grid gap-3 lg:grid-cols-2">
+          {sections.map((section) => {
+            const value = sortModes[section.kind] ?? DEFAULT_DICTIONARY_ENTRY_SORT_MODE
+            const saving = savingKind === section.kind
+            return (
+              <div key={section.kind} className="rounded border p-3">
+                <div className="mb-3 space-y-1">
+                  <div className="text-sm font-medium">{section.title}</div>
+                  <div className="text-xs text-muted-foreground">{section.description}</div>
+                </div>
+                <Select
+                  value={value}
+                  onValueChange={(next) => {
+                    if (!isDictionaryEntrySortMode(next) || next === value) return
+                    handleChange(section.kind, next).catch(() => {})
+                  }}
+                  disabled={savingKind !== null}
+                >
+                  <SelectTrigger>
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {sortOptions.map((option) => (
+                      <SelectItem key={option.value} value={option.value}>
+                        {option.label}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+                {saving ? (
+                  <div className="mt-2 inline-flex items-center gap-2 text-xs text-muted-foreground">
+                    <Spinner className="h-3 w-3" />
+                    {t('customers.config.dictionarySorting.updating', 'Saving…')}
+                  </div>
+                ) : null}
+              </div>
+            )
+          })}
+        </div>
+      )}
+      {error ? <p className="text-sm text-status-error-text">{error}</p> : null}
+    </section>
+  )
+}
+
+export default DictionarySortSettings

package/src/modules/customers/components/PipelineSettings.tsx

@@ -13,7 +13,8 @@ import {
   DialogTitle,
 } from '@open-mercato/ui/primitives/dialog'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-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 { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -40,6 +41,7 @@ type Pipeline = {
   isDefault: boolean
   organizationId: string
   tenantId: string
+  updatedAt?: string | null
 }
 
 type PipelineStage = {
@@ -49,6 +51,7 @@ type PipelineStage = {
   order: number
   color: string | null
   icon: string | null
+  updatedAt?: string | null
 }
 
 type PipelineDialogState =
@@ -66,6 +69,7 @@ function normalizePipeline(raw: Record<string, unknown>): Pipeline {
     isDefault: raw.isDefault === true || raw.is_default === true,
     organizationId: typeof raw.organizationId === 'string' ? raw.organizationId : (typeof raw.organization_id === 'string' ? raw.organization_id : ''),
     tenantId: typeof raw.tenantId === 'string' ? raw.tenantId : (typeof raw.tenant_id === 'string' ? raw.tenant_id : ''),
+    updatedAt: typeof raw.updatedAt === 'string' ? raw.updatedAt : (typeof raw.updated_at === 'string' ? raw.updated_at : null),
   }
 }
 
@@ -77,6 +81,7 @@ function normalizeStage(raw: Record<string, unknown>): PipelineStage {
     order: typeof raw.order === 'number' ? raw.order : 0,
     color: typeof raw.color === 'string' && raw.color.trim().length ? raw.color.trim() : null,
     icon: typeof raw.icon === 'string' && raw.icon.trim().length ? raw.icon.trim() : null,
+    updatedAt: typeof raw.updatedAt === 'string' ? raw.updatedAt : (typeof raw.updated_at === 'string' ? raw.updated_at : null),
   }
 }
 
@@ -171,11 +176,15 @@ export default function PipelineSettings(): React.ReactElement {
         }
         flash(t('customers.pipelines.flash.created', 'Pipeline created'), 'success')
       } else if (pipelineDialog?.mode === 'edit') {
-        const res = await apiCall('/api/customers/pipelines', {
-          method: 'PUT',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ id: pipelineDialog.entry.id, name: pipelineForm.name.trim(), isDefault: pipelineForm.isDefault }),
-        })
+        const res = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(pipelineDialog.entry.updatedAt),
+          () =>
+            apiCall('/api/customers/pipelines', {
+              method: 'PUT',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({ id: pipelineDialog.entry.id, name: pipelineForm.name.trim(), isDefault: pipelineForm.isDefault }),
+            }),
+        )
         if (!res.ok) {
           await raiseCrudError(res.response, t('customers.pipelines.errors.updateFailed', 'Failed to update pipeline'))
           return
@@ -197,11 +206,15 @@ export default function PipelineSettings(): React.ReactElement {
       variant: 'destructive',
     })
     if (!confirmed) return
-    const res = await apiCall('/api/customers/pipelines', {
-      method: 'DELETE',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ id: pipeline.id }),
-    })
+    const res = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(pipeline.updatedAt),
+      () =>
+        apiCall('/api/customers/pipelines', {
+          method: 'DELETE',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ id: pipeline.id }),
+        }),
+    )
     if (!res.ok) {
       const body = (res.result ?? {}) as Record<string, unknown>
       const msg = typeof body.error === 'string' ? body.error : t('customers.pipelines.errors.deleteFailed', 'Failed to delete pipeline')
@@ -248,11 +261,15 @@ export default function PipelineSettings(): React.ReactElement {
         flash(t('customers.pipelines.flash.stageCreated', 'Stage created'), 'success')
         await loadStages(stageDialog.pipelineId)
       } else if (stageDialog?.mode === 'edit') {
-        const res = await apiCall('/api/customers/pipeline-stages', {
-          method: 'PUT',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ id: stageDialog.entry.id, label: stageForm.label.trim(), ...appearance }),
-        })
+        const res = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(stageDialog.entry.updatedAt),
+          () =>
+            apiCall('/api/customers/pipeline-stages', {
+              method: 'PUT',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({ id: stageDialog.entry.id, label: stageForm.label.trim(), ...appearance }),
+            }),
+        )
         if (!res.ok) {
           await raiseCrudError(res.response, t('customers.pipelines.errors.stageUpdateFailed', 'Failed to update stage'))
           return
@@ -274,11 +291,15 @@ export default function PipelineSettings(): React.ReactElement {
       variant: 'destructive',
     })
     if (!confirmed) return
-    const res = await apiCall('/api/customers/pipeline-stages', {
-      method: 'DELETE',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ id: stage.id }),
-    })
+    const res = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(stage.updatedAt),
+      () =>
+        apiCall('/api/customers/pipeline-stages', {
+          method: 'DELETE',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ id: stage.id }),
+        }),
+    )
     if (!res.ok) {
       const body = (res.result ?? {}) as Record<string, unknown>
       const msg = typeof body.error === 'string' ? body.error : t('customers.pipelines.errors.stageDeleteFailed', 'Failed to delete stage')

package/src/modules/customers/components/detail/ActivityCard.tsx

@@ -11,6 +11,7 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { cn } from '@open-mercato/shared/lib/utils'
 import type { InteractionSummary } from './types'
 import { ActivityAiActions } from './ActivityAiActions'
+import { EmailCardActions, type EmailCardWidgetData } from './EmailCardActions'
 
 type GuardedMutationRunner = <T,>(
   operation: () => Promise<T>,
@@ -72,6 +73,42 @@ function resolveTarget(activity: InteractionSummary): string | null {
   return null
 }
 
+/**
+ * Build the `EmailCardWidgetData` for the email-card-actions injection spot.
+ * Email metadata (rfcMessageId, addresses, threading headers, current visibility,
+ * and the author flag) is populated server-side by `interactionEmailCardEnricher`
+ * and surfaced via the `_integrations.email` passthrough; missing values fall
+ * back to null.
+ */
+function buildEmailCardWidgetData(activity: InteractionSummary): EmailCardWidgetData {
+  const integrations = activity._integrations as Record<string, unknown> | undefined
+  const emailMeta = (integrations?.email ?? {}) as Record<string, unknown>
+  return {
+    interactionId: activity.id,
+    // The MessageChannelLink UUID stored on the interaction row.
+    externalMessageId:
+      typeof emailMeta.externalMessageId === 'string' ? emailMeta.externalMessageId : null,
+    // RFC2822 Message-ID (e.g. "<abc@mail.gmail.com>") for In-Reply-To / References headers.
+    rfcMessageId:
+      typeof emailMeta.rfcMessageId === 'string' ? emailMeta.rfcMessageId : null,
+    // entityId is the CustomerEntity id — on a person detail page this IS the personId.
+    personId: activity.entityId ?? null,
+    fromAddress:
+      typeof emailMeta.fromAddress === 'string' ? emailMeta.fromAddress : null,
+    toAddresses: Array.isArray(emailMeta.toAddresses) ? (emailMeta.toAddresses as string[]) : null,
+    ccAddresses: Array.isArray(emailMeta.ccAddresses) ? (emailMeta.ccAddresses as string[]) : null,
+    subject: activity.title ?? null,
+    inReplyTo:
+      typeof emailMeta.inReplyTo === 'string' ? emailMeta.inReplyTo : null,
+    references: Array.isArray(emailMeta.references) ? (emailMeta.references as string[]) : null,
+    currentVisibility:
+      emailMeta.currentVisibility === 'private' || emailMeta.currentVisibility === 'shared'
+        ? emailMeta.currentVisibility
+        : null,
+    isAuthor: typeof emailMeta.isAuthor === 'boolean' ? emailMeta.isAuthor : null,
+  }
+}
+
 export function ActivityCard({ activity, onOpen, onChanged, runMutation }: ActivityCardProps) {
   const t = useT()
   const timestamp = activity.occurredAt ?? activity.scheduledAt ?? activity.createdAt
@@ -194,6 +231,17 @@ export function ActivityCard({ activity, onOpen, onChanged, runMutation }: Activ
           <ActivityAiActions activityType={activity.interactionType} />
         </div>
 
+        {activity.interactionType === 'email' ? (
+          <div
+            className="mt-1"
+            onClick={(event) => event.stopPropagation()}
+            onKeyDown={(event) => event.stopPropagation()}
+            role="presentation"
+          >
+            <EmailCardActions data={buildEmailCardWidgetData(activity)} />
+          </div>
+        ) : null}
+
         {snippet ? (
           <p className="mt-2 text-sm text-muted-foreground">{snippet}</p>
         ) : null}

package/src/modules/customers/components/detail/ActivityForm.tsx

@@ -223,6 +223,7 @@ export function ActivityForm({
           allowInlineCreate
           appearanceLabels={dictionaryAppearanceLabels}
           selectClassName="w-full"
+          sortOptions="none"
           manageHref="/backend/config/customers"
         />
       ),