@open-mercato/core 0.6.7 → 0.6.8-develop.6875.1.871a4afc94

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

@@ -26,7 +26,11 @@ interface Activity {
     retryDelay?: number
     backoffMultiplier?: number
   }
-  timeout?: number
+  // Milliseconds, matching the executor and the definition schema. This field
+  // used to be written as `timeout` (a number) while the schema typed `timeout`
+  // as an ISO 8601 string, so saving a timeout from this editor failed
+  // validation outright (#4424).
+  timeoutMs?: number
   compensation?: Record<string, any>
 }
 
@@ -66,8 +70,53 @@ const ACTIVITY_TYPES = [
   { value: 'WAIT', label: 'Wait' },
 ]
 
+type ConfigDraft = { text: string; error: string | null }
+
 export function TransitionsEditor({ value = [], onChange, steps = [], error }: TransitionsEditorProps) {
   const t = useT()
+  const [configDrafts, setConfigDrafts] = React.useState<Record<string, ConfigDraft>>({})
+
+  const configDraftKey = (transition: Transition, activity: Activity) =>
+    `${transition.transitionId}:${activity.activityId}`
+
+  const handleConfigTextChange = (
+    transitionIndex: number,
+    activityIndex: number,
+    text: string,
+  ) => {
+    const transition = value[transitionIndex]
+    const activity = transition.activities?.[activityIndex]
+    if (!activity) return
+
+    let parsed: Record<string, unknown> | null = null
+    let parseError: string | null = null
+    try {
+      const candidate = JSON.parse(text) as unknown
+      if (candidate && typeof candidate === 'object' && !Array.isArray(candidate)) {
+        parsed = candidate as Record<string, unknown>
+      } else {
+        parseError = t('workflows.activities.configMustBeObject', 'Config must be a JSON object')
+      }
+    } catch (err) {
+      parseError = err instanceof Error
+        ? err.message
+        : t('workflows.activities.configInvalidJson', 'Invalid JSON')
+    }
+
+    const key = configDraftKey(transition, activity)
+    setConfigDrafts((drafts) => ({ ...drafts, [key]: { text, error: parseError } }))
+    if (parsed) updateActivity(transitionIndex, activityIndex, 'config', parsed)
+  }
+
+  const handleConfigBlur = (transition: Transition, activity: Activity) => {
+    const key = configDraftKey(transition, activity)
+    setConfigDrafts((drafts) => {
+      if (!drafts[key] || drafts[key].error) return drafts
+      const next = { ...drafts }
+      delete next[key]
+      return next
+    })
+  }
 
   const addTransition = () => {
     const newTransition: Transition = {
@@ -178,7 +227,7 @@ export function TransitionsEditor({ value = [], onChange, steps = [], error }: T
           <p className="text-sm text-muted-foreground">
             {t('workflows.form.descriptions.transitions')}
           </p>
-          {error && <p className="text-sm text-red-600 mt-1">{error}</p>}
+          {error && <p className="text-sm text-status-error-text mt-1">{error}</p>}
         </div>
         <Button type="button" onClick={addTransition} variant="outline" size="sm" className="w-full sm:w-auto">
           <Plus className="h-4 w-4 mr-1" />
@@ -251,7 +300,7 @@ export function TransitionsEditor({ value = [], onChange, steps = [], error }: T
                     onClick={() => removeTransition(index)}
                     title={t('common.delete')}
                   >
-                    <Trash2 className="h-4 w-4 text-red-600" />
+                    <Trash2 className="h-4 w-4 text-destructive" />
                   </Button>
                 </div>
               </div>
@@ -370,9 +419,12 @@ export function TransitionsEditor({ value = [], onChange, steps = [], error }: T
                 )}
 
                 <div className="space-y-2">
-                  {(transition.activities || []).map((activity, activityIndex) => (
-                    <div key={activityIndex} className="p-3 border rounded-md bg-muted shadow-sm border-l-4 border-l-green-500">
-                      <div className="space-y-2">
+                  {(transition.activities || []).map((activity, activityIndex) => {
+                    const draftKey = configDraftKey(transition, activity)
+                    const configDraft = configDrafts[draftKey]
+                    return (
+                      <div key={draftKey} className="p-3 border rounded-md bg-muted shadow-sm border-l-4 border-l-green-500">
+                        <div className="space-y-2">
                         <div className="flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between">
                           <div className="flex-1 grid grid-cols-1 sm:grid-cols-2 gap-2">
                             <div>
@@ -428,7 +480,7 @@ export function TransitionsEditor({ value = [], onChange, steps = [], error }: T
                               onClick={() => removeActivity(index, activityIndex)}
                               title={t('common.delete')}
                             >
-                              <Trash2 className="h-3 w-3 text-red-600" />
+                              <Trash2 className="h-3 w-3 text-destructive" />
                             </Button>
                           </div>
                         </div>
@@ -461,8 +513,8 @@ export function TransitionsEditor({ value = [], onChange, steps = [], error }: T
                             <Input
                               id={`activity-${index}-${activityIndex}-timeout`}
                               type="number"
-                              value={activity.timeout || ''}
-                              onChange={(e) => updateActivity(index, activityIndex, 'timeout', e.target.value ? parseInt(e.target.value) : undefined)}
+                              value={activity.timeoutMs || ''}
+                              onChange={(e) => updateActivity(index, activityIndex, 'timeoutMs', e.target.value ? parseInt(e.target.value) : undefined)}
                               placeholder="30000"
                               className="mt-1 text-xs h-8"
                             />
@@ -529,23 +581,29 @@ export function TransitionsEditor({ value = [], onChange, steps = [], error }: T
                           </Label>
                           <Textarea
                             id={`activity-${index}-${activityIndex}-config`}
-                            value={JSON.stringify(activity.config || {}, null, 2)}
-                            onChange={(e) => {
-                              try {
-                                const parsed = JSON.parse(e.target.value)
-                                updateActivity(index, activityIndex, 'config', parsed)
-                              } catch {
-                                // Invalid JSON, don't update
-                              }
-                            }}
+                            value={configDraft?.text ?? JSON.stringify(activity.config || {}, null, 2)}
+                            onChange={(e) => handleConfigTextChange(index, activityIndex, e.target.value)}
+                            onBlur={() => handleConfigBlur(transition, activity)}
+                            aria-invalid={configDraft?.error ? true : undefined}
+                            aria-describedby={configDraft?.error ? `activity-${index}-${activityIndex}-config-error` : undefined}
                             placeholder='{"key": "value"}'
                             rows={2}
                             className="mt-1 font-mono text-xs"
                           />
+                          {configDraft?.error ? (
+                            <p
+                              id={`activity-${index}-${activityIndex}-config-error`}
+                              className="mt-1 text-xs text-status-error-text"
+                              role="alert"
+                            >
+                              {configDraft.error}
+                            </p>
+                          ) : null}
+                        </div>
                         </div>
                       </div>
-                    </div>
-                  ))}
+                    )
+                  })}
                 </div>
               </div>
             </div>

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

@@ -235,7 +235,7 @@ export default function WorkflowGraphImpl({
 
         {editable && !isCompactViewport && (
           <Panel position="top-left" style={{ margin: 10 }}>
-            <Alert variant="info" icon={<Edit3 aria-hidden="true" />} className="max-w-sm">
+            <Alert status="information" icon={<Edit3 aria-hidden="true" />} className="max-w-sm">
               <AlertDescription className="font-medium">
                 {t('workflows.graph.editModeInfo')}
               </AlertDescription>

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

@@ -46,7 +46,7 @@ export function WorkflowLegend() {
         </h3>
         <div className="space-y-2">
           <div className="flex items-center gap-2">
-            <div className="flex-shrink-0 w-8 h-0.5 bg-emerald-500"></div>
+            <div className="flex-shrink-0 w-8 h-0.5 bg-status-success-solid"></div>
             <span className="text-xs text-muted-foreground">{t('workflows.legend.edgeState.completed')}</span>
           </div>
           <div className="flex items-center gap-2">

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

@@ -253,7 +253,7 @@ export function WorkflowSelector({
                         v{workflow.version}
                       </Badge>
                       {workflow.enabled ? (
-                        <Badge variant="default" className="bg-emerald-500 text-xs">
+                        <Badge variant="default" className="bg-status-success-solid text-status-success-solid-foreground text-xs">
                           Enabled
                         </Badge>
                       ) : (

package/src/modules/workflows/components/fields/BusinessRuleConditionsEditor.tsx

@@ -241,7 +241,7 @@ export function BusinessRuleConditionsEditor({
                         disabled={disabled}
                         className="ml-2 flex-shrink-0"
                       >
-                        <Trash2 className="size-4 text-red-600" />
+                        <Trash2 className="size-4 text-destructive" />
                       </Button>
                     }
                     title={t('workflows.fieldEditors.businessRuleConditions.removeCondition')}

package/src/modules/workflows/components/fields/FormFieldArrayEditor.tsx

@@ -118,7 +118,7 @@ export function FormFieldArrayEditor({
           <p className="text-xs text-muted-foreground mt-0.5">
             {t('workflows.fieldEditors.formFields.description')}
           </p>
-          {error && <p className="text-xs text-red-600 mt-1">{error}</p>}
+          {error && <p className="text-xs text-status-error-text mt-1">{error}</p>}
         </div>
         <Button
           type="button"
@@ -134,7 +134,7 @@ export function FormFieldArrayEditor({
 
       {/* JSON Schema Format Notice */}
       {isJsonSchemaFormat && (
-        <Alert variant="info">
+        <Alert status="information">
           <AlertDescription className="text-xs">
             {t('workflows.fieldEditors.formFields.jsonSchemaNotice')}
           </AlertDescription>

package/src/modules/workflows/components/fields/MappingArrayEditor.tsx

@@ -103,7 +103,7 @@ export function MappingArrayEditor({
           <p className="text-xs text-muted-foreground mt-0.5">
             {description}
           </p>
-          {error && <p className="text-xs text-red-600 mt-1">{error}</p>}
+          {error && <p className="text-xs text-status-error-text mt-1">{error}</p>}
         </div>
         <Button
           type="button"

package/src/modules/workflows/components/fields/StartPreConditionsEditor.tsx

@@ -332,7 +332,7 @@ export function StartPreConditionsEditor({
                         title={t('workflows.common.delete')}
                         disabled={disabled}
                       >
-                        <Trash2 className="h-4 w-4 text-red-600" />
+                        <Trash2 className="h-4 w-4 text-destructive" />
                       </Button>
                     }
                     title={t('workflows.fieldEditors.preConditions.removePreCondition')}

package/src/modules/workflows/components/fields/WorkflowSelectorField.tsx

@@ -128,7 +128,7 @@ export function WorkflowSelectorField({
         <p className="text-xs text-muted-foreground mt-0.5">
           {description}
         </p>
-        {error && <p className="text-xs text-red-600 mt-1">{error}</p>}
+        {error && <p className="text-xs text-status-error-text mt-1">{error}</p>}
       </div>
 
       {!workflowId ? (
@@ -159,10 +159,10 @@ export function WorkflowSelectorField({
               ) : workflowDetails?.error ? (
                 <>
                   <div className="flex items-center gap-2">
-                    <AlertCircle className="size-4 text-yellow-600" />
+                    <AlertCircle className="size-4 text-status-warning-text" />
                     <span className="text-sm font-semibold text-gray-900">{workflowId}</span>
                   </div>
-                  <p className="text-xs text-yellow-600">{t('workflows.common.workflowNotFoundOrUnavailable')}</p>
+                  <p className="text-xs text-status-warning-text">{t('workflows.common.workflowNotFoundOrUnavailable')}</p>
                 </>
               ) : (
                 <>
@@ -178,7 +178,7 @@ export function WorkflowSelectorField({
                       )}
                       {workflowDetails?.enabled !== undefined && (
                         workflowDetails.enabled ? (
-                          <Badge variant="default" className="bg-emerald-500 text-xs">
+                          <Badge variant="default" className="bg-status-success-solid text-status-success-solid-foreground text-xs">
                             {t('common.enabled')}
                           </Badge>
                         ) : (

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

@@ -202,6 +202,20 @@ export const activityRetryPolicySchema = z.object({
   maxIntervalMs: z.number().int().min(0),
 })
 
+/**
+ * Config fields each activity executor requires to run (see
+ * `lib/activity-executor.ts`). WAIT is handled separately below because it
+ * takes "duration" OR "until" rather than a fixed key set.
+ */
+const REQUIRED_ACTIVITY_CONFIG_KEYS: Partial<Record<ActivityType, readonly string[]>> = {
+  SEND_EMAIL: ['to', 'subject'],
+  CALL_API: ['endpoint'],
+  CALL_WEBHOOK: ['url'],
+  UPDATE_ENTITY: ['commandId', 'input'],
+  EMIT_EVENT: ['eventName'],
+  EXECUTE_FUNCTION: ['functionName'],
+}
+
 // Activity definition (embedded in transitions)
 export const activityDefinitionSchema = z.object({
   activityId: z.string().min(1).max(100).regex(/^[a-z0-9_-]+$/, 'Activity ID must contain only lowercase letters, numbers, hyphens, and underscores'),
@@ -210,12 +224,49 @@ export const activityDefinitionSchema = z.object({
   config: z.record(z.string(), z.any()),
   async: z.boolean().default(false).optional(), // For Phase 8.3
   retryPolicy: activityRetryPolicySchema.optional(),
-  timeout: z.string().optional(), // ISO 8601 duration
+  /**
+   * Per-activity timeout in milliseconds. This is what the editor writes and
+   * what `executeActivity` reads; it was missing from the schema, so
+   * `z.object()` stripped it on save and UI-configured timeouts silently did
+   * nothing (#4424).
+   */
+  timeoutMs: z.number().int().positive().optional(),
+  /**
+   * @deprecated Use `timeoutMs`. Accepted for definitions already stored with
+   * an ISO 8601 duration string; the executor normalizes it to milliseconds.
+   */
+  timeout: z.string().optional(),
   compensation: z.object({
     activityId: z.string().min(1), // ID of compensation activity
     automatic: z.boolean().default(true).optional() // Auto-trigger on failure
   }).optional(), // Compensation configuration (Phase 8.2)
 }).superRefine((activity, ctx) => {
+  // Config keys each activity executor requires at runtime. Without this, an
+  // activity missing e.g. CALL_API's `endpoint` saved cleanly from the visual
+  // editor and only failed once an instance ran it — the "edit silently
+  // disappeared / nothing told me why" report in #4232 (and the class of bug
+  // #4322 was an instance of). Validating here surfaces the exact missing field
+  // at edit time, since both the editor's save path and the API route parse
+  // through this schema.
+  const requiredConfigKeys = REQUIRED_ACTIVITY_CONFIG_KEYS[activity.activityType]
+  if (requiredConfigKeys) {
+    const config = activity.config || {}
+    for (const key of requiredConfigKeys) {
+      const value = config[key]
+      const isEmpty =
+        value == null ||
+        (typeof value === 'string' && value.trim() === '') ||
+        (key === 'input' && typeof value !== 'object')
+      if (isEmpty) {
+        ctx.addIssue({
+          code: 'custom',
+          path: ['config', key],
+          message: `${activity.activityType} activity requires "${key}"`,
+        })
+      }
+    }
+  }
+
   if (activity.activityType !== 'WAIT') return
   const config = activity.config || {}
   const hasDuration = config.duration != null && config.duration !== ''

package/src/modules/workflows/events.ts

@@ -30,6 +30,7 @@ const events = [
   { id: 'workflows.activity.started', label: 'Activity Started', category: 'lifecycle' },
   { id: 'workflows.activity.completed', label: 'Activity Completed', category: 'lifecycle' },
   { id: 'workflows.activity.failed', label: 'Activity Failed', category: 'lifecycle' },
+  { id: 'workflows.task.assigned', label: 'Task Assigned', entity: 'task', category: 'lifecycle' },
 
   // Event Triggers
   { id: 'workflows.trigger.created', label: 'Trigger Created', entity: 'trigger', category: 'crud' },

package/src/modules/workflows/extension-points.ts

@@ -0,0 +1,12 @@
+import { dataTableExtensionHost, defineModuleExtensionPoints } from '@open-mercato/shared/modules/widgets/extension-points'
+
+export const extensionPoints = defineModuleExtensionPoints({
+  moduleId: 'workflows',
+  hosts: {
+    definitionsTable: dataTableExtensionHost({ tableId: 'workflows.definitions.list', source: 'backend/definitions/page.tsx' }),
+    instancesTable: dataTableExtensionHost({ tableId: 'workflows.instances.list', source: 'backend/instances/page.tsx' }),
+    tasksTable: dataTableExtensionHost({ tableId: 'workflows.tasks.list', source: 'backend/tasks/page.tsx' }),
+  },
+})
+
+export default extensionPoints

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

@@ -80,6 +80,8 @@
   "workflows.activities.async": "Asynchron",
   "workflows.activities.compensation": "Kompensation",
   "workflows.activities.config": "Konfiguration",
+  "workflows.activities.configInvalidJson": "Ungültiges JSON",
+  "workflows.activities.configMustBeObject": "Konfiguration muss ein JSON-Objekt sein",
   "workflows.activities.deleteActivity": "Aktivität löschen",
   "workflows.activities.editActivity": "Aktivität bearbeiten",
   "workflows.activities.plural": "Aktivitäten",
@@ -933,6 +935,7 @@
   "workflows.orderApproval.decisionLabel": "Entscheidung",
   "workflows.orderApproval.groupDescription": "Bestellung prüfen und genehmigen oder ablehnen.",
   "workflows.orderApproval.groupLabel": "Bestellgenehmigung",
+  "workflows.orderApproval.missingOrderId": "Der Genehmigungsworkflow kann erst gestartet werden, wenn die Bestellung geladen ist.",
   "workflows.orderApproval.missingStatuses": "Fehlende Bestellstatus. Stellen Sie sicher, dass pending_approval, approved und rejected vorhanden sind.",
   "workflows.orderApproval.noWorkflowActive": "Kein Genehmigungsworkflow für diese Bestellung aktiv.",
   "workflows.orderApproval.pendingDescription": "Diese Bestellung erfordert eine Genehmigung.",

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

@@ -80,6 +80,8 @@
   "workflows.activities.async": "Asynchronous",
   "workflows.activities.compensation": "Compensation",
   "workflows.activities.config": "Configuration",
+  "workflows.activities.configInvalidJson": "Invalid JSON",
+  "workflows.activities.configMustBeObject": "Config must be a JSON object",
   "workflows.activities.deleteActivity": "Delete Activity",
   "workflows.activities.editActivity": "Edit Activity",
   "workflows.activities.plural": "Activities",
@@ -933,6 +935,7 @@
   "workflows.orderApproval.decisionLabel": "Decision",
   "workflows.orderApproval.groupDescription": "Review and approve or reject this order.",
   "workflows.orderApproval.groupLabel": "Order Approval",
+  "workflows.orderApproval.missingOrderId": "Cannot start the approval workflow before the order has loaded.",
   "workflows.orderApproval.missingStatuses": "Missing order status entries. Please ensure pending_approval, approved, and rejected statuses exist.",
   "workflows.orderApproval.noWorkflowActive": "No approval workflow is active for this order.",
   "workflows.orderApproval.pendingDescription": "This order requires approval before processing.",

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

@@ -80,6 +80,8 @@
   "workflows.activities.async": "Asincrona",
   "workflows.activities.compensation": "Compensacion",
   "workflows.activities.config": "Configuracion",
+  "workflows.activities.configInvalidJson": "JSON no válido",
+  "workflows.activities.configMustBeObject": "La configuración debe ser un objeto JSON",
   "workflows.activities.deleteActivity": "Eliminar actividad",
   "workflows.activities.editActivity": "Editar actividad",
   "workflows.activities.plural": "Actividades",
@@ -933,6 +935,7 @@
   "workflows.orderApproval.decisionLabel": "Decisión",
   "workflows.orderApproval.groupDescription": "Revise y apruebe o rechace este pedido.",
   "workflows.orderApproval.groupLabel": "Aprobación de pedido",
+  "workflows.orderApproval.missingOrderId": "No se puede iniciar el flujo de aprobación antes de que el pedido se haya cargado.",
   "workflows.orderApproval.missingStatuses": "Faltan entradas de estado del pedido. Asegúrese de que existan los estados pending_approval, approved y rejected.",
   "workflows.orderApproval.noWorkflowActive": "No hay un flujo de aprobación activo para este pedido.",
   "workflows.orderApproval.pendingDescription": "Este pedido requiere aprobación antes de procesarse.",