@acorex/platform 20.6.0-next.2 → 20.6.0-next.21

package/fesm2022/acorex-platform-workflow.mjs

@@ -27,10 +27,10 @@ class AXPWorkflowEventService {
     get events$() {
         return this.eventSubject.asObservable();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowEventService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowEventService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowEventService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowEventService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowEventService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowEventService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -120,10 +120,10 @@ class AXPWorkflowRegistryService {
             });
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowRegistryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowRegistryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowRegistryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowRegistryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowRegistryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowRegistryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -162,17 +162,17 @@ class AXPWorkflowAction {
     dispatch(event) {
         this.eventService.dispatch(event);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowAction, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowAction, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowAction, decorators: [{
             type: Injectable
         }] });
 class AXPWorkflowFunction {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowFunction, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowFunction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowFunction, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowFunction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowFunction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowFunction, decorators: [{
             type: Injectable
         }] });
 function createWorkFlowEvent(type) {
@@ -188,10 +188,10 @@ class AXPWorkflowDecideAction extends AXPWorkflowAction {
     async execute(context) {
         // its a fake action
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowDecideAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowDecideAction, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowDecideAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowDecideAction, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowDecideAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowDecideAction, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -377,10 +377,10 @@ class AXPWorkflowService {
         }
         return this.injector.get(functionType);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowService, deps: [{ token: AXPWorkflowRegistryService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowService, deps: [{ token: AXPWorkflowRegistryService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -405,16 +405,22 @@ class AXPStartWorkflowAction extends AXPWorkflowAction {
             throw e;
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPStartWorkflowAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPStartWorkflowAction, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPStartWorkflowAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPStartWorkflowAction, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPStartWorkflowAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPStartWorkflowAction, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
         }] });
 
+// ============================================
+// WORKFLOW INSTANCE v3.0.0 TYPES
+// Based on Elsa Workflow Instance schema: https://elsaworkflows.io/schemas/workflow-instance/v3.0.0/schema.json
+// Compatible with Elsa backend while using ACoreX naming conventions
+// ============================================
+
 /**
  * Base abstract class for activities.
  * Extend this to create custom activities.
@@ -429,8 +435,11 @@ class Activity {
      */
     createResult(output, outcome = 'Done') {
         return {
-            output,
-            outcomes: { [outcome]: true }
+            success: true,
+            data: {
+                output,
+                outcomes: { [outcome]: true },
+            },
         };
     }
 }
@@ -602,10 +611,10 @@ class AXPActivityProviderService {
         };
         await provider.provide(context);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPActivityProviderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPActivityProviderService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPActivityProviderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPActivityProviderService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPActivityProviderService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPActivityProviderService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -645,10 +654,10 @@ class AXPActivityCategoryProviderService {
     getCategory(name) {
         return this.categories.get(name);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPActivityCategoryProviderService, deps: [{ token: AXPActivityCategoryProviderService, optional: true, skipSelf: true }, { token: AXP_ACTIVITY_CATEGORY_PROVIDER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPActivityCategoryProviderService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPActivityCategoryProviderService, deps: [{ token: AXPActivityCategoryProviderService, optional: true, skipSelf: true }, { token: AXP_ACTIVITY_CATEGORY_PROVIDER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPActivityCategoryProviderService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPActivityCategoryProviderService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPActivityCategoryProviderService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: AXPActivityCategoryProviderService, decorators: [{
@@ -698,10 +707,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
  * ```
  */
 class AXPWorkflowExecutionService {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowExecutionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowExecutionService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowExecutionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowExecutionService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowExecutionService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowExecutionService, decorators: [{
             type: Injectable
         }] });
 
@@ -808,6 +817,7 @@ class WorkflowCoordinator {
             const response = await this.workflowExecutionService.resumeExecution({
                 executionId,
                 stepId: task.activityId,
+                taskToken: task.taskToken,
                 outcome,
                 userInput: output
             });
@@ -852,12 +862,17 @@ class WorkflowCoordinator {
      * @param outcome - User action outcome (e.g., 'Confirmed', 'Cancelled', 'Submitted')
      * @param userInput - Optional user input data
      */
-    async resumeWorkflow(executionId, stepId, outcome, userInput) {
+    async resumeWorkflow(executionId, stepId, outcome, userInput, taskToken) {
         try {
+            // Ensure taskToken is provided for secure resumption
+            if (!taskToken) {
+                throw new Error('Missing taskToken for resumeWorkflow');
+            }
             // Backend handles everything: checks outcomeConnections and determines nextStep
             const response = await this.workflowExecutionService.resumeExecution({
                 executionId,
                 stepId,
+                taskToken,
                 outcome,
                 userInput
             });
@@ -907,81 +922,6 @@ class WorkflowCoordinator {
             return null;
         }
     }
-    /**
-     * Start step-based execution (only current step, not full workflow).
-     *
-     * Use this when you only need to execute one step at a time.
-     * Perfect for form-based workflows where user interacts with forms.
-     *
-     * @param workflowId - Workflow ID
-     * @param stepId - Initial step ID to execute
-     * @param input - Initial input data
-     * @returns Execution info with executionId and initial state
-     *
-     * @example
-     * ```typescript
-     * // Start login form step
-     * const execution = await coordinator.startStepExecution(
-     *   'login-workflow',
-     *   'login-form-step',
-     *   {}
-     * );
-     *
-     * // Save executionId for resume after refresh
-     * localStorage.setItem('execution-id', execution.executionId);
-     * ```
-     */
-    async startStepExecution(workflowId, stepId, input = {}) {
-        // Start workflow execution in backend
-        const execution = await this.startWorkflowExecution(workflowId, input);
-        // Update state with current step
-        const stateWithStep = {
-            ...execution.state,
-            currentStepId: stepId,
-            status: 'running'
-        };
-        // Update cache
-        this.stateCache.set(execution.executionId, stateWithStep);
-        return {
-            executionId: execution.executionId,
-            state: stateWithStep
-        };
-    }
-    /**
-     * Get next task from backend after backend task completion.
-     *
-     * Use this when backend task completes - backend will return next task.
-     * For frontend tasks, use executeTask + completeTask instead.
-     *
-     * @param executionId - Execution ID
-     * @returns Next task from backend (if any)
-     */
-    async getNextTask(executionId) {
-        try {
-            // Backend handles everything: executes backend tasks and returns next task
-            const response = await this.workflowExecutionService.executeCurrentStep({
-                executionId
-            });
-            // Update cache
-            if (response.state) {
-                this.stateCache.set(executionId, response.state);
-            }
-            return {
-                success: true,
-                output: response.output,
-                nextTask: response.nextTask || null,
-                executionId,
-                state: response.state
-            };
-        }
-        catch (error) {
-            return {
-                success: false,
-                error: error.message || 'Failed to get next task',
-                nextTask: null
-            };
-        }
-    }
     //#endregion
     //#region ----   Private Methods   ----
     /**
@@ -1006,15 +946,29 @@ class WorkflowCoordinator {
             // Execute activity via CommandBus
             // Activities registered as AXPCommand return {output, outcomes}
             const result = await this.commandService.execute(task.activityType, task.input || task.config || {});
-            // Extract outcome from outcomes (usually 'Done' or first key)
+            if (!result) {
+                return {
+                    output: null,
+                    outcome: 'Failed',
+                };
+            }
+            if (!result.success) {
+                return {
+                    output: {
+                        error: result.message?.text,
+                    },
+                    outcome: 'Failed',
+                };
+            }
+            const commandResult = result.data;
+            const outcomes = commandResult?.outcomes ?? {};
             let outcome = 'Done';
-            if (result?.outcomes) {
-                // Prefer 'Done' if exists, otherwise use first outcome key
-                outcome = result.outcomes['Done'] ? 'Done' : Object.keys(result.outcomes)[0] || 'Done';
+            if (Object.keys(outcomes).length > 0) {
+                outcome = outcomes['Done'] ? 'Done' : Object.keys(outcomes)[0] || 'Done';
             }
             return {
-                output: result?.output || result,
-                outcome
+                output: commandResult?.output ?? null,
+                outcome,
             };
         }
         catch (error) {
@@ -1042,10 +996,10 @@ class WorkflowCoordinator {
             pendingTask: response.pendingTask
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: WorkflowCoordinator, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: WorkflowCoordinator, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: WorkflowCoordinator, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: WorkflowCoordinator, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: WorkflowCoordinator, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: WorkflowCoordinator, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -1106,7 +1060,19 @@ class Sequence extends Activity {
     async execute(input) {
         // Execute all activities in sequence
         for (const activity of this.activities) {
-            await activity.execute(input);
+            const result = await activity.execute(input);
+            if (!result.success) {
+                return {
+                    success: false,
+                    message: result.message,
+                    data: {
+                        output: undefined,
+                        outcomes: {
+                            Failed: true,
+                        },
+                    },
+                };
+            }
         }
         return this.createResult(undefined, 'Done');
     }
@@ -1167,10 +1133,21 @@ class ShowConfirmDialog extends Activity {
         }
         catch (err) {
             console.error('[ShowConfirmDialog] Error showing dialog:', err);
-            return this.createResult({
-                result: false,
-                action: 'error'
-            }, 'Cancelled');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed to show confirm dialog',
+                },
+                data: {
+                    output: {
+                        result: false,
+                        action: 'error',
+                    },
+                    outcomes: {
+                        Cancelled: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1227,10 +1204,21 @@ class ShowAlertDialog extends Activity {
         }
         catch (err) {
             console.error('[ShowAlertDialog] Error showing dialog:', err);
-            return this.createResult({
-                result: false,
-                action: 'error'
-            }, 'Done');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed to show alert dialog',
+                },
+                data: {
+                    output: {
+                        result: false,
+                        action: 'error',
+                    },
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1286,7 +1274,18 @@ class ShowToast extends Activity {
         }
         catch (err) {
             console.error('[ShowToast] Error showing toast:', err);
-            return this.createResult(undefined, 'Error');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed to show toast',
+                },
+                data: {
+                    output: undefined,
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1336,13 +1335,35 @@ class Navigate extends Activity {
                     break;
                 default:
                     console.error(`[Navigate] Unknown navigation mode: ${mode}`);
-                    return this.createResult(undefined, 'Error');
+                    return {
+                        success: false,
+                        message: {
+                            text: `Unknown navigation mode: ${mode}`,
+                        },
+                        data: {
+                            output: undefined,
+                            outcomes: {
+                                Failed: true,
+                            },
+                        },
+                    };
             }
             return this.createResult(undefined, 'Done');
         }
         catch (err) {
             console.error('[Navigate] Error navigating:', err);
-            return this.createResult(undefined, 'Error');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed to navigate',
+                },
+                data: {
+                    output: undefined,
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1378,7 +1399,18 @@ class SetVariable extends Activity {
         }
         catch (err) {
             console.error('[SetVariable] Error setting variable:', err);
-            return this.createResult(undefined, 'Error');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed to set variable',
+                },
+                data: {
+                    output: undefined,
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1414,7 +1446,18 @@ class DispatchEvent extends Activity {
         }
         catch (err) {
             console.error('[DispatchEvent] Error dispatching event:', err);
-            return this.createResult(undefined, 'Error');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed to dispatch event',
+                },
+                data: {
+                    output: undefined,
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1456,13 +1499,36 @@ class If extends Activity {
             }
             // Execute activities in the chosen branch
             for (const activity of activities) {
-                await activity.execute(input);
+                const activityResult = await activity.execute(input);
+                if (!activityResult.success) {
+                    return {
+                        success: false,
+                        message: activityResult.message,
+                        data: {
+                            output: { branch: conditionResult ? 'then' : 'else', failedActivity: activity },
+                            outcomes: {
+                                Failed: true,
+                            },
+                        },
+                    };
+                }
             }
             return this.createResult(result, conditionResult ? 'Then' : 'Else');
         }
         catch (err) {
             console.error('[If] Error evaluating condition:', err);
-            return this.createResult({ branch: 'error' }, 'Error');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed to evaluate condition',
+                },
+                data: {
+                    output: { branch: 'error' },
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
     evaluateCondition(condition) {
@@ -1504,7 +1570,22 @@ class While extends Activity {
             while (conditionResult && iteration < maxIterations) {
                 // Execute activities in the loop
                 for (const activity of activities) {
-                    await activity.execute(input);
+                    const activityResult = await activity.execute(input);
+                    if (!activityResult.success) {
+                        return {
+                            success: false,
+                            message: activityResult.message,
+                            data: {
+                                output: {
+                                    iterations: iteration,
+                                    completed: false,
+                                },
+                                outcomes: {
+                                    Failed: true,
+                                },
+                            },
+                        };
+                    }
                 }
                 iteration++;
                 conditionResult = this.evaluateCondition(condition);
@@ -1517,7 +1598,18 @@ class While extends Activity {
         }
         catch (err) {
             console.error('[While] Error in loop execution:', err);
-            return this.createResult({ iterations: 0, completed: false }, 'Error');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed during loop execution',
+                },
+                data: {
+                    output: { iterations: 0, completed: false },
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
     evaluateCondition(condition) {
@@ -1567,7 +1659,23 @@ class ForEach extends Activity {
                 };
                 // Execute activities for current item
                 for (const activity of activities) {
-                    await activity.execute(itemContext);
+                    const activityResult = await activity.execute(itemContext);
+                    if (!activityResult.success) {
+                        return {
+                            success: false,
+                            message: activityResult.message,
+                            data: {
+                                output: {
+                                    totalItems: items.length,
+                                    processedItems: results.length,
+                                    results,
+                                },
+                                outcomes: {
+                                    Failed: true,
+                                },
+                            },
+                        };
+                    }
                 }
                 results.push({
                     item: currentItem,
@@ -1584,7 +1692,18 @@ class ForEach extends Activity {
         }
         catch (err) {
             console.error('[ForEach] Error in iteration:', err);
-            return this.createResult({ totalItems: 0, processedItems: 0, results: [] }, 'Error');
+            return {
+                success: false,
+                message: {
+                    text: err instanceof Error ? err.message : 'Failed during iteration',
+                },
+                data: {
+                    output: { totalItems: 0, processedItems: 0, results: [] },
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1629,20 +1748,66 @@ class ExecuteCommand extends Activity {
             }
             // Execute command through Command Bus
             const result = await this.commandService.execute(commandKey, commandInput);
+            if (!result) {
+                return {
+                    success: false,
+                    message: {
+                        text: `Command '${commandKey}' returned no result`,
+                    },
+                    data: {
+                        output: {
+                            commandKey,
+                            success: false,
+                            executedAt: new Date().toISOString(),
+                        },
+                        outcomes: {
+                            Failed: true,
+                        },
+                    },
+                };
+            }
+            if (!result.success) {
+                return {
+                    success: false,
+                    message: result.message,
+                    data: {
+                        output: {
+                            commandKey,
+                            success: false,
+                            executedAt: new Date().toISOString(),
+                            error: result.message?.text,
+                        },
+                        outcomes: {
+                            Failed: true,
+                        },
+                    },
+                };
+            }
             return this.createResult({
                 commandKey,
                 success: true,
-                output: result,
-                executedAt: new Date().toISOString()
+                output: result.data,
+                executedAt: new Date().toISOString(),
             }, 'Done');
         }
         catch (err) {
             console.error('[ExecuteCommand] Error executing command:', err);
-            return this.createResult({
-                commandKey,
+            return {
                 success: false,
-                error: err instanceof Error ? err.message : 'Unknown error'
-            }, 'Failed');
+                message: {
+                    text: err instanceof Error ? err.message : 'Unknown error',
+                },
+                data: {
+                    output: {
+                        commandKey,
+                        success: false,
+                        error: err instanceof Error ? err.message : 'Unknown error',
+                    },
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1698,11 +1863,22 @@ class ExecuteQuery extends Activity {
         }
         catch (err) {
             console.error('[ExecuteQuery] Error executing query:', err);
-            return this.createResult({
-                queryKey,
+            return {
                 success: false,
-                error: err instanceof Error ? err.message : 'Unknown error'
-            }, 'Failed');
+                message: {
+                    text: err instanceof Error ? err.message : 'Unknown error',
+                },
+                data: {
+                    output: {
+                        queryKey,
+                        success: false,
+                        error: err instanceof Error ? err.message : 'Unknown error',
+                    },
+                    outcomes: {
+                        Failed: true,
+                    },
+                },
+            };
         }
     }
 }
@@ -1935,13 +2111,13 @@ class AXPWorkflowModule {
             f();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowModule, deps: [{ token: 'AXPWorkflowModuleFactory', optional: true }], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowModule }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowModule, providers: [
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowModule, deps: [{ token: 'AXPWorkflowModuleFactory', optional: true }], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowModule, providers: [
             provideWorkflowActivityCommands(),
         ] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWorkflowModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWorkflowModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [],