@onlineapps/conn-orch-orchestrator 1.0.8 → 1.0.10

package/package.json

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

package/src/WorkflowOrchestrator.js

@@ -91,32 +91,6 @@ class WorkflowOrchestrator {
         return { skipped: true, reason: 'wrong_service' };
       }
 
-      // Publish workflow.progress to monitoring.workflow using unified helper
-      const { publishToMonitoringWorkflow } = require('@onlineapps/mq-client-core').monitoring;
-      try {
-        const stepIndex = cookbookDef.steps.findIndex(s => s.id === current_step);
-        console.log(`[WorkflowOrchestrator] [PROGRESS] Publishing progress for ${workflow_id}, step: ${current_step}, index: ${stepIndex}`);
-        await publishToMonitoringWorkflow(this.mqClient, {
-          event_type: 'progress',
-          workflow_id: workflow_id,
-          service_name: serviceName,
-          step_index: stepIndex >= 0 ? stepIndex : 0,
-          step_id: current_step,
-          cookbook: cookbookDef,
-          context: enrichedContext,
-          status: 'in_progress',
-          timestamp: new Date().toISOString()
-        }, this.logger, { workflow_id, step_id: current_step });
-        console.log(`[WorkflowOrchestrator] [PROGRESS] ✓ Progress published for ${workflow_id}`);
-      } catch (monitoringError) {
-        // Don't fail workflow if monitoring publish fails (helper already logs)
-        console.error(`[WorkflowOrchestrator] [PROGRESS] ✗ Failed to publish progress:`, monitoringError);
-        this.logger.warn('Failed to publish workflow.progress to monitoring', {
-          workflow_id,
-          error: monitoringError.message || String(monitoringError)
-        });
-      }
-
       // Check cache if available
       let result;
       if (this.cache && step.type === 'task') {
@@ -158,6 +132,32 @@ class WorkflowOrchestrator {
         steps: existingSteps
       };
 
+      // Publish workflow.progress AFTER execution (so we have step output)
+      const { publishToMonitoringWorkflow } = require('@onlineapps/mq-client-core').monitoring;
+      try {
+        console.log(`[WorkflowOrchestrator] [PROGRESS] Publishing progress for ${workflow_id}, step: ${current_step}, index: ${currentIndex}`);
+        await publishToMonitoringWorkflow(this.mqClient, {
+          event_type: 'progress',
+          workflow_id: workflow_id,
+          service_name: serviceName,
+          step_index: currentIndex >= 0 ? currentIndex : 0,
+          step_id: current_step,
+          cookbook: cookbookDef,
+          context: updatedContext,  // Context WITH step output
+          output: result,           // Step output directly
+          status: 'completed',      // Step completed (not in_progress)
+          timestamp: new Date().toISOString()
+        }, this.logger, { workflow_id, step_id: current_step });
+        console.log(`[WorkflowOrchestrator] [PROGRESS] ✓ Progress published for ${workflow_id}`);
+      } catch (monitoringError) {
+        // Don't fail workflow if monitoring publish fails
+        console.error(`[WorkflowOrchestrator] [PROGRESS] ✗ Failed to publish progress:`, monitoringError);
+        this.logger.warn('Failed to publish workflow.progress to monitoring', {
+          workflow_id,
+          error: monitoringError.message || String(monitoringError)
+        });
+      }
+
       // Find next step (currentIndex already defined above)
       const nextStep = cookbookDef.steps[currentIndex + 1];
 
@@ -165,8 +165,8 @@ class WorkflowOrchestrator {
         // Route to next step
         await this._routeToNextStep(nextStep, cookbookDef, updatedContext, workflow_id);
       } else {
-        // Workflow completed - pass serviceName and last step info for monitoring
-        await this._completeWorkflow(workflow_id, updatedContext, serviceName, current_step, currentIndex);
+        // Workflow completed - pass serviceName, cookbook and last step info for monitoring
+        await this._completeWorkflow(workflow_id, updatedContext, cookbookDef, serviceName, current_step, currentIndex);
       }
 
       return {
@@ -345,7 +345,7 @@ class WorkflowOrchestrator {
    * @param {string} lastStepId - ID of the last completed step
    * @param {number} lastStepIndex - Index of the last completed step
    */
-  async _completeWorkflow(workflow_id, finalContext, serviceName = 'unknown', lastStepId = null, lastStepIndex = 0) {
+  async _completeWorkflow(workflow_id, finalContext, cookbookDef = {}, serviceName = 'unknown', lastStepId = null, lastStepIndex = 0) {
     try {
       console.log(`[WorkflowOrchestrator] [PUBLISH] Preparing to publish workflow.completed for ${workflow_id}`);
       this.logger.info(`[WorkflowOrchestrator] [PUBLISH] Preparing to publish workflow.completed`, {
@@ -359,7 +359,7 @@ class WorkflowOrchestrator {
       
       // Extract delivery configuration from context (passed from Gateway)
       // Delivery Dispatcher requires: workflow_id, status, delivery (must be object, not null)
-      const delivery = finalContext?.delivery || { handler: 'none' }; // Default to 'none' handler if not provided
+      const delivery = finalContext?.delivery || cookbookDef?.delivery || { handler: 'none' };
       
       // Build message in format expected by Delivery Dispatcher
       const workflowCompletedMessage = {
@@ -368,9 +368,10 @@ class WorkflowOrchestrator {
         service: serviceName, // Service that completed the workflow (for monitoring)
         step_id: lastStepId, // Last step ID for monitoring
         step_index: lastStepIndex, // Last step index for monitoring
+        cookbook: cookbookDef, // Full cookbook for monitoring trace
         delivery: delivery, // Delivery configuration from Gateway context (must be object)
         context: finalContext, // Full context for output resolution
-        steps: finalContext?.steps || {}, // Steps results for output resolution
+        steps: finalContext?.steps || [], // Steps results (array) for output resolution
         completed_at: new Date().toISOString()
       };