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

package/src/modules/workflows/migrations/.snapshot-open-mercato.json

@@ -168,6 +168,15 @@
           "nullable": false,
           "length": 6,
           "mappedType": "datetime"
+        },
+        "branch_instance_id": {
+          "name": "branch_instance_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
         }
       },
       "name": "step_instances",
@@ -433,6 +442,15 @@
           "nullable": false,
           "length": 6,
           "mappedType": "datetime"
+        },
+        "branch_instance_id": {
+          "name": "branch_instance_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
         }
       },
       "name": "user_tasks",
@@ -496,6 +514,232 @@
       "foreignKeys": {},
       "nativeEnums": {}
     },
+    {
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "gen_random_uuid()",
+          "mappedType": "uuid"
+        },
+        "workflow_instance_id": {
+          "name": "workflow_instance_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "fork_step_id": {
+          "name": "fork_step_id",
+          "type": "varchar(100)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 100,
+          "mappedType": "string"
+        },
+        "join_step_id": {
+          "name": "join_step_id",
+          "type": "varchar(100)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 100,
+          "mappedType": "string"
+        },
+        "branch_key": {
+          "name": "branch_key",
+          "type": "varchar(100)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 100,
+          "mappedType": "string"
+        },
+        "parent_branch_id": {
+          "name": "parent_branch_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "current_step_id": {
+          "name": "current_step_id",
+          "type": "varchar(100)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 100,
+          "mappedType": "string"
+        },
+        "status": {
+          "name": "status",
+          "type": "varchar(30)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 30,
+          "mappedType": "string"
+        },
+        "context_namespace": {
+          "name": "context_namespace",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "json"
+        },
+        "pending_transition": {
+          "name": "pending_transition",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "json"
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "error_details": {
+          "name": "error_details",
+          "type": "jsonb",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "json"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "mappedType": "uuid"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamptz",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "length": 6,
+          "mappedType": "datetime"
+        }
+      },
+      "name": "workflow_branch_instances",
+      "schema": "public",
+      "indexes": [
+        {
+          "keyName": "workflow_branch_instances_tenant_org_idx",
+          "columnNames": [
+            "tenant_id",
+            "organization_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "workflow_branch_instances_instance_fork_idx",
+          "columnNames": [
+            "workflow_instance_id",
+            "fork_step_id"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "workflow_branch_instances_instance_status_idx",
+          "columnNames": [
+            "workflow_instance_id",
+            "status"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
+        {
+          "keyName": "workflow_branch_instances_pkey",
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "primary": true,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "foreignKeys": {},
+      "nativeEnums": {}
+    },
     {
       "columns": {
         "id": {
@@ -819,6 +1063,15 @@
           "primary": false,
           "nullable": false,
           "mappedType": "uuid"
+        },
+        "branch_instance_id": {
+          "name": "branch_instance_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
         }
       },
       "name": "workflow_events",
@@ -1293,6 +1546,16 @@
           "nullable": true,
           "length": 6,
           "mappedType": "datetime"
+        },
+        "active_fork_step_id": {
+          "name": "active_fork_step_id",
+          "type": "varchar(100)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "length": 100,
+          "mappedType": "string"
         }
       },
       "name": "workflow_instances",

package/src/modules/workflows/migrations/Migration20260602120000.ts

@@ -0,0 +1,25 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260602120000 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "workflow_branch_instances" ("id" uuid not null default gen_random_uuid(), "workflow_instance_id" uuid not null, "fork_step_id" varchar(100) not null, "join_step_id" varchar(100) not null, "branch_key" varchar(100) not null, "parent_branch_id" uuid null, "current_step_id" varchar(100) not null, "status" varchar(30) not null, "context_namespace" jsonb not null, "pending_transition" jsonb null, "error_message" text null, "error_details" jsonb null, "started_at" timestamptz null, "completed_at" timestamptz null, "tenant_id" uuid not null, "organization_id" uuid not null, "created_at" timestamptz not null, "updated_at" timestamptz not null, constraint "workflow_branch_instances_pkey" primary key ("id"));`);
+    this.addSql(`create index "workflow_branch_instances_tenant_org_idx" on "workflow_branch_instances" ("tenant_id", "organization_id");`);
+    this.addSql(`create index "workflow_branch_instances_instance_fork_idx" on "workflow_branch_instances" ("workflow_instance_id", "fork_step_id");`);
+    this.addSql(`create index "workflow_branch_instances_instance_status_idx" on "workflow_branch_instances" ("workflow_instance_id", "status");`);
+
+    this.addSql(`alter table "workflow_instances" add column "active_fork_step_id" varchar(100) null;`);
+    this.addSql(`alter table "step_instances" add column "branch_instance_id" uuid null;`);
+    this.addSql(`alter table "user_tasks" add column "branch_instance_id" uuid null;`);
+    this.addSql(`alter table "workflow_events" add column "branch_instance_id" uuid null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "workflow_events" drop column "branch_instance_id";`);
+    this.addSql(`alter table "user_tasks" drop column "branch_instance_id";`);
+    this.addSql(`alter table "step_instances" drop column "branch_instance_id";`);
+    this.addSql(`alter table "workflow_instances" drop column "active_fork_step_id";`);
+    this.addSql(`drop table if exists "workflow_branch_instances" cascade;`);
+  }
+
+}

package/src/modules/workflows/workers/workflow-activities.worker.ts

@@ -77,6 +77,7 @@ export default async function handle(
     await fireTimer(em, container, {
       instanceId: payload.workflowInstanceId,
       stepInstanceId: payload.stepInstanceId,
+      branchInstanceId: payload.branchInstanceId,
       tenantId: payload.tenantId,
       organizationId: payload.organizationId,
       userId: payload.userId,
@@ -108,6 +109,7 @@ export default async function handle(
       workflowContext: payload.workflowContext,
       stepContext: payload.stepContext,
       stepInstanceId: payload.stepInstanceId,
+      branchInstanceId: payload.branchInstanceId,
       userId: payload.userId,
     }
 
@@ -177,6 +179,7 @@ export default async function handle(
     await logWorkflowEvent(em, {
       workflowInstanceId: payload.workflowInstanceId,
       stepInstanceId: payload.stepInstanceId,
+      branchInstanceId: payload.branchInstanceId,
       eventType: 'ACTIVITY_COMPLETED',
       eventData: {
         activityId: payload.activityId,
@@ -198,7 +201,7 @@ export default async function handle(
     )
 
     // Attempt to resume workflow if all activities complete
-    await checkAndResumeWorkflow(em, ctx, payload.workflowInstanceId)
+    await checkAndResumeWorkflow(em, ctx, payload.workflowInstanceId, payload.branchInstanceId)
   } catch (error: any) {
     const executionTimeMs = Date.now() - startTime
 
@@ -211,6 +214,7 @@ export default async function handle(
     await logWorkflowEvent(em, {
       workflowInstanceId: payload.workflowInstanceId,
       stepInstanceId: payload.stepInstanceId,
+      branchInstanceId: payload.branchInstanceId,
       eventType: 'ACTIVITY_FAILED',
       eventData: {
         activityId: payload.activityId,
@@ -235,7 +239,7 @@ export default async function handle(
         `[workflows:activity-worker] Activity ${payload.activityId} (${payload.activityType}) failed after ${maxAttempts} attempts for workflow instance ${payload.workflowInstanceId} - triggering workflow failure handling`
       )
       // Final failure - attempt to resume workflow (may transition to FAILED state)
-      await checkAndResumeWorkflow(em, ctx, payload.workflowInstanceId)
+      await checkAndResumeWorkflow(em, ctx, payload.workflowInstanceId, payload.branchInstanceId)
     }
 
     // Re-throw to let BullMQ handle retry logic
@@ -256,7 +260,8 @@ export default async function handle(
 async function checkAndResumeWorkflow(
   em: EntityManager,
   ctx: HandlerContext,
-  workflowInstanceId: string
+  workflowInstanceId: string,
+  branchInstanceId?: string | null
 ): Promise<void> {
   // Import here to avoid circular dependency
   const { resumeWorkflowAfterActivities } = await import('../lib/workflow-executor')
@@ -265,7 +270,7 @@ async function checkAndResumeWorkflow(
   const container = ctx as unknown as AwilixContainer
 
   try {
-    await resumeWorkflowAfterActivities(em, container, workflowInstanceId)
+    await resumeWorkflowAfterActivities(em, container, workflowInstanceId, branchInstanceId)
   } catch (error: any) {
     // Ignore error if workflow not ready to resume yet (activities still pending)
     if (!error.message?.includes('Activities still pending')) {