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

package/src/modules/workflows/api/definitions/[id]/route.ts

@@ -21,6 +21,21 @@ import {
 import { serializeWorkflowDefinition, serializeCodeWorkflowDefinition } from '../serialize'
 import { invalidateTriggerCache } from '../../../lib/event-trigger-service'
 import { getCodeWorkflow } from '../../../lib/code-registry'
+import { createGenericOptimisticLockReader } from '@open-mercato/shared/lib/crud/optimistic-lock'
+import { registerOptimisticLockReaderIfAbsent } from '@open-mercato/shared/lib/crud/optimistic-lock-store'
+import { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'
+import { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+
+registerOptimisticLockReaderIfAbsent({
+  'workflows.definition': createGenericOptimisticLockReader({
+    entity: WorkflowDefinition,
+    idField: 'id',
+    tenantField: 'tenantId',
+    orgField: 'organizationId',
+    softDeleteField: 'deletedAt',
+  }),
+})
 
 export const metadata = {
   requireAuth: true,
@@ -151,6 +166,20 @@ export async function PUT(
     }
 
     const input: UpdateWorkflowDefinitionApiInput = validation.data
+    const guardResult = await validateCrudMutationGuard(container, {
+      tenantId: tenantId ?? '',
+      organizationId: organizationId ?? null,
+      userId: auth.sub ?? '',
+      resourceKind: 'workflows.definition',
+      resourceId: params.id,
+      operation: 'update',
+      requestMethod: 'PUT',
+      requestHeaders: request.headers,
+      mutationPayload: input as Record<string, unknown>,
+    })
+    if (guardResult && !guardResult.ok) {
+      return NextResponse.json(guardResult.body, { status: guardResult.status })
+    }
 
     // Handle customizing a code-based workflow definition
     if (params.id.startsWith('code:')) {
@@ -171,6 +200,19 @@ export async function PUT(
 
       let savedOverride: WorkflowDefinition
       if (existingOverride) {
+        try {
+          enforceCommandOptimisticLock({
+            resourceKind: 'workflows.definition',
+            resourceId: existingOverride.id,
+            current: existingOverride.updatedAt ?? null,
+            request,
+          })
+        } catch (lockError) {
+          if (isCrudHttpError(lockError)) {
+            return NextResponse.json(lockError.body, { status: lockError.status })
+          }
+          throw lockError
+        }
         // Revive if soft-deleted, then apply updates
         existingOverride.deletedAt = null
         existingOverride.workflowName = codeDef.workflowName
@@ -230,6 +272,20 @@ export async function PUT(
         console.error('Failed to emit workflows.definition.customized event:', eventError)
       }
 
+      if (guardResult?.shouldRunAfterSuccess) {
+        await runCrudMutationGuardAfterSuccess(container, {
+          tenantId: tenantId ?? '',
+          organizationId: organizationId ?? null,
+          userId: auth.sub ?? '',
+          resourceKind: 'workflows.definition',
+          resourceId: String(savedOverride.id),
+          operation: 'update',
+          requestMethod: 'PUT',
+          requestHeaders: request.headers,
+          metadata: guardResult.metadata,
+        })
+      }
+
       return NextResponse.json({
         data: serializeWorkflowDefinition(savedOverride),
         message: 'Workflow definition customized successfully',
@@ -251,6 +307,20 @@ export async function PUT(
       )
     }
 
+    try {
+      enforceCommandOptimisticLock({
+        resourceKind: 'workflows.definition',
+        resourceId: definition.id,
+        current: definition.updatedAt ?? null,
+        request,
+      })
+    } catch (lockError) {
+      if (isCrudHttpError(lockError)) {
+        return NextResponse.json(lockError.body, { status: lockError.status })
+      }
+      throw lockError
+    }
+
     // Update fields. workflowId is intentionally ignored — it identifies the
     // row and renaming would break references. Version is user-managed and
     // applied when supplied so the edit form can bump it explicitly.
@@ -283,6 +353,20 @@ export async function PUT(
 
     await em.flush()
 
+    if (guardResult?.shouldRunAfterSuccess) {
+      await runCrudMutationGuardAfterSuccess(container, {
+        tenantId: tenantId ?? '',
+        organizationId: organizationId ?? null,
+        userId: auth.sub ?? '',
+        resourceKind: 'workflows.definition',
+        resourceId: String(definition.id),
+        operation: 'update',
+        requestMethod: 'PUT',
+        requestHeaders: request.headers,
+        metadata: guardResult.metadata,
+      })
+    }
+
     // Embedded triggers may have changed; invalidate the in-memory cache so
     // the wildcard event subscriber reloads them on the next event.
     if (tenantId) invalidateTriggerCache(tenantId, organizationId ?? undefined)
@@ -356,6 +440,20 @@ export async function DELETE(
       )
     }
 
+    const guardResult = await validateCrudMutationGuard(container, {
+      tenantId: tenantId ?? '',
+      organizationId: organizationId ?? null,
+      userId: auth.sub ?? '',
+      resourceKind: 'workflows.definition',
+      resourceId: params.id,
+      operation: 'delete',
+      requestMethod: 'DELETE',
+      requestHeaders: request.headers,
+    })
+    if (guardResult && !guardResult.ok) {
+      return NextResponse.json(guardResult.body, { status: guardResult.status })
+    }
+
     // Check if there are active workflow instances using this definition
     const { WorkflowInstance } = await import('../../../data/entities')
     const activeInstances = await em.count(WorkflowInstance, {
@@ -378,6 +476,20 @@ export async function DELETE(
 
     await em.flush()
 
+    if (guardResult?.shouldRunAfterSuccess) {
+      await runCrudMutationGuardAfterSuccess(container, {
+        tenantId: tenantId ?? '',
+        organizationId: organizationId ?? null,
+        userId: auth.sub ?? '',
+        resourceKind: 'workflows.definition',
+        resourceId: String(definition.id),
+        operation: 'delete',
+        requestMethod: 'DELETE',
+        requestHeaders: request.headers,
+        metadata: guardResult.metadata,
+      })
+    }
+
     if (tenantId) invalidateTriggerCache(tenantId, organizationId ?? undefined)
 
     return NextResponse.json({

package/src/modules/workflows/backend/definitions/[id]/page.tsx

@@ -8,8 +8,9 @@ import { CrudForm } from '@open-mercato/ui/backend/CrudForm'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
+import { apiFetch, withScopedApiHeaders } from '@open-mercato/ui/backend/utils/api'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
-import { apiFetch } from '@open-mercato/ui/backend/utils/api'
 import { readJsonSafe } from '@open-mercato/ui/backend/utils/serverErrors'
 import { formatWorkflowValidationError } from '../../../lib/format-validation-error'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
@@ -95,17 +96,32 @@ export default function EditWorkflowDefinitionPage() {
 
   const handleSubmit = async (values: WorkflowDefinitionFormValues) => {
     const payload = buildWorkflowPayload({ ...values, triggers })
+    const optimisticLockHeader = buildOptimisticLockHeader(
+      typeof definition?.updatedAt === 'string' ? definition.updatedAt : null,
+    )
 
     await runMutation({
       operation: async () => {
-        const response = await apiFetch(`/api/workflows/definitions/${definitionId}`, {
+        const updateDefinition = () => apiFetch(`/api/workflows/definitions/${definitionId}`, {
           method: 'PUT',
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify(payload),
         })
+        const response = Object.keys(optimisticLockHeader).length > 0
+          ? await withScopedApiHeaders(optimisticLockHeader, updateDefinition)
+          : await updateDefinition()
         if (!response.ok) {
-          const errorBody = await readJsonSafe<{ error?: string; details?: Array<{ path?: Array<string | number>; message?: string }> }>(response, null)
-          throw new Error(formatWorkflowValidationError(errorBody, t('workflows.errors.updateFailed')))
+          const errorBody = await readJsonSafe<{
+            error?: string
+            code?: string
+            currentUpdatedAt?: string
+            expectedUpdatedAt?: string
+            details?: Array<{ path?: Array<string | number>; message?: string }>
+          }>(response, null)
+          throw Object.assign(
+            new Error(formatWorkflowValidationError(errorBody, t('workflows.errors.updateFailed'))),
+            { status: response.status, ...(errorBody ?? {}) },
+          )
         }
         return response
       },

package/src/modules/workflows/backend/definitions/page.tsx

@@ -18,7 +18,9 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@open-mercato/ui/primitives/dialog'
-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 { useQuery, useQueryClient } from '@tanstack/react-query'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -86,7 +88,7 @@ export default function WorkflowDefinitionsListPage() {
   const router = useRouter()
   const queryClient = useQueryClient()
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
-  const [deleteTarget, setDeleteTarget] = React.useState<{ id: string; name: string } | null>(null)
+  const [deleteTarget, setDeleteTarget] = React.useState<{ id: string; name: string; updatedAt: string | null } | null>(null)
 
   const { data, isLoading, error } = useQuery({
     queryKey: ['workflow-definitions', 'list', filterValues, page],
@@ -121,22 +123,31 @@ export default function WorkflowDefinitionsListPage() {
     },
   })
 
-  const handleDelete = (id: string, workflowName: string) => {
-    setDeleteTarget({ id, name: workflowName })
+  const handleDelete = (id: string, workflowName: string, updatedAt: string | null) => {
+    setDeleteTarget({ id, name: workflowName, updatedAt })
   }
 
   const confirmDelete = async () => {
     if (!deleteTarget) return
 
-    const result = await apiCall(`/api/workflows/definitions/${deleteTarget.id}`, {
-      method: 'DELETE',
-    })
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(deleteTarget.updatedAt),
+      () => apiCall(`/api/workflows/definitions/${deleteTarget.id}`, {
+        method: 'DELETE',
+      }),
+    )
 
     if (result.ok) {
       flash(t('workflows.messages.deleted'), 'success')
       queryClient.invalidateQueries({ queryKey: ['workflow-definitions'] })
     } else {
-      flash(t('workflows.messages.deleteFailed'), 'error')
+      const conflictError = Object.assign(new Error(t('workflows.messages.deleteFailed')), {
+        status: result.status,
+        ...(result.result && typeof result.result === 'object' ? result.result : {}),
+      })
+      if (!surfaceRecordConflict(conflictError, t)) {
+        flash(t('workflows.messages.deleteFailed'), 'error')
+      }
     }
     setDeleteTarget(null)
   }
@@ -354,7 +365,7 @@ export default function WorkflowDefinitionsListPage() {
           ...(!isCodeOnly ? [{
             id: 'delete',
             label: t('common.delete'),
-            onSelect: () => handleDelete(row.original.id, row.original.workflowName),
+            onSelect: () => handleDelete(row.original.id, row.original.workflowName, row.original.updatedAt),
             destructive: true,
           }] : []),
         ]

package/src/modules/workflows/backend/definitions/visual-editor/page.tsx

@@ -32,7 +32,9 @@ import { Alert, AlertTitle } from '@open-mercato/ui/primitives/alert'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { FormHeader } from '@open-mercato/ui/backend/forms'
-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 { CircleQuestionMark, Info, PanelTopClose, PanelTopOpen, Play, Save, Trash2 } from 'lucide-react'
 import { NODE_TYPE_ICONS, NODE_TYPE_COLORS, NODE_TYPE_LABELS } from '../../../lib/node-type-icons'
@@ -107,6 +109,7 @@ export default function VisualEditorPage() {
   const [effectiveTo, setEffectiveTo] = useState('')
   const [triggers, setTriggers] = useState<WorkflowDefinitionTrigger[]>([])
   const [source, setSource] = useState<'code' | 'code_override' | 'user' | null>(null)
+  const [updatedAt, setUpdatedAt] = useState<string | null>(null)
 
   const isCodeOnly = source === 'code'
   const isCodeOverride = source === 'code_override'
@@ -154,6 +157,7 @@ export default function VisualEditorPage() {
         // code → read-only with Customize button; code_override → editable
         // with Reset to code; user → editable, no banner.
         setSource((definition.source as 'code' | 'code_override' | 'user') ?? null)
+        setUpdatedAt(typeof definition.updatedAt === 'string' ? definition.updatedAt : null)
       } catch (error) {
         console.error('Error loading workflow definition:', error)
         flash('Failed to load workflow definition', 'error')
@@ -372,20 +376,23 @@ export default function VisualEditorPage() {
         // edits (name, description, version, category, tags, icon, effective
         // dates) actually persist. Previously only `definition` + `enabled`
         // were sent, silently dropping every other field.
-        result = await apiCall<{ data: any; error?: string }>(`/api/workflows/definitions/${definitionId}`, {
-          method: 'PUT',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            workflowName,
-            description: description || null,
-            version,
-            definition: definitionData,
-            metadata: Object.keys(metadata).length > 0 ? metadata : null,
-            enabled,
-            effectiveFrom: effectiveFrom || null,
-            effectiveTo: effectiveTo || null,
+        result = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(updatedAt),
+          () => apiCall<{ data: any; error?: string }>(`/api/workflows/definitions/${definitionId}`, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              workflowName,
+              description: description || null,
+              version,
+              definition: definitionData,
+              metadata: Object.keys(metadata).length > 0 ? metadata : null,
+              enabled,
+              effectiveFrom: effectiveFrom || null,
+              effectiveTo: effectiveTo || null,
+            }),
           }),
-        })
+        )
       } else {
         // Create new definition
         result = await apiCall<{ data: any; error?: string }>('/api/workflows/definitions', {
@@ -406,7 +413,13 @@ export default function VisualEditorPage() {
       }
 
       if (!result.ok) {
-        flash(`Failed to save: ${result.result?.error || 'Unknown error'}`, 'error')
+        const conflictError = Object.assign(new Error(t('workflows.messages.saveFailed', 'Failed to save')), {
+          status: result.status,
+          ...(result.result && typeof result.result === 'object' ? result.result : {}),
+        })
+        if (!surfaceRecordConflict(conflictError, t)) {
+          flash(`Failed to save: ${result.result?.error || 'Unknown error'}`, 'error')
+        }
         return
       }
 
@@ -425,7 +438,7 @@ export default function VisualEditorPage() {
     } finally {
       setIsSaving(false)
     }
-  }, [nodes, edges, workflowId, workflowName, description, version, enabled, category, tags, icon, effectiveFrom, effectiveTo, triggers, definitionId, router])
+  }, [nodes, edges, workflowId, workflowName, description, version, enabled, category, tags, icon, effectiveFrom, effectiveTo, triggers, definitionId, updatedAt, router])
 
   // Customize a code-defined workflow → creates an override and reloads the
   // editor pointed at the new UUID. Mirrors the non-visual edit page button.

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

@@ -28,6 +28,8 @@ export type WorkflowDefinitionFormValues = {
   steps: any[]
   transitions: any[]
   triggers: WorkflowDefinitionTrigger[]
+  id?: string
+  updatedAt?: string | null
 }
 
 /**
@@ -235,6 +237,7 @@ import { toDateInputValue } from '@open-mercato/shared/lib/date/format'
  * Parse workflow definition to form values
  */
 export function parseWorkflowToFormValues(workflow: any): WorkflowDefinitionFormValues {
+  const updatedAt = workflow.updatedAt ?? workflow.updated_at ?? null
   const metadata = workflow.metadata || {}
   return {
     workflowId: workflow.workflowId || '',
@@ -251,6 +254,8 @@ export function parseWorkflowToFormValues(workflow: any): WorkflowDefinitionForm
     steps: workflow.definition?.steps || [],
     transitions: workflow.definition?.transitions || [],
     triggers: workflow.definition?.triggers || [],
+    id: workflow.id,
+    updatedAt: typeof updatedAt === 'string' ? updatedAt : updatedAt ? String(updatedAt) : null,
   }
 }
 

package/src/modules/workflows/di.ts

@@ -6,6 +6,9 @@
 
 import type { AwilixContainer } from 'awilix'
 import { asFunction } from 'awilix'
+import { createGenericOptimisticLockReader } from '@open-mercato/shared/lib/crud/optimistic-lock'
+import { registerOptimisticLockReaders } from '@open-mercato/shared/lib/crud/optimistic-lock-store'
+import { WorkflowDefinition } from './data/entities'
 import * as workflowExecutor from './lib/workflow-executor'
 import * as stepHandler from './lib/step-handler'
 import * as transitionHandler from './lib/transition-handler'
@@ -14,6 +17,23 @@ import * as eventLogger from './lib/event-logger'
 import * as signalHandler from './lib/signal-handler'
 import * as timerHandler from './lib/timer-handler'
 
+// Register the `workflows.definition` optimistic-lock reader at module-DI load
+// time (top-level, like sales/customers) so it is present in the global reader
+// store before any request-scoped `crudMutationGuardService` snapshots
+// `getAllOptimisticLockReaders()`. Registering it only as a side-effect of
+// importing the definition route module left it absent from that snapshot, so
+// the guard short-circuited and the visual editor's stale saves overwrote with
+// no 409 and no conflict bar.
+registerOptimisticLockReaders({
+  'workflows.definition': createGenericOptimisticLockReader({
+    entity: WorkflowDefinition,
+    idField: 'id',
+    tenantField: 'tenantId',
+    orgField: 'organizationId',
+    softDeleteField: 'deletedAt',
+  }),
+})
+
 export function register(container: AwilixContainer): void {
   container.register({
     workflowExecutor: asFunction(() => workflowExecutor).scoped(),

package/src/modules/workflows/i18n/de.json

@@ -860,6 +860,7 @@
   "workflows.messages.instanceStarted": "Workflow-Instanz gestartet",
   "workflows.messages.invalidWorkflow": "Ungültige Workflow-Definition",
   "workflows.messages.loadFailed": "Workflows konnten nicht geladen werden",
+  "workflows.messages.saveFailed": "Speichern fehlgeschlagen",
   "workflows.messages.taskAlreadyClaimed": "Aufgabe wurde bereits von einem anderen Benutzer übernommen",
   "workflows.messages.taskClaimed": "Aufgabe erfolgreich übernommen",
   "workflows.messages.taskCompleted": "Aufgabe erfolgreich abgeschlossen",

package/src/modules/workflows/i18n/en.json

@@ -860,6 +860,7 @@
   "workflows.messages.instanceStarted": "Workflow instance started",
   "workflows.messages.invalidWorkflow": "Invalid workflow definition",
   "workflows.messages.loadFailed": "Failed to load workflows",
+  "workflows.messages.saveFailed": "Failed to save",
   "workflows.messages.taskAlreadyClaimed": "Task is already claimed by another user",
   "workflows.messages.taskClaimed": "Task claimed successfully",
   "workflows.messages.taskCompleted": "Task completed successfully",

package/src/modules/workflows/i18n/es.json

@@ -860,6 +860,7 @@
   "workflows.messages.instanceStarted": "Instancia del flujo de trabajo iniciada",
   "workflows.messages.invalidWorkflow": "Definicion de flujo de trabajo no valida",
   "workflows.messages.loadFailed": "No se pudieron cargar los flujos de trabajo",
+  "workflows.messages.saveFailed": "Error al guardar",
   "workflows.messages.taskAlreadyClaimed": "La tarea ya ha sido reclamada por otro usuario",
   "workflows.messages.taskClaimed": "Tarea reclamada correctamente",
   "workflows.messages.taskCompleted": "Tarea completada correctamente",

package/src/modules/workflows/i18n/pl.json

@@ -860,6 +860,7 @@
   "workflows.messages.instanceStarted": "Instancja przepływu rozpoczęta",
   "workflows.messages.invalidWorkflow": "Nieprawidłowa definicja przepływu",
   "workflows.messages.loadFailed": "Nie udało się załadować przepływów",
+  "workflows.messages.saveFailed": "Nie udało się zapisać",
   "workflows.messages.taskAlreadyClaimed": "Zadanie zostało już przejęte przez innego użytkownika",
   "workflows.messages.taskClaimed": "Zadanie przejęte pomyślnie",
   "workflows.messages.taskCompleted": "Zadanie ukończone pomyślnie",