@open-mercato/core 0.6.5-develop.4516.1.88e6ab71a9 → 0.6.5-develop.4544.1.71c003c861

package/src/modules/entities/lib/helpers.ts

@@ -186,6 +186,23 @@ export async function setRecordCustomFields(
 
   if (toPersist.length) em.persist(toPersist)
   await em.flush()
+  if (process.env.OM_CF_DEBUG) {
+    try {
+      const conn = em.getConnection()
+      for (const fieldKey of keys) {
+        if (values[fieldKey] === undefined) continue
+        const rows = await conn.execute(
+          'select value_text, value_multiline, value_int, value_float, value_bool from custom_field_values where entity_id = ? and record_id = ? and field_key = ? and ((organization_id is null and ? is null) or organization_id = ?) and ((tenant_id is null and ? is null) or tenant_id = ?)',
+          [entityId, recordId, fieldKey, organizationId, organizationId, tenantId, tenantId],
+          'all',
+        ) as Array<Record<string, unknown>>
+        const persisted = rows.map((row) => row.value_text ?? row.value_multiline ?? row.value_int ?? row.value_float ?? row.value_bool)
+        console.warn(`[CF_DEBUG] setRecordCustomFields entityId=${entityId} recordId=${recordId} fieldKey=${fieldKey} input=${JSON.stringify(values[fieldKey])} persistedRows=${rows.length} persisted=${JSON.stringify(persisted)}`)
+      }
+    } catch (err) {
+      console.warn(`[CF_DEBUG] re-query failed: ${(err as Error)?.message ?? String(err)}`)
+    }
+  }
   // Emit hook for indexing if requested (outside CRUD flows)
   try {
     if (typeof opts.onChanged === 'function') {

package/src/modules/feature_toggles/api/global/[id]/override/route.ts

@@ -45,6 +45,7 @@ export async function GET(req: Request, { params }: { params: { id: string } })
     tenantName: tenant.name,
     tenantId: tenant.id,
     toggleType: toggle.type,
+    updatedAt: override?.updatedAt instanceof Date ? override.updatedAt.toISOString() : null,
   }
 
   await logCrudAccess({

package/src/modules/feature_toggles/api/overrides/route.ts

@@ -6,7 +6,9 @@ import type { CommandBus } from '@open-mercato/shared/lib/commands'
 import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'
 import { getOverrides } from '../../lib/queries'
 import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { logCrudAccess } from '@open-mercato/shared/lib/crud/factory'
+import { FeatureToggleOverride } from '../../data/entities'
 import { buildContext } from '../../lib/utils'
 import { resolveFeatureCheckContext } from "@open-mercato/core/modules/directory/utils/organizationScope"
 import { ProcessedChangeOverrideStateInput } from '../../data/validators'
@@ -87,6 +89,23 @@ export async function PUT(req: Request) {
       }, { status: 400 })
     }
 
+    // Optimistic lock: refuse a stale override overwrite when two admins edit the
+    // same global toggle override in parallel. Only enforced when an override row
+    // already exists (first set has no prior version). Strictly additive.
+    const em = ctx.container.resolve('em') as EntityManager
+    const existingOverride = await em.findOne(FeatureToggleOverride, {
+      tenantId: scope.tenantId,
+      toggle: { id: parsed.data.toggleId },
+    })
+    if (existingOverride) {
+      enforceCommandOptimisticLock({
+        resourceKind: 'feature_toggles.feature_toggle_override',
+        resourceId: existingOverride.id,
+        current: existingOverride.updatedAt ?? null,
+        request: req,
+      })
+    }
+
     const commandBus = ctx.container.resolve('commandBus') as CommandBus
     const { result, logEntry } = await commandBus.execute<ProcessedChangeOverrideStateInput, { overrideToggleId: string | null }>('feature_toggles.overrides.changeState', {
       input: {

package/src/modules/feature_toggles/backend/feature-toggles/global/[id]/edit/page.tsx

@@ -10,7 +10,6 @@ import { createFieldDefinitions, createFormGroups } from "@open-mercato/core/mod
 
 
 export default function EditFeatureTogglePage({ params }: { params?: { id?: string } }) {
-  const [initialValues, setInitialValues] = React.useState<any>(null)
   const { id } = params ?? {}
   const t = useT()
   const fields = createFieldDefinitions(t);
@@ -18,30 +17,37 @@ export default function EditFeatureTogglePage({ params }: { params?: { id?: stri
 
   const { data: featureToggleItem, isLoading } = useFeatureToggleItem(id)
 
-  React.useEffect(() => {
-    if (featureToggleItem) {
-      setInitialValues({
-        identifier: featureToggleItem.identifier,
-        name: featureToggleItem.name,
-        description: featureToggleItem.description,
-        category: featureToggleItem.category,
-
-        type: featureToggleItem.type,
-        defaultValue: featureToggleItem.defaultValue,
-      })
+  // Derive the form's initial values synchronously from the loaded record. Using
+  // a useState+useEffect here caused #2452: `isLoading` flips to false one render
+  // before the effect set `initialValues`, so CrudForm mounted with `{}` and the
+  // `type` SELECT captured an empty value (text inputs re-sync from the prop, the
+  // select does not). Deriving here means the value is present in the same render
+  // the data arrives; the `key` below also forces a clean remount on load.
+  const initialValues = React.useMemo(() => {
+    if (!featureToggleItem) return null
+    return {
+      id: featureToggleItem.id ?? (id ? String(id) : ''),
+      identifier: featureToggleItem.identifier,
+      name: featureToggleItem.name,
+      description: featureToggleItem.description,
+      category: featureToggleItem.category,
+      type: featureToggleItem.type,
+      defaultValue: featureToggleItem.defaultValue,
     }
-  }, [featureToggleItem])
+  }, [featureToggleItem, id])
 
   return (
     <Page>
       <PageBody>
         <CrudForm
+          key={initialValues ? 'ft-edit-loaded' : 'ft-edit-loading'}
           title={t('feature_toggles.form.title.edit', 'Edit Feature Toggle')}
           backHref="/backend/feature-toggles/global"
           versionHistory={{ resourceKind: 'feature_toggles.global', resourceId: id ? String(id) : '' }}
           fields={fields}
           entityId={E.feature_toggles.feature_toggle}
           initialValues={initialValues ?? {}}
+          optimisticLockUpdatedAt={featureToggleItem?.updatedAt ?? null}
           isLoading={isLoading}
           groups={formGroups}
           loadingMessage={t('feature_toggles.form.loading', 'Loading feature toggles')}

package/src/modules/feature_toggles/components/FeatureToggleOverrideCard.tsx

@@ -2,7 +2,9 @@
 import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@open-mercato/ui/primitives/card'
 import { DataLoader, ErrorNotice } from "@open-mercato/ui";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-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 { raiseCrudError } from "@open-mercato/ui/backend/utils/serverErrors";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
 import { CrudForm } from "@open-mercato/ui/backend/CrudForm";
@@ -28,23 +30,31 @@ export function FeatureToggleOverrideCard({ toggleId }: { toggleId: string }) {
 
     const mutation = useMutation({
         mutationFn: async (input: { toggleId: string; isOverride: boolean; overrideValue?: any; tenantId: string }) => {
-            const call = await apiCall<{ ok: boolean }>(
-                `/api/feature_toggles/overrides`,
-                {
-                    method: 'PUT',
-                    headers: { 'content-type': 'application/json' },
-                    body: JSON.stringify({
-                        toggleId: input.toggleId,
-                        isOverride: input.isOverride,
-                        overrideValue: input.overrideValue,
-                    }),
-                },
+            const call = await withScopedApiRequestHeaders(
+                buildOptimisticLockHeader(overrideData?.updatedAt ?? null),
+                () => apiCall<{ ok: boolean }>(
+                    `/api/feature_toggles/overrides`,
+                    {
+                        method: 'PUT',
+                        headers: { 'content-type': 'application/json' },
+                        body: JSON.stringify({
+                            toggleId: input.toggleId,
+                            isOverride: input.isOverride,
+                            overrideValue: input.overrideValue,
+                        }),
+                    },
+                ),
             )
             if (!call.ok) {
                 await raiseCrudError(call.response, t('feature_toggles.overrides.error.update', 'Failed to update override'))
             }
             return call.result
         },
+        onError: (err: unknown) => {
+            // Route an optimistic-lock 409 to the unified conflict bar; other errors
+            // already surfaced via raiseCrudError inside mutationFn.
+            surfaceRecordConflict(err, t)
+        },
         onSettled: async () => {
             await queryClient.invalidateQueries({ queryKey: ['feature_toggle_override', toggleId] })
             await queryClient.invalidateQueries({ queryKey: ['feature_toggle_overrides'] })

package/src/modules/feature_toggles/components/FeatureTogglesTable.tsx

@@ -2,7 +2,8 @@
 import { DataTable } from "@open-mercato/ui/backend/DataTable";
 import { RowActions } from "@open-mercato/ui/backend/RowActions";
 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 { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
@@ -23,6 +24,7 @@ type Row = {
   description: string
   category?: string
   type: FeatureToggleType
+  updatedAt?: string | null
 }
 
 type BadgeVariant = 'default' | 'secondary' | 'destructive' | 'outline' | 'muted'
@@ -126,7 +128,10 @@ export function FeatureTogglesTable() {
 
   const deleteFeatureToggleMutation = useMutation({
     mutationFn: async (row: Row) => {
-      await deleteCrud('feature_toggles/global', row.id)
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(row.updatedAt),
+        () => deleteCrud('feature_toggles/global', row.id),
+      )
     },
     onSuccess: async () => {
       await queryClient.invalidateQueries({ queryKey: ['feature_toggles'] })

package/src/modules/feature_toggles/components/formConfig.tsx

@@ -10,6 +10,7 @@ import {
   SelectValue,
 } from "@open-mercato/ui/primitives/select";
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { booleanOverrideSelectValue } from "./overrideFormConfig";
 
 
 export function renderDefaultValueCreateComponent(props: CrudCustomFieldRenderProps) {
@@ -22,7 +23,7 @@ export function renderDefaultValueCreateComponent(props: CrudCustomFieldRenderPr
                 <div>
                     <label className="block text-sm font-medium mb-2">{t('feature_toggles.form.fields.defaultValue.boolean.label', 'Default Value (Boolean)')}</label>
                     <Select
-                        value={props.value as string || 'false'}
+                        value={booleanOverrideSelectValue(props.value)}
                         onValueChange={(value) => props.setValue(value === 'true')}
                         disabled={props.disabled}
                     >

package/src/modules/feature_toggles/components/overrideFormConfig.tsx

@@ -11,6 +11,15 @@ import {
 } from "@open-mercato/ui/primitives/select";
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 
+/**
+ * Normalize a boolean override value (which may be stored as a real boolean or a
+ * 'true'/'false' string) to the string the `<Select>` needs. Passing a raw boolean
+ * to `Select.value` matched no `<SelectItem>` and rendered blank (#2410).
+ */
+export function booleanOverrideSelectValue(value: unknown): 'true' | 'false' {
+  return value === true || value === 'true' ? 'true' : 'false'
+}
+
 export function renderOverrideValueComponent(props: CrudCustomFieldRenderProps) {
     const t = useT()
     const toggleType = props.values?.toggleType as string;
@@ -30,7 +39,7 @@ export function renderOverrideValueComponent(props: CrudCustomFieldRenderProps)
                 <div>
                     <label className="block text-sm font-medium mb-2">{t('feature_toggles.override.fields.value.boolean.label', 'Override Value (Boolean)')}</label>
                     <Select
-                        value={props.value as string || 'false'}
+                        value={booleanOverrideSelectValue(props.value)}
                         onValueChange={(value) => props.setValue(value === 'true')}
                         disabled={props.disabled}
                     >

package/src/modules/feature_toggles/data/validators.ts

@@ -1,13 +1,20 @@
 import { z } from 'zod'
 
-export const IDENTIFIER_PATTERN = /^[a-z][a-z0-9_]*$/
+// Namespaced feature-flag identifiers use dots and dashes as separators
+// (e.g. the seeded `customers.interactions.legacy-adapters`), so the validator
+// accepts lowercase letters, digits, `_`, `.`, and `-` after the leading
+// lowercase letter (#2055 QA round-6).
+export const IDENTIFIER_PATTERN = /^[a-z][a-z0-9_.-]*$/
+
+export const IDENTIFIER_PATTERN_MESSAGE =
+  'identifier must start with a lowercase letter and contain only lowercase letters, numbers, dots, dashes, and underscores'
 
 export const toggleTypeSchema = z.enum(['boolean', 'string', 'number', 'json'])
 
 export const toggleCreateSchema = z.object({
   identifier: z.string().min(1).regex(
     IDENTIFIER_PATTERN,
-    'identifier must start with a lowercase letter and contain only lowercase letters, numbers, and underscores',
+    IDENTIFIER_PATTERN_MESSAGE,
   ),
   name: z.string().min(1),
   description: z.string().nullable().optional(),
@@ -42,6 +49,7 @@ export const featureToggleOverrideResponseSchema = z.object({
   tenantName: z.string(),
   tenantId: z.string().uuid(),
   toggleType: toggleTypeSchema,
+  updatedAt: z.string().nullable().optional(),
 })
 
 export type FeatureToggleOverrideResponse = z.infer<typeof featureToggleOverrideResponseSchema>
@@ -70,7 +78,7 @@ export const featureToggleSchema = z.object({
   id: z.string().uuid().optional(),
   identifier: z.string().min(1).regex(
     IDENTIFIER_PATTERN,
-    'identifier must start with a lowercase letter and contain only lowercase letters, numbers, and underscores',
+    IDENTIFIER_PATTERN_MESSAGE,
   ),
   name: z.string().min(1),
   description: z.string().nullable().optional(),

package/src/modules/inbox_ops/api/settings/route.ts

@@ -2,6 +2,8 @@ import { NextResponse } from 'next/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { runWithCacheTenant } from '@open-mercato/cache'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { InboxSettings } from '../../data/entities'
 import { updateSettingsSchema } from '../../data/validators'
 import { resolveRequestContext, handleRouteError } from '../routeHelpers'
@@ -49,6 +51,7 @@ export async function GET(req: Request) {
         inboxAddress: settings.inboxAddress,
         isActive: settings.isActive,
         workingLanguage: settings.workingLanguage,
+        updatedAt: settings.updatedAt instanceof Date ? settings.updatedAt.toISOString() : (settings.updatedAt ?? null),
       } : null,
     }
 
@@ -96,6 +99,20 @@ export async function PATCH(req: Request) {
       return NextResponse.json({ error: 'Settings not found' }, { status: 404 })
     }
 
+    // Optimistic lock: refuse a stale overwrite when two tabs edit the same inbox
+    // settings record. Strictly additive — a no-op without the expected-version header.
+    try {
+      enforceCommandOptimisticLock({
+        resourceKind: 'inbox_ops.settings',
+        resourceId: settings.id,
+        current: settings.updatedAt ?? null,
+        request: req,
+      })
+    } catch (err) {
+      if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+      throw err
+    }
+
     if (parsed.data.workingLanguage !== undefined) {
       settings.workingLanguage = parsed.data.workingLanguage
     }
@@ -115,6 +132,7 @@ export async function PATCH(req: Request) {
         inboxAddress: settings.inboxAddress,
         isActive: settings.isActive,
         workingLanguage: settings.workingLanguage,
+        updatedAt: settings.updatedAt instanceof Date ? settings.updatedAt.toISOString() : (settings.updatedAt ?? null),
       },
     })
   } catch (err) {

package/src/modules/inbox_ops/backend/inbox-ops/settings/page.tsx

@@ -11,7 +11,9 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@open-mercato/ui/primitives/select'
-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 { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { LoadingMessage, ErrorMessage } from '@open-mercato/ui/backend/detail'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -30,7 +32,7 @@ export default function InboxSettingsPage() {
     value: key,
     label: t(`inbox_ops.settings.language_${key}` as never, key),
   }))
-  const [settings, setSettings] = React.useState<{ inboxAddress?: string; isActive?: boolean; workingLanguage?: string } | null>(null)
+  const [settings, setSettings] = React.useState<{ inboxAddress?: string; isActive?: boolean; workingLanguage?: string; updatedAt?: string | null } | null>(null)
   const [isLoading, setIsLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [copied, setCopied] = React.useState(false)
@@ -42,7 +44,7 @@ export default function InboxSettingsPage() {
       setIsLoading(true)
       setError(null)
       try {
-        const result = await apiCall<{ settings: { inboxAddress?: string; isActive?: boolean; workingLanguage?: string } | null }>('/api/inbox_ops/settings')
+        const result = await apiCall<{ settings: { inboxAddress?: string; isActive?: boolean; workingLanguage?: string; updatedAt?: string | null } | null }>('/api/inbox_ops/settings')
         if (!cancelled) {
           if (result?.ok && result.result?.settings) {
             setSettings(result.result.settings)
@@ -71,20 +73,23 @@ export default function InboxSettingsPage() {
   const handleLanguageChange = React.useCallback(async (workingLanguage: string) => {
     setIsSavingLanguage(true)
     const result = await runMutation({
-      operation: () => apiCall<{ ok: boolean; settings: { workingLanguage: string } }>('/api/inbox_ops/settings', {
-        method: 'PATCH',
-        body: JSON.stringify({ workingLanguage }),
-      }),
+      operation: () => withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(settings?.updatedAt ?? null),
+        () => apiCall<{ ok: boolean; settings: { workingLanguage: string; updatedAt?: string | null } }>('/api/inbox_ops/settings', {
+          method: 'PATCH',
+          body: JSON.stringify({ workingLanguage }),
+        }),
+      ),
       context: {},
     })
     if (result?.ok && result.result?.ok) {
-      setSettings((prev) => prev ? { ...prev, workingLanguage: result.result!.settings.workingLanguage } : prev)
+      setSettings((prev) => prev ? { ...prev, workingLanguage: result.result!.settings.workingLanguage, updatedAt: result.result!.settings.updatedAt ?? prev.updatedAt } : prev)
       flash(t('inbox_ops.settings.language_saved', 'Working language updated'), 'success')
-    } else {
+    } else if (!surfaceRecordConflict({ status: result?.status, body: result?.result }, t)) {
       flash(t('inbox_ops.settings.language_save_failed', 'Failed to update working language'), 'error')
     }
     setIsSavingLanguage(false)
-  }, [t, runMutation])
+  }, [t, runMutation, settings?.updatedAt])
 
   return (
     <Page>

package/src/modules/inbox_ops/components/proposals/EditActionDialog.tsx

@@ -9,7 +9,8 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@open-mercato/ui/primitives/select'
-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 { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -461,9 +462,13 @@ export function EditActionDialog({
 
     setIsSaving(true)
     const result = await runMutation({
-      operation: () => apiCall<{ ok: boolean; error?: string }>(
-        `/api/inbox_ops/proposals/${action.proposalId}/actions/${action.id}`,
-        { method: 'PATCH', body: JSON.stringify({ payload: finalPayload }) },
+      // TODO(#2373-D): thread updatedAt — ActionDetail type lives outside this file's edit scope
+      operation: () => withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(undefined),
+        () => apiCall<{ ok: boolean; error?: string }>(
+          `/api/inbox_ops/proposals/${action.proposalId}/actions/${action.id}`,
+          { method: 'PATCH', body: JSON.stringify({ payload: finalPayload }) },
+        ),
       ),
       context: {},
     })

package/src/modules/integrations/backend/integrations/bundle/[id]/page.tsx

@@ -16,7 +16,8 @@ import {
   SelectValue,
 } from '@open-mercato/ui/primitives/select'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
-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 { useT } from '@open-mercato/shared/lib/i18n/context'
 import type { CredentialFieldType, IntegrationCredentialField } from '@open-mercato/shared/modules/integrations/types'
@@ -146,11 +147,15 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
     const currentBundleId = resolveCurrentBundleId()
     if (!currentBundleId) return
     setIsSavingCreds(true)
-    const call = await apiCall(`/api/integrations/${encodeURIComponent(currentBundleId)}/credentials`, {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ credentials: credValues }),
-    }, { fallback: null })
+    // TODO(#2373-B): thread updatedAt — integration detail/state response does not expose a record version yet
+    const call = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(undefined),
+      () => apiCall(`/api/integrations/${encodeURIComponent(currentBundleId)}/credentials`, {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ credentials: credValues }),
+      }, { fallback: null }),
+    )
     if (call.ok) {
       flash(t('integrations.detail.credentials.saved'), 'success')
     } else {
@@ -161,11 +166,15 @@ export default function BundleConfigPage({ params }: BundleConfigPageProps) {
 
   const handleToggle = React.useCallback(async (integrationId: string, enabled: boolean) => {
     setTogglingIds((prev) => new Set(prev).add(integrationId))
-    const call = await apiCall(`/api/integrations/${encodeURIComponent(integrationId)}/state`, {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ isEnabled: enabled }),
-    }, { fallback: null })
+    // TODO(#2373-B): thread updatedAt — integration detail/state response does not expose a record version yet
+    const call = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(undefined),
+      () => apiCall(`/api/integrations/${encodeURIComponent(integrationId)}/state`, {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ isEnabled: enabled }),
+      }, { fallback: null }),
+    )
     if (call.ok) {
       setDetail((prev) => {
         if (!prev) return prev

package/src/modules/integrations/backend/integrations/page.tsx

@@ -7,7 +7,8 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Switch } from '@open-mercato/ui/primitives/switch'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
-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 { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -43,6 +44,7 @@ type IntegrationItem = {
   hasCredentials: boolean
   healthStatus: 'healthy' | 'degraded' | 'unhealthy' | 'unconfigured'
   analytics: IntegrationAnalytics
+  updatedAt?: string | null
 }
 
 type BundleItem = {
@@ -198,13 +200,16 @@ export default function IntegrationsMarketplacePage() {
     setPage(1)
   }, [debouncedSearch, filterValues, selectedCategory, sortField, sortOrder])
 
-  const handleToggle = React.useCallback(async (integrationId: string, enabled: boolean) => {
+  const handleToggle = React.useCallback(async (integrationId: string, enabled: boolean, updatedAt?: string | null) => {
     setTogglingIds((prev) => new Set(prev).add(integrationId))
-    const call = await apiCall(`/api/integrations/${encodeURIComponent(integrationId)}/state`, {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ isEnabled: enabled }),
-    }, { fallback: null })
+    const call = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(updatedAt),
+      () => apiCall(`/api/integrations/${encodeURIComponent(integrationId)}/state`, {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ isEnabled: enabled }),
+      }, { fallback: null }),
+    )
 
     if (!call.ok) {
       flash(t('integrations.detail.stateError'), 'error')
@@ -439,7 +444,7 @@ export default function IntegrationsMarketplacePage() {
                         <Switch
                           checked={item.isEnabled}
                           disabled={togglingIds.has(item.id)}
-                          onCheckedChange={(checked) => void handleToggle(item.id, checked)}
+                          onCheckedChange={(checked) => void handleToggle(item.id, checked, item.updatedAt)}
                           className="shrink-0"
                         />
                       </div>

package/src/modules/messages/commands/messages.ts

@@ -526,7 +526,30 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
       }
     }
 
-    await withAtomicFlush(em, [async () => {
+    // Validate the send transition BEFORE the atomic-flush block so a rejected
+    // send never mutates or flushes anything (everything checked here is known
+    // from the parsed input + the loaded message).
+    if (isSending) {
+      const finalVisibility = input.visibility ?? message.visibility
+      const finalSubject = input.subject ?? message.subject
+      const finalBody = input.body ?? message.body
+      const finalRecipientCount = input.recipients
+        ? input.recipients.length
+        : (preloadedRecipients?.length ?? 0)
+      if (finalVisibility !== 'public' && finalRecipientCount === 0) {
+        throw new Error('at least one recipient is required')
+      }
+      if (!finalSubject?.trim()) throw new Error('subject is required')
+      if (!finalBody?.trim()) throw new Error('body is required')
+    }
+
+    // Phase 1 mutates the managed `message` scalars; the per-phase flush issues
+    // those changes before phase 2's interleaved reads run (e.g.
+    // `linkAttachmentsToMessage` issues an `em.find`). Under MikroORM v7 a read
+    // between a scalar mutation and the terminal flush on the same EntityManager
+    // silently drops the pending changeset, so keeping the scalar edits in their
+    // own phase guarantees subject/body/etc. are persisted (SPEC-018 Problem 1).
+    await withAtomicFlush(em, [() => {
       if (input.type !== undefined) message.type = input.type
       if (input.visibility !== undefined) message.visibility = input.visibility
       if (input.sourceEntityType !== undefined) message.sourceEntityType = input.sourceEntityType
@@ -539,7 +562,7 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
       if (input.priority !== undefined) message.priority = input.priority
       if (input.actionData !== undefined) message.actionData = input.actionData
       if (input.sendViaEmail !== undefined) message.sendViaEmail = input.sendViaEmail
-
+    }, async () => {
       if (input.recipients) {
         await em.nativeDelete(MessageRecipient, { messageId: message.id })
         for (const recipient of input.recipients) {
@@ -595,19 +618,8 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
       }
 
       if (isSending) {
-        const finalVisibility = input.visibility ?? message.visibility
-        const finalSubject = input.subject ?? message.subject
-        const finalBody = input.body ?? message.body
-        const finalRecipientCount = input.recipients
-          ? input.recipients.length
-          : (preloadedRecipients?.length ?? 0)
-
-        if (finalVisibility !== 'public' && finalRecipientCount === 0) {
-          throw new Error('at least one recipient is required')
-        }
-        if (!finalSubject?.trim()) throw new Error('subject is required')
-        if (!finalBody?.trim()) throw new Error('body is required')
-
+        // Send transition was validated before the block; just apply the
+        // status mutations here (persisted by this phase's boundary flush).
         message.isDraft = false
         message.status = 'sent'
         message.sentAt = new Date()

package/src/modules/perspectives/api/[tableId]/route.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { perspectiveSaveSchema } from '@open-mercato/core/modules/perspectives/data/validators'
 import {
   loadPerspectivesState,
@@ -199,12 +200,14 @@ export async function POST(req: Request, ctx: { params: { tableId: string } }) {
   let saved: Awaited<ReturnType<typeof saveUserPerspective>> | null = null
   let updatedRolePerspectives: Awaited<ReturnType<typeof saveRolePerspectives>> | null = null
 
-  await withAtomicFlush(em, [
+  try {
+    await withAtomicFlush(em, [
     async () => {
       saved = await saveUserPerspective(em, cache, {
         scope,
         tableId,
         input: parsed.data,
+        request: req,
       })
     },
     async () => {
@@ -232,7 +235,13 @@ export async function POST(req: Request, ctx: { params: { tableId: string } }) {
         })
       }
     },
-  ], { transaction: true })
+    ], { transaction: true })
+  } catch (err) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
+    throw err
+  }
 
   return NextResponse.json({
     perspective: saved,