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

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/NodeEditDialog.tsx

@@ -499,6 +499,8 @@ export function NodeEditDialog({ node, isOpen, onClose, onSave, onDelete }: Node
     waitForSignal: t('workflows.nodeTypes.waitForSignal'),
     waitForTimer: t('workflows.nodeTypes.waitForTimer'),
     subWorkflow: t('workflows.nodeTypes.subWorkflow'),
+    parallelFork: t('workflows.nodeTypes.parallelFork'),
+    parallelJoin: t('workflows.nodeTypes.parallelJoin'),
   }[node.type || 'automated']
 
   // START nodes are partially editable (pre-conditions only), END nodes are not editable

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

@@ -19,7 +19,7 @@ import {
   ConnectionMode,
   MarkerType,
 } from '@xyflow/react'
-import {StartNode, EndNode, UserTaskNode, AutomatedNode, SubWorkflowNode, WaitForSignalNode, WaitForTimerNode} from './nodes'
+import {StartNode, EndNode, UserTaskNode, AutomatedNode, SubWorkflowNode, WaitForSignalNode, WaitForTimerNode, ParallelForkNode, ParallelJoinNode} from './nodes'
 import { WorkflowTransitionEdge } from './WorkflowTransitionEdge'
 import { STATUS_COLORS } from '../lib/status-colors'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
@@ -133,6 +133,8 @@ export default function WorkflowGraphImpl({
       subWorkflow: SubWorkflowNode,
       waitForSignal: WaitForSignalNode,
       waitForTimer: WaitForTimerNode,
+      parallelFork: ParallelForkNode,
+      parallelJoin: ParallelJoinNode,
     }),
     []
   )

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/components/nodes/ParallelForkNode.tsx

@@ -0,0 +1,66 @@
+'use client'
+
+import { Handle, Position, NodeProps } from '@xyflow/react'
+import { WorkflowNodeCard } from '../WorkflowNodeCard'
+import { WorkflowStatus } from '../../lib/status-colors'
+
+/**
+ * ParallelForkNode display data.
+ *
+ * A PARALLEL_FORK splits execution into N branches (one per outgoing `auto`
+ * transition) that run concurrently and converge at the paired PARALLEL_JOIN
+ * referenced by `joinStepId`.
+ */
+export interface ParallelForkNodeData {
+  label: string
+  description?: string
+  joinStepId?: string
+  status?: 'pending' | 'running' | 'completed' | 'error' | 'not_started' | 'in_progress'
+  stepNumber?: number
+  badge?: string
+  tooltip?: string
+  executionStatus?: 'completed' | 'active' | 'pending' | 'failed' | 'skipped'
+}
+
+function mapStatus(status?: string): WorkflowStatus {
+  if (!status || status === 'pending') return 'not_started'
+  if (status === 'running' || status === 'in_progress') return 'in_progress'
+  if (status === 'completed') return 'completed'
+  return 'not_started'
+}
+
+/**
+ * ParallelForkNode - splits the workflow into concurrent branches.
+ * One target handle (in); one source handle (out) that fans out to each branch.
+ */
+export function ParallelForkNode({ data, isConnectable, selected }: NodeProps) {
+  const nodeData = data as unknown as ParallelForkNodeData
+
+  return (
+    <div className="parallel-fork-node" title={nodeData.tooltip}>
+      <Handle
+        type="target"
+        position={Position.Top}
+        id="target"
+        isConnectable={isConnectable}
+        className="!w-3 !h-3 !bg-primary !border-2 !border-background"
+      />
+
+      <WorkflowNodeCard
+        title={nodeData.label}
+        description={nodeData.description}
+        status={mapStatus(nodeData.status)}
+        nodeType="parallelFork"
+        selected={selected}
+      />
+
+      <Handle
+        type="source"
+        position={Position.Bottom}
+        id="source"
+        isConnectable={isConnectable}
+        className="!w-3 !h-3 !bg-primary !border-2 !border-background"
+      />
+    </div>
+  )
+}

package/src/modules/workflows/components/nodes/ParallelJoinNode.tsx

@@ -0,0 +1,66 @@
+'use client'
+
+import { Handle, Position, NodeProps } from '@xyflow/react'
+import { WorkflowNodeCard } from '../WorkflowNodeCard'
+import { WorkflowStatus } from '../../lib/status-colors'
+
+/**
+ * ParallelJoinNode display data.
+ *
+ * A PARALLEL_JOIN synchronizes the branches created by its paired
+ * PARALLEL_FORK (`forkStepId`) using wait-all semantics, then continues the
+ * single outgoing transition once every branch has completed.
+ */
+export interface ParallelJoinNodeData {
+  label: string
+  description?: string
+  forkStepId?: string
+  status?: 'pending' | 'running' | 'completed' | 'error' | 'not_started' | 'in_progress'
+  stepNumber?: number
+  badge?: string
+  tooltip?: string
+  executionStatus?: 'completed' | 'active' | 'pending' | 'failed' | 'skipped'
+}
+
+function mapStatus(status?: string): WorkflowStatus {
+  if (!status || status === 'pending') return 'not_started'
+  if (status === 'running' || status === 'in_progress') return 'in_progress'
+  if (status === 'completed') return 'completed'
+  return 'not_started'
+}
+
+/**
+ * ParallelJoinNode - synchronizes concurrent branches (wait-all).
+ * One target handle (in) collecting all branches; one source handle (out).
+ */
+export function ParallelJoinNode({ data, isConnectable, selected }: NodeProps) {
+  const nodeData = data as unknown as ParallelJoinNodeData
+
+  return (
+    <div className="parallel-join-node" title={nodeData.tooltip}>
+      <Handle
+        type="target"
+        position={Position.Top}
+        id="target"
+        isConnectable={isConnectable}
+        className="!w-3 !h-3 !bg-primary !border-2 !border-background"
+      />
+
+      <WorkflowNodeCard
+        title={nodeData.label}
+        description={nodeData.description}
+        status={mapStatus(nodeData.status)}
+        nodeType="parallelJoin"
+        selected={selected}
+      />
+
+      <Handle
+        type="source"
+        position={Position.Bottom}
+        id="source"
+        isConnectable={isConnectable}
+        className="!w-3 !h-3 !bg-primary !border-2 !border-background"
+      />
+    </div>
+  )
+}

package/src/modules/workflows/components/nodes/index.ts

@@ -18,3 +18,9 @@ export type { WaitForSignalNodeData } from './WaitForSignalNode'
 
 export { WaitForTimerNode } from './WaitForTimerNode'
 export type { WaitForTimerNodeData } from './WaitForTimerNode'
+
+export { ParallelForkNode } from './ParallelForkNode'
+export type { ParallelForkNodeData } from './ParallelForkNode'
+
+export { ParallelJoinNode } from './ParallelJoinNode'
+export type { ParallelJoinNodeData } from './ParallelJoinNode'

package/src/modules/workflows/data/entities.ts

@@ -31,6 +31,15 @@ export type WorkflowInstanceStatus =
   | 'COMPENSATING'
   | 'COMPENSATED'
   | 'WAITING_FOR_ACTIVITIES'
+  | 'FORKED'
+
+export type WorkflowBranchInstanceStatus =
+  | 'ACTIVE'
+  | 'PAUSED'
+  | 'WAITING_FOR_ACTIVITIES'
+  | 'COMPLETED'
+  | 'FAILED'
+  | 'CANCELLED'
 
 export type StepInstanceStatus =
   | 'PENDING'
@@ -275,6 +284,11 @@ export class WorkflowInstance {
     timestamp: Date
   } | null
 
+  // When the instance is FORKED, points at the open PARALLEL_FORK step whose
+  // branches are currently executing. Null for single-token instances.
+  @Property({ name: 'active_fork_step_id', type: 'varchar', length: 100, nullable: true })
+  activeForkStepId?: string | null
+
   @Property({ name: 'retry_count', type: 'integer', default: 0 })
   retryCount: number = 0
 
@@ -294,6 +308,88 @@ export class WorkflowInstance {
   deletedAt?: Date | null
 }
 
+// ============================================================================
+// Entity: WorkflowBranchInstance
+// ============================================================================
+
+/**
+ * WorkflowBranchInstance entity
+ *
+ * A single parallel branch token created by a PARALLEL_FORK step. Each branch
+ * advances independently (interleaved under the instance lock) with its own
+ * private context namespace, and converges to the paired PARALLEL_JOIN step.
+ * Branches are tenant/org scoped and never cross-tenant.
+ */
+@Entity({ tableName: 'workflow_branch_instances' })
+@Index({ name: 'workflow_branch_instances_instance_status_idx', properties: ['workflowInstanceId', 'status'] })
+@Index({ name: 'workflow_branch_instances_instance_fork_idx', properties: ['workflowInstanceId', 'forkStepId'] })
+@Index({ name: 'workflow_branch_instances_tenant_org_idx', properties: ['tenantId', 'organizationId'] })
+export class WorkflowBranchInstance {
+  [OptionalProps]?: 'createdAt' | 'updatedAt'
+
+  @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
+  id!: string
+
+  @Property({ name: 'workflow_instance_id', type: 'uuid' })
+  workflowInstanceId!: string
+
+  @Property({ name: 'fork_step_id', type: 'varchar', length: 100 })
+  forkStepId!: string
+
+  @Property({ name: 'join_step_id', type: 'varchar', length: 100 })
+  joinStepId!: string
+
+  // The transitionId of the FORK's outgoing transition that created this branch.
+  @Property({ name: 'branch_key', type: 'varchar', length: 100 })
+  branchKey!: string
+
+  // Reserved for nested-fork support (always null this iteration; validator blocks nesting).
+  @Property({ name: 'parent_branch_id', type: 'uuid', nullable: true })
+  parentBranchId?: string | null
+
+  @Property({ name: 'current_step_id', type: 'varchar', length: 100 })
+  currentStepId!: string
+
+  @Property({ name: 'status', type: 'varchar', length: 30 })
+  status!: WorkflowBranchInstanceStatus
+
+  // The branch's private write scope; merged back into instance.context at JOIN.
+  @Property({ name: 'context_namespace', type: 'jsonb' })
+  contextNamespace!: Record<string, any>
+
+  // Per-branch equivalent of WorkflowInstance.pendingTransition (async activities).
+  @Property({ name: 'pending_transition', type: 'jsonb', nullable: true })
+  pendingTransition?: {
+    toStepId: string
+    activityResults: any[]
+    timestamp: Date
+  } | null
+
+  @Property({ name: 'error_message', type: 'text', nullable: true })
+  errorMessage?: string | null
+
+  @Property({ name: 'error_details', type: 'jsonb', nullable: true })
+  errorDetails?: any | null
+
+  @Property({ name: 'started_at', type: Date, nullable: true })
+  startedAt?: Date | null
+
+  @Property({ name: 'completed_at', type: Date, nullable: true })
+  completedAt?: Date | null
+
+  @Property({ name: 'tenant_id', type: 'uuid' })
+  tenantId!: string
+
+  @Property({ name: 'organization_id', type: 'uuid' })
+  organizationId!: string
+
+  @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
+  createdAt: Date = new Date()
+
+  @Property({ name: 'updated_at', type: Date, onUpdate: () => new Date() })
+  updatedAt: Date = new Date()
+}
+
 // ============================================================================
 // Entity: StepInstance
 // ============================================================================
@@ -317,6 +413,10 @@ export class StepInstance {
   @Property({ name: 'workflow_instance_id', type: 'uuid' })
   workflowInstanceId!: string
 
+  // Set when this step executes inside a parallel branch; null for single-token.
+  @Property({ name: 'branch_instance_id', type: 'uuid', nullable: true })
+  branchInstanceId?: string | null
+
   @Property({ name: 'step_id', type: 'varchar', length: 100 })
   stepId!: string
 
@@ -390,6 +490,10 @@ export class UserTask {
   @Property({ name: 'step_instance_id', type: 'uuid' })
   stepInstanceId!: string
 
+  // Set when this task belongs to a parallel branch; null for single-token instances.
+  @Property({ name: 'branch_instance_id', type: 'uuid', nullable: true })
+  branchInstanceId?: string | null
+
   @Property({ name: 'task_name', type: 'varchar', length: 255 })
   taskName!: string
 
@@ -472,6 +576,10 @@ export class WorkflowEvent {
   @Property({ name: 'step_instance_id', type: 'uuid', nullable: true })
   stepInstanceId?: string | null
 
+  // Set when the event was logged within a parallel branch; null otherwise.
+  @Property({ name: 'branch_instance_id', type: 'uuid', nullable: true })
+  branchInstanceId?: string | null
+
   @Property({ name: 'event_type', type: 'varchar', length: 50 })
   eventType!: string
 
@@ -560,6 +668,7 @@ export class WorkflowEventTrigger {
 export default [
   WorkflowDefinition,
   WorkflowInstance,
+  WorkflowBranchInstance,
   StepInstance,
   UserTask,
   WorkflowEvent,