@open-mercato/core 0.10.1-develop.7836.1.0ef0f453c6 → 0.10.1-develop.7847.1.7d83dc5794

package/src/modules/customer_accounts/lib/adminOrganizationScope.ts

@@ -0,0 +1,71 @@
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import type { AwilixContainer } from 'awilix'
+import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
+import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
+import {
+  organizationScopeRequiredResponse,
+  resolveActiveOrganizationId,
+} from '@open-mercato/shared/lib/auth/organizationScope'
+import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
+
+export type AdminTargetOrganizationResult =
+  | { ok: true; organizationId: string }
+  | { ok: false; response: Response }
+
+const organizationIdSchema = z.string().uuid()
+
+async function organizationNotFound(): Promise<AdminTargetOrganizationResult> {
+  const { translate } = await resolveTranslations()
+  return {
+    ok: false,
+    response: NextResponse.json({ ok: false, error: translate('customer_accounts.admin.errors.organizationNotFound', 'Organization not found') }, { status: 400 }),
+  }
+}
+
+/**
+ * Resolves the organization a staff-initiated customer-accounts write targets.
+ *
+ * Without a request the caller's active organization is used, falling back to the
+ * actor's own organization under an "all organizations" selection.
+ *
+ * An explicitly requested organization is honored only when the organization-scope
+ * resolver grants it for the caller's own tenant: it must exist, not be deleted, and
+ * sit inside the caller's allowed organization set.
+ */
+export async function resolveAdminTargetOrganization({
+  container,
+  auth,
+  request,
+  requestedOrganizationId,
+}: {
+  container: AwilixContainer
+  auth: NonNullable<AuthContext>
+  request: Request
+  requestedOrganizationId?: string | null
+}): Promise<AdminTargetOrganizationResult> {
+  const requested = typeof requestedOrganizationId === 'string' && requestedOrganizationId.trim().length > 0
+    ? requestedOrganizationId.trim()
+    : null
+  const activeOrganizationId = resolveActiveOrganizationId(auth)
+
+  if (!requested) {
+    if (!activeOrganizationId) return { ok: false, response: organizationScopeRequiredResponse() }
+    return { ok: true, organizationId: activeOrganizationId }
+  }
+
+  if (!organizationIdSchema.safeParse(requested).success) return organizationNotFound()
+  if (requested === activeOrganizationId) return { ok: true, organizationId: requested }
+
+  const scope = await resolveOrganizationScopeForRequest({
+    container,
+    auth,
+    request,
+    selectedId: requested,
+    tenantId: auth.tenantId ?? null,
+  })
+  if (scope.selectionRejected || scope.selectedId !== requested || scope.tenantId !== (auth.tenantId ?? null)) {
+    return organizationNotFound()
+  }
+  return { ok: true, organizationId: requested }
+}

package/src/modules/customers/api/customer-dictionary-entries/route.ts

@@ -0,0 +1,82 @@
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import type { FilterQuery } from '@mikro-orm/core'
+import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
+import { CustomerDictionaryEntry } from '../../data/entities'
+import { resolveDictionaryRouteContext } from '../dictionaries/context'
+import { createPagedListResponseSchema } from '../openapi'
+
+const querySchema = z.object({
+  page: z.coerce.number().int().min(1).default(1),
+  pageSize: z.coerce.number().int().min(1).max(100).default(20),
+  search: z.string().trim().max(150).optional(),
+  id: z.string().uuid().optional(),
+})
+
+export const metadata = {
+  GET: { requireAuth: true, requireFeatures: ['customers.settings.manage', 'translations.view'] },
+}
+
+export async function GET(req: Request) {
+  try {
+    const url = new URL(req.url)
+    const query = querySchema.parse({
+      page: url.searchParams.get('page') ?? undefined,
+      pageSize: url.searchParams.get('pageSize') ?? undefined,
+      search: url.searchParams.get('search') ?? undefined,
+      id: url.searchParams.get('id') ?? undefined,
+    })
+    const { em, tenantId, organizationId, translate } = await resolveDictionaryRouteContext(req)
+    if (!organizationId) {
+      return NextResponse.json({ error: translate('customers.errors.organization_required', 'Organization context is required') }, { status: 400 })
+    }
+    const where: FilterQuery<CustomerDictionaryEntry> = {
+      tenantId,
+      organizationId,
+      ...(query.id ? { id: query.id } : {}),
+      ...(query.search ? { label: { $ilike: `%${escapeLikePattern(query.search)}%` } } : {}),
+    }
+    const total = await em.count(CustomerDictionaryEntry, where)
+    const entries = await findWithDecryption(em, CustomerDictionaryEntry, where, {
+      orderBy: { kind: 'asc', label: 'asc', id: 'asc' },
+      limit: query.pageSize,
+      offset: (query.page - 1) * query.pageSize,
+    }, { tenantId, organizationId })
+    return NextResponse.json({
+      items: entries.map(({ id, kind, value, label, updatedAt }) => ({ id, kind, value, label, updatedAt })),
+      total,
+      page: query.page,
+      pageSize: query.pageSize,
+      totalPages: Math.ceil(total / query.pageSize),
+    })
+  } catch (error) {
+    if (isCrudHttpError(error)) return NextResponse.json(error.body, { status: error.status })
+    if (error instanceof z.ZodError) {
+      const { translate } = await resolveTranslations()
+      return NextResponse.json({ error: translate('customers.errors.invalid_query', 'Invalid query parameters') }, { status: 400 })
+    }
+    throw error
+  }
+}
+
+export const openApi: OpenApiRouteDoc = {
+  tag: 'Customers',
+  summary: 'Customer dictionary translation records',
+  methods: {
+    GET: {
+      summary: 'List base labels for translation management',
+      query: querySchema,
+      responses: [{
+        status: 200,
+        description: 'Dictionary entries in the selected organization with their stored base labels',
+        schema: createPagedListResponseSchema(z.object({
+          id: z.string().uuid(), kind: z.string(), value: z.string(), label: z.string(), updatedAt: z.string(),
+        })),
+      }],
+    },
+  },
+}

package/src/modules/customers/api/dictionaries/[kind]/route.ts

@@ -24,6 +24,8 @@ import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { CUSTOMER_DICTIONARY_ORGANIZATION_REQUIRED_CODE } from '../../../lib/dictionaries'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
+import { getTranslationOverlayPlugin } from '@open-mercato/shared/lib/localization/overlay-plugin'
+import { localizeCustomerDictionaryEntries } from '../../../lib/dictionaryLabels'
 import { calendarEventTypeBehaviorSchema } from '../../../calendar-event-types'
 import type { OrganizationHierarchyService } from '@open-mercato/shared/lib/auth/principal-service'
 
@@ -42,6 +44,9 @@ const postSchema = z.object({
 
 const querySchema = z.object({
   organizationId: z.string().uuid().optional(),
+  labels: z.enum(['localized', 'base']).optional().describe(
+    'Label projection. `localized` (default) resolves labels for the request locale; `base` returns the stored labels that management screens edit.',
+  ),
 })
 
 export const metadata = {
@@ -54,11 +59,24 @@ export async function GET(req: Request, ctx: { params?: { kind?: string } }) {
     const url = new URL(req.url)
     const query = querySchema.parse({
       organizationId: url.searchParams.get('organizationId') ?? undefined,
+      labels: url.searchParams.get('labels') ?? undefined,
     })
     const { translate, em, organizationId, readableOrganizationIds, tenantId, cache, container } = await resolveDictionaryRouteContext(req, {
       selectedId: query.organizationId ?? undefined,
     })
     const { kind, mappedKind } = mapDictionaryKind(ctx.params?.kind)
+    const localizeResponse = async (body: z.infer<typeof dictionaryCacheResponseSchema>) => {
+      if (query.labels === 'base') return body
+      const { resolveLocale } = getTranslationOverlayPlugin()
+      const locale = resolveLocale?.(req) ?? (await resolveTranslations()).locale ?? 'en'
+      return {
+        ...body,
+        items: sortDictionaryEntries(
+          await localizeCustomerDictionaryEntries(body.items, { kind: mappedKind, locale, tenantId, container }),
+          resolveDictionaryEntrySortMode(body.sortMode),
+        ),
+      }
+    }
     if (!organizationId) {
       throw new CrudHttpError(400, {
         error: translate('customers.errors.organization_required', 'Organization context is required'),
@@ -87,16 +105,16 @@ export async function GET(req: Request, ctx: { params?: { kind?: string } }) {
         sortMode,
         readableOrganizationIds: scopedOrganizationIds,
       })
-      const cached = await cache.get(cacheKey)
-      if (cached) {
-        return NextResponse.json(cached)
+      const cached = dictionaryCacheResponseSchema.safeParse(await cache.get(cacheKey))
+      if (cached.success) {
+        return NextResponse.json(await localizeResponse(cached.data))
       }
     }
 
     const entries = await findWithDecryption(
       em,
       CustomerDictionaryEntry,
-      { tenantId, kind: mappedKind, organizationId: { $in: scopedOrganizationIds } } as any,
+      { tenantId, kind: mappedKind, organizationId: { $in: scopedOrganizationIds } },
       { orderBy: { label: 'asc' } },
       { tenantId, organizationId },
     )
@@ -180,7 +198,7 @@ export async function GET(req: Request, ctx: { params?: { kind?: string } }) {
       }
     }
 
-    return NextResponse.json(responseBody)
+    return NextResponse.json(await localizeResponse(responseBody))
   } catch (err) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
@@ -315,6 +333,10 @@ const dictionaryListResponseSchema = z.object({
   items: z.array(dictionaryEntrySchema),
 })
 
+const dictionaryCacheResponseSchema = dictionaryListResponseSchema.extend({
+  items: z.array(dictionaryEntrySchema.extend({ label: z.string(), organizationId: z.string() }).passthrough()),
+})
+
 const dictionaryErrorSchema = z.object({
   error: z.string(),
   code: z.string().optional(),
@@ -326,7 +348,8 @@ export const openApi: OpenApiRouteDoc = {
   methods: {
     GET: {
       summary: 'List dictionary entries',
-      description: 'Returns dictionary entries for the requested kind within the currently selected organization.',
+      description: 'Returns dictionary entries for the requested kind within the currently selected organization. Labels are localized for the request locale unless `labels=base` is passed.',
+      query: querySchema,
       responses: [
         { status: 200, description: 'Dictionary entries', schema: dictionaryListResponseSchema },
         { status: 401, description: 'Unauthorized', schema: dictionaryErrorSchema },

package/src/modules/customers/cli.ts

@@ -39,129 +39,38 @@ import {
   CUSTOMER_INTERACTION_TODO_ADAPTER_SOURCE,
 } from './lib/interactionCompatibility'
 import { CUSTOMER_CUSTOM_FIELD_SETS } from './customFieldDefaults'
+import {
+  ENTITY_STATUS_DEFAULTS,
+  ENTITY_SOURCE_DEFAULTS,
+  ENTITY_LIFECYCLE_STAGE_DEFAULTS,
+  ADDRESS_TYPE_DEFAULTS,
+  ACTIVITY_TYPE_DEFAULTS,
+  INTERACTION_STATUS_DEFAULTS,
+  JOB_TITLE_DEFAULTS,
+  DEAL_STATUS_DEFAULTS,
+  PIPELINE_STAGE_DEFAULTS,
+  INDUSTRY_DEFAULTS,
+  TEMPERATURE_DEFAULTS,
+  PERSON_COMPANY_ROLE_DEFAULTS,
+} from './lib/dictionaryDefaults'
+
+export {
+  DEAL_STATUS_DEFAULTS,
+  PIPELINE_STAGE_DEFAULTS,
+  ENTITY_STATUS_DEFAULTS,
+  ENTITY_LIFECYCLE_STAGE_DEFAULTS,
+  ENTITY_SOURCE_DEFAULTS,
+  INTERACTION_STATUS_DEFAULTS,
+} from './lib/dictionaryDefaults'
 
 type SeedArgs = {
   tenantId: string
   organizationId: string
 }
 
-type DictionaryDefault = {
-  value: string
-  label: string
-  color?: string
-  icon?: string
-}
-
 type CustomFieldValuesPayload = Parameters<DataEngine['setCustomFields']>[0]['values']
 type ProgressBarHandle = ReturnType<typeof createProgressBar>
 
-export const DEAL_STATUS_DEFAULTS: DictionaryDefault[] = [
-  { value: 'open', label: 'Open', color: '#2563eb', icon: 'lucide:circle' },
-  { value: 'closed', label: 'Closed', color: '#6b7280', icon: 'lucide:check-circle' },
-  { value: 'win', label: 'Win', color: '#22c55e', icon: 'lucide:trophy' },
-  { value: 'lost', label: 'Lost', color: '#ef4444', icon: 'lucide:flag' },
-  { value: 'in_progress', label: 'In progress', color: '#f59e0b', icon: 'lucide:activity' },
-]
-
-export const PIPELINE_STAGE_DEFAULTS: DictionaryDefault[] = [
-  { value: 'opportunity', label: 'Opportunity', color: '#38bdf8', icon: 'lucide:target' },
-  { value: 'marketing_qualified_lead', label: 'Marketing Qualified Lead', color: '#a855f7', icon: 'lucide:sparkles' },
-  { value: 'sales_qualified_lead', label: 'Sales Qualified Lead', color: '#f97316', icon: 'lucide:users' },
-  { value: 'offering', label: 'Offering', color: '#22c55e', icon: 'lucide:package' },
-  { value: 'negotiations', label: 'Negotiations', color: '#facc15', icon: 'lucide:handshake' },
-  { value: 'win', label: 'Win', color: '#16a34a', icon: 'lucide:award' },
-  { value: 'lost', label: 'Lost', color: '#ef4444', icon: 'lucide:flag' },
-  { value: 'stalled', label: 'Stalled', color: '#6b7280', icon: 'lucide:alert-circle' },
-]
-
-export const ENTITY_STATUS_DEFAULTS: DictionaryDefault[] = [
-  { value: 'active', label: 'Active', color: '#22c55e', icon: 'lucide:user-check' },
-  { value: 'inactive', label: 'Inactive', color: '#94a3b8', icon: 'lucide:pause-circle' },
-  { value: 'pending', label: 'Pending', color: '#f59e0b', icon: 'lucide:clock' },
-  { value: 'archived', label: 'Archived', color: '#64748b', icon: 'lucide:archive' },
-]
-
-export const ENTITY_LIFECYCLE_STAGE_DEFAULTS: DictionaryDefault[] = [
-  { value: 'lead', label: 'Lead', color: '#3b82f6', icon: 'lucide:sparkles' },
-  { value: 'prospect', label: 'Prospect', color: '#8b5cf6', icon: 'lucide:eye' },
-  { value: 'customer', label: 'Customer', color: '#22c55e', icon: 'lucide:handshake' },
-  { value: 'subscriber', label: 'Subscriber', color: '#10b981', icon: 'lucide:bell' },
-  { value: 'churned', label: 'Churned', color: '#ef4444', icon: 'lucide:user-x' },
-  { value: 'other', label: 'Other', color: '#94a3b8', icon: 'lucide:circle' },
-]
-
-export const ENTITY_SOURCE_DEFAULTS: DictionaryDefault[] = [
-  { value: 'linkedin', label: 'LinkedIn', color: '#0a66c2', icon: 'lucide:linkedin' },
-  { value: 'email', label: 'Email', color: '#3b82f6', icon: 'lucide:mail' },
-  { value: 'web_form', label: 'Web form', color: '#22c55e', icon: 'lucide:globe' },
-  { value: 'referral', label: 'Referral', color: '#8b5cf6', icon: 'lucide:users' },
-  { value: 'customer_referral', label: 'Customer referral', color: '#22c55e', icon: 'lucide:thumbs-up' },
-  { value: 'partner_referral', label: 'Partner referral', color: '#3b82f6', icon: 'lucide:handshake' },
-  { value: 'event', label: 'Conference / Event', color: '#f59e0b', icon: 'lucide:calendar' },
-  { value: 'cold_outreach', label: 'Cold outreach', color: '#94a3b8', icon: 'lucide:phone' },
-  { value: 'facebook', label: 'Facebook', color: '#1877f2', icon: 'lucide:facebook' },
-  { value: 'typeform', label: 'Typeform', color: '#262627', icon: 'lucide:file-text' },
-  { value: 'other', label: 'Other', color: '#64748b', icon: 'lucide:circle' },
-]
-
-const ADDRESS_TYPE_DEFAULTS: DictionaryDefault[] = [
-  { value: 'office', label: 'Office', color: '#3b82f6', icon: 'lucide:building' },
-  { value: 'work', label: 'Work', color: '#6366f1', icon: 'lucide:briefcase' },
-  { value: 'billing', label: 'Billing', color: '#f97316', icon: 'lucide:wallet' },
-  { value: 'shipping', label: 'Shipping', color: '#22c55e', icon: 'lucide:truck' },
-  { value: 'home', label: 'Home', color: '#10b981', icon: 'lucide:map-pin' },
-]
-
-const ACTIVITY_TYPE_DEFAULTS: DictionaryDefault[] = [
-  { value: 'call', label: 'Call', color: '#2563eb', icon: 'lucide:phone-call' },
-  { value: 'email', label: 'Email', color: '#16a34a', icon: 'lucide:mail' },
-  { value: 'event', label: 'Event', color: '#6366f1', icon: 'lucide:calendar' },
-  { value: 'meeting', label: 'Meeting', color: '#f59e0b', icon: 'lucide:users' },
-  { value: 'note', label: 'Note', color: '#a855f7', icon: 'lucide:notebook' },
-  { value: 'task', label: 'Task', color: '#ef4444', icon: 'lucide:check-square' },
-]
-
-export const INTERACTION_STATUS_DEFAULTS: DictionaryDefault[] = [
-  { value: 'planned', label: 'Planned', color: '#2563eb', icon: 'lucide:circle' },
-  { value: 'in_progress', label: 'In progress', color: '#f59e0b', icon: 'lucide:activity' },
-  { value: 'waiting', label: 'Waiting / blocked', color: '#a855f7', icon: 'lucide:pause-circle' },
-  { value: 'done', label: 'Done', color: '#22c55e', icon: 'lucide:check-circle' },
-  { value: 'canceled', label: 'Canceled', color: '#6b7280', icon: 'lucide:x-circle' },
-]
-
-const JOB_TITLE_DEFAULTS: DictionaryDefault[] = [
-  { value: 'Director of Operations', label: 'Director of Operations', color: '#f97316', icon: 'lucide:settings' },
-  { value: 'VP of Partnerships', label: 'VP of Partnerships', color: '#6366f1', icon: 'lucide:users' },
-  { value: 'Founder & Principal', label: 'Founder & Principal', color: '#ec4899', icon: 'lucide:star' },
-  { value: 'Senior Project Manager', label: 'Senior Project Manager', color: '#0ea5e9', icon: 'lucide:clipboard-list' },
-  { value: 'Chief Revenue Officer', label: 'Chief Revenue Officer', color: '#8b5cf6', icon: 'lucide:bar-chart-3' },
-  { value: 'Director of Retail Partnerships', label: 'Director of Retail Partnerships', color: '#f59e0b', icon: 'lucide:shopping-bag' },
-]
-
-const INDUSTRY_DEFAULTS: DictionaryDefault[] = [
-  { value: 'Renewable Energy', label: 'Renewable Energy' },
-  { value: 'Software', label: 'Software' },
-  { value: 'Interior Design', label: 'Interior Design' },
-  { value: 'SaaS', label: 'SaaS' },
-  { value: 'E-commerce', label: 'E-commerce' },
-  { value: 'Healthcare', label: 'Healthcare' },
-  { value: 'Manufacturing', label: 'Manufacturing' },
-  { value: 'Logistics', label: 'Logistics' },
-  { value: 'Financial Services', label: 'Financial Services' },
-  { value: 'Retail', label: 'Retail' },
-  { value: 'Hospitality', label: 'Hospitality' },
-  { value: 'Energy', label: 'Energy' },
-  { value: 'Media', label: 'Media' },
-]
-
-const TEMPERATURE_DEFAULTS: DictionaryDefault[] = [
-  { value: 'hot', label: 'Hot', color: '#ef4444', icon: 'lucide:flame' },
-  { value: 'high', label: 'High', color: '#f59e0b', icon: 'lucide:trending-up' },
-  { value: 'medium', label: 'Medium', color: '#8b5cf6', icon: 'lucide:sparkles' },
-  { value: 'low', label: 'Low', color: '#64748b', icon: 'lucide:clock' },
-  { value: 'cold', label: 'Cold', color: '#94a3b8', icon: 'lucide:snowflake' },
-]
-
 const CUSTOM_TAG_SEED_DEFAULTS = [
   { value: 'architecture', label: 'architecture' },
   { value: 'hospitality', label: 'hospitality' },
@@ -179,15 +88,6 @@ const CUSTOM_TAG_SEED_DEFAULTS = [
   { value: 'case-study-candidate', label: 'case-study-candidate' },
 ]
 
-const PERSON_COMPANY_ROLE_DEFAULTS = [
-  { value: 'decision_maker', label: 'Decision maker', color: '#f59e0b', icon: 'lucide:crown' },
-  { value: 'influencer', label: 'Influencer', color: '#8b5cf6', icon: 'lucide:sparkles' },
-  { value: 'budget_holder', label: 'Budget holder', color: '#3b82f6', icon: 'lucide:wallet' },
-  { value: 'technical_evaluator', label: 'Technical evaluator', color: '#22c55e', icon: 'lucide:wrench' },
-  { value: 'primary_contact', label: 'Primary contact', color: '#0ea5e9', icon: 'lucide:star' },
-  { value: 'end_user', label: 'End user', color: '#64748b', icon: 'lucide:user' },
-]
-
 const PRIORITY_CURRENCIES = ['EUR', 'USD', 'GBP', 'PLN']
 
 type ExampleAddress = {
@@ -2679,7 +2579,6 @@ async function seedCustomerStressTest(
   return { created: toCreate, existing: existingPersons }
 }
 
-
 const STRESS_TEST_REQUIRED_COLUMNS: Record<string, readonly string[]> = {
   customer_entities: [
     'id',

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

@@ -237,7 +237,7 @@ function CustomerDictionarySection({ kind, title, description }: CustomerDiction
     setLoading(true)
     try {
       const data = await readApiResultOrThrow<{ items?: unknown[] }>(
-        `/api/customers/dictionaries/${kind}`,
+        `/api/customers/dictionaries/${kind}?labels=base`,
         undefined,
         { errorMessage: errorLoad },
       )

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

@@ -560,7 +560,7 @@ export function ManageTagsDialog({ open, onClose }: ManageTagsDialogProps) {
         try {
           const data = await readApiResultOrThrow<{
             items?: Array<Record<string, unknown>>
-          }>(`/api/customers/dictionaries/${category.kind}`, { cache: 'no-store' })
+          }>(`/api/customers/dictionaries/${category.kind}?labels=base`, { cache: 'no-store' })
           const entries = Array.isArray(data?.items)
             ? data.items
                 .map(makeDraftEntry)

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

@@ -38,9 +38,23 @@ export function TaskDialog({ open, mode, onOpenChange, initialValues, onSubmit,
     [onOpenChange, onSubmit],
   )
 
+  const handleKeyDown = React.useCallback(
+    (event: React.KeyboardEvent<HTMLDivElement>) => {
+      if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
+        event.preventDefault()
+        event.currentTarget.querySelector('form')?.requestSubmit()
+      }
+      if (event.key === 'Escape') {
+        event.preventDefault()
+        handleCancel()
+      }
+    },
+    [handleCancel],
+  )
+
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-2xl">
+      <DialogContent className="sm:max-w-2xl" onKeyDown={handleKeyDown}>
         <DialogHeader>
           <DialogTitle>{dialogTitle}</DialogTitle>
           {contextMessage ? <DialogDescription>{contextMessage}</DialogDescription> : null}

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

@@ -59,7 +59,6 @@ export function TaskForm({
   useCanonicalInteractions = false,
 }: TaskFormProps) {
   const t = useT()
-  const containerRef = React.useRef<HTMLDivElement | null>(null)
   const scopeVersion = useOrganizationScopeVersion()
   const statusDictionary = useCustomerDictionary('interaction-statuses', scopeVersion)
 
@@ -101,21 +100,6 @@ export function TaskForm({
       : t('customers.people.detail.tasks.form.submitCreate', 'Save task (⌘/Ctrl + Enter)'))
   const resolvedCancelLabel = cancelLabel ?? t('customers.people.detail.tasks.cancel', 'Cancel')
 
-  const handleKeyDown = React.useCallback(
-    (event: React.KeyboardEvent<HTMLDivElement>) => {
-      if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
-        event.preventDefault()
-        const form = containerRef.current?.querySelector('form')
-        form?.requestSubmit()
-      }
-      if (event.key === 'Escape') {
-        event.preventDefault()
-        onCancel()
-      }
-    },
-    [onCancel],
-  )
-
   const handleSubmit = React.useCallback(
     async (values: Record<string, unknown>) => {
       const payload = buildTaskSubmitPayload(values, t)
@@ -133,7 +117,7 @@ export function TaskForm({
   }, [initialValues, mode, useCanonicalInteractions])
 
   return (
-    <div ref={containerRef} onKeyDown={handleKeyDown}>
+    <div>
       <CrudForm
         embedded
         entityId={formEntityId}

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

@@ -9,6 +9,11 @@ import { StatusBadge, type StatusBadgeVariant } from '@open-mercato/ui/primitive
 import { mapDictionaryColorToTone } from '@open-mercato/shared/lib/query/advanced-filter'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
+import { dismissRecordConflict } from '@open-mercato/ui/backend/conflicts'
+import {
+  extractOptimisticLockConflict,
+  extractRecordLockConflict,
+} from '@open-mercato/ui/backend/utils/optimisticLock'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { LoadingMessage, TabEmptyState } from '@open-mercato/ui/backend/detail'
 import { cn } from '@open-mercato/shared/lib/utils'
@@ -49,6 +54,10 @@ type TasksSectionProps = {
 
 const RESERVED_TASK_CUSTOM_KEYS = new Set(['priority', 'description', 'due_at', 'dueAt'])
 
+function isRecordConflict(error: unknown): boolean {
+  return Boolean(extractOptimisticLockConflict(error) || extractRecordLockConflict(error))
+}
+
 function toTimestamp(value: string | null | undefined): number | null {
   if (!value) return null
   const timestamp = new Date(value).getTime()
@@ -240,6 +249,13 @@ export function TasksSection({
     setEditingTask(null)
   }, [])
 
+  React.useEffect(() => {
+    if (!dialogOpen || dialogMode !== 'edit' || !editingTask) return
+    const refreshedTask = tasks.find((task) => task.id === editingTask.id)
+    if (!refreshedTask || refreshedTask === editingTask) return
+    setEditingTask(refreshedTask)
+  }, [dialogMode, dialogOpen, editingTask, tasks])
+
   React.useEffect(() => {
     if (!onActionChange) return
     if (!entityId) {
@@ -295,8 +311,10 @@ export function TasksSection({
         flash(t('customers.people.detail.tasks.createSuccess', 'Task created'), 'success')
         await Promise.resolve(onDataRefresh?.())
       } catch (err) {
-        const message = err instanceof Error ? err.message : t('customers.people.detail.tasks.error', 'Failed to create task')
-        flash(message, 'error')
+        if (!isRecordConflict(err)) {
+          const message = err instanceof Error ? err.message : t('customers.people.detail.tasks.error', 'Failed to create task')
+          flash(message, 'error')
+        }
         throw err
       }
     },
@@ -315,12 +333,15 @@ export function TasksSection({
             isDone: payload.base.is_done ?? undefined,
           },
         )
+        dismissRecordConflict()
         flash(t('customers.people.detail.tasks.updateSuccess', 'Task updated'), 'success')
         await Promise.resolve(onDataRefresh?.())
       } catch (err) {
-        const message =
-          err instanceof Error ? err.message : t('customers.people.detail.tasks.updateError', 'Failed to update task')
-        flash(message, 'error')
+        if (!isRecordConflict(err)) {
+          const message =
+            err instanceof Error ? err.message : t('customers.people.detail.tasks.updateError', 'Failed to update task')
+          flash(message, 'error')
+        }
         throw err
       }
     },
@@ -338,6 +359,7 @@ export function TasksSection({
             isDone: nextIsDone,
           },
         )
+        dismissRecordConflict()
         flash(
           nextIsDone
             ? t('customers.people.detail.tasks.completeSuccess', 'Task marked as done')
@@ -346,9 +368,11 @@ export function TasksSection({
         )
         await Promise.resolve(onDataRefresh?.())
       } catch (err) {
-        const message =
-          err instanceof Error ? err.message : t('customers.people.detail.tasks.toggleError', 'Failed to update task status')
-        flash(message, 'error')
+        if (!isRecordConflict(err)) {
+          const message =
+            err instanceof Error ? err.message : t('customers.people.detail.tasks.toggleError', 'Failed to update task status')
+          flash(message, 'error')
+        }
       }
     },
     [onDataRefresh, runWriteMutation, t, toggleTask],
@@ -374,13 +398,16 @@ export function TasksSection({
             todoId: task.todoId,
           },
         )
+        dismissRecordConflict()
         flash(t('customers.people.detail.tasks.deleteSuccess', 'Task removed'), 'success')
         await Promise.resolve(onDataRefresh?.())
         await refresh()
       } catch (err) {
-        const message =
-          err instanceof Error ? err.message : t('customers.people.detail.tasks.deleteError', 'Failed to remove task')
-        flash(message, 'error')
+        if (!isRecordConflict(err)) {
+          const message =
+            err instanceof Error ? err.message : t('customers.people.detail.tasks.deleteError', 'Failed to remove task')
+          flash(message, 'error')
+        }
       }
     },
     [confirm, onDataRefresh, refresh, runWriteMutation, t, unlinkTask],
@@ -394,12 +421,15 @@ export function TasksSection({
           () => canonicalResult.cancelInteraction(task.todoId),
           { id: task.todoId },
         )
+        dismissRecordConflict()
         flash(t('customers.people.detail.tasks.cancelSuccess', 'Task canceled'), 'success')
         await Promise.resolve(onDataRefresh?.())
       } catch (err) {
-        const message =
-          err instanceof Error ? err.message : t('customers.people.detail.tasks.cancelError', 'Failed to cancel task')
-        flash(message, 'error')
+        if (!isRecordConflict(err)) {
+          const message =
+            err instanceof Error ? err.message : t('customers.people.detail.tasks.cancelError', 'Failed to cancel task')
+          flash(message, 'error')
+        }
       }
     },
     [canonicalResult, onDataRefresh, runWriteMutation, t, useCanonicalInteractions],