@onlineapps/conn-orch-orchestrator 1.0.49 → 1.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "Workflow orchestration connector for OA Drive - handles message routing and workflow execution",
   "main": "src/index.js",
   "scripts": {

package/src/WorkflowOrchestrator.js

@@ -145,13 +145,15 @@ class WorkflowOrchestrator {
       const updatedSteps = [...stepsArray];
       updatedSteps[currentIndex] = {
         ...step,
-        started_at: new Date().toISOString(),
-        status: 'in_progress'
+        _execution: {
+          status: 'in_progress',
+          started_at: new Date().toISOString()
+        }
       };
 
-      // Execute the step (pass _input from cookbook as context for operations)
+      // Execute the step (pass api_input from cookbook as context for operations)
       const stepContext = {
-        ...cookbookDef._input,
+        ...cookbookDef.api_input,
         _system: cookbookDef._system,
         delivery: cookbookDef.delivery
       };
@@ -177,21 +179,24 @@ class WorkflowOrchestrator {
         ? this._getStepId(nextStep) 
         : 'api_delivery_dispatcher';  // Last step -> dispatcher
 
-      // Update step with output and completion info
+      // Update step with output and execution metadata
       updatedSteps[currentIndex] = {
         ...step,
-        started_at: updatedSteps[currentIndex].started_at,
         output: result,
-        status: 'completed',
-        completed_at: new Date().toISOString(),
-        duration_ms
+        _execution: {
+          status: 'completed',
+          started_at: updatedSteps[currentIndex]._execution?.started_at || new Date().toISOString(),
+          completed_at: new Date().toISOString(),
+          duration_ms
+        }
       };
 
       // Build UPDATED UNIFIED COOKBOOK
+      // After last step -> pointer to dispatcher (not null)
       const updatedCookbook = {
         ...cookbookDef,
         steps: updatedSteps,
-        _pointer: { next: nextStep ? this._getStepId(nextStep) : null }
+        _pointer: { next: nextStep ? this._getStepId(nextStep) : 'api_delivery_dispatcher' }
       };
 
       // Publish workflow.progress with UNIFIED COOKBOOK
@@ -230,7 +235,7 @@ class WorkflowOrchestrator {
       };
 
     } catch (error) {
-      // UNIFIED COOKBOOK: _retry_history is stored INSIDE the step, not globally
+      // UNIFIED COOKBOOK: retry_history is stored in _execution.retry_history
       const crypto = require('crypto');
       
       // Find current step index
@@ -238,8 +243,8 @@ class WorkflowOrchestrator {
       const currentIndex = stepsArray.findIndex(s => this._getStepId(s) === current_step);
       const currentStepDef = stepsArray[currentIndex] || {};
       
-      // Get existing retry history from the step itself
-      const stepRetryHistory = currentStepDef._retry_history || [];
+      // Get existing retry history from _execution.retry_history
+      const stepRetryHistory = currentStepDef._execution?.retry_history || [];
       const attemptNumber = stepRetryHistory.length + 1;
       
       // Generate error reference for log lookup (instead of full stack trace)
@@ -255,7 +260,7 @@ class WorkflowOrchestrator {
         stack: error.stack
       });
 
-      // Add attempt record to step's _retry_history
+      // Add attempt record to _execution.retry_history
       const attemptRecord = {
         attempt: attemptNumber,
         error: error.message,
@@ -263,12 +268,15 @@ class WorkflowOrchestrator {
         at: new Date().toISOString()
       };
       
-      // Update steps array with retry history
+      // Update steps array with retry history inside _execution
       const updatedSteps = [...stepsArray];
       updatedSteps[currentIndex] = {
         ...currentStepDef,
-        status: 'retrying',
-        _retry_history: [...stepRetryHistory, attemptRecord]
+        _execution: {
+          ...currentStepDef._execution,
+          status: 'retrying',
+          retry_history: [...stepRetryHistory, attemptRecord]
+        }
       };
 
       // Build updated UNIFIED COOKBOOK
@@ -296,7 +304,7 @@ class WorkflowOrchestrator {
           service_name: serviceName,
           step_index: currentIndex,
           step_id: current_step,
-          cookbook: updatedCookbook,  // UNIFIED cookbook with _retry_history in step
+          cookbook: updatedCookbook,  // UNIFIED cookbook with _execution.retry_history
           error: { message: error.message, error_ref: errorRef },
           status: 'retry',
           attempt: attemptNumber,
@@ -353,8 +361,12 @@ class WorkflowOrchestrator {
       
       updatedSteps[currentIndex] = {
         ...updatedSteps[currentIndex],
-        status: 'failed',
-        _retry_history: [...updatedSteps[currentIndex]._retry_history, dlqEntryRecord]
+        _execution: {
+          ...updatedSteps[currentIndex]._execution,
+          status: 'failed',
+          failed_at: new Date().toISOString(),
+          retry_history: [...(updatedSteps[currentIndex]._execution?.retry_history || []), dlqEntryRecord]
+        }
       };
 
       const finalCookbook = {
@@ -373,7 +385,7 @@ class WorkflowOrchestrator {
         });
         
         // Publish to workflow.failed (DLQ queue - message stays until manual requeue/discard)
-        // UNIFIED COOKBOOK contains everything including _retry_history in the step
+        // UNIFIED COOKBOOK contains everything including _execution.retry_history
         await this.mqClient.publish('workflow.failed', {
           workflow_id,
           current_step,