@ductape/sdk 0.0.5 → 0.0.7

package/dist/workflows/workflow-executor.js

@@ -346,31 +346,13 @@ class WorkflowExecutor {
             durationMs: duration,
         });
         try {
-            // Persist result that matches the step's return shape (workflow definition step.output) when defined
+            // Caller passes the step return value (resolved shape) on success; we persist it as-is
             const stepProcessId = `${this.state.workflow_id}:${step.tag}`;
-            let value;
-            if (status === types_1.LogEventStatus.SUCCESS) {
-                const out = output !== null && output !== void 0 ? output : {};
-                const raw = typeof out === 'object' && out !== null && 'output' in out
-                    ? out.output
-                    : out;
-                const outputSchema = step.output;
-                if (outputSchema && typeof outputSchema === 'object' && !Array.isArray(outputSchema) && Object.keys(outputSchema).length > 0) {
-                    try {
-                        value = await this.resolveInput(outputSchema);
-                    }
-                    catch (_a) {
-                        value = raw;
-                    }
-                }
-                else {
-                    value = raw;
-                }
-            }
-            else {
-                value = { error: error !== null && error !== void 0 ? error : 'Step failed' };
-            }
-            const resultPayload = { process_id: stepProcessId, result: value };
+            const value = status === types_1.LogEventStatus.SUCCESS
+                ? output !== undefined && output !== null
+                    ? output
+                    : {}
+                : { error: error !== null && error !== void 0 ? error : 'Step failed' };
             const stepResult = {
                 process_id: stepProcessId,
                 product_id: this.productId || null,
@@ -380,7 +362,7 @@ class WorkflowExecutor {
                 start: Date.now() - (duration || 0),
                 end: Date.now(),
                 retryable: true,
-                result: JSON.stringify(resultPayload),
+                result: JSON.stringify(value),
                 feature_id: undefined,
                 input: JSON.stringify(resolvedInput),
                 workflow_id: this.state.workflow_id,
@@ -489,7 +471,6 @@ class WorkflowExecutor {
                 this.logStepEvent(step, `Step ${step.tag} - started`, logs_types_1.LogEventStatus.PROCESSING);
                 const result = await this.executeStep(step);
                 stepLog('Step end', Object.assign({ tag: step.tag, type: step.type === types_1.WorkflowStepType.PUBLISH ? 'produce' : step.type, success: result.success, duration_ms: result.duration }, (result.error && { error: result.error })));
-                console.warn(`[WorkflowExecutor] Step "${step.tag}" output:`, result.output);
                 if (result.error) {
                     console.warn(`[WorkflowExecutor] Step "${step.tag}" error:`, result.error);
                 }
@@ -504,8 +485,24 @@ class WorkflowExecutor {
                 });
                 // Log step completion
                 this.logStepEvent(step, result.success ? `Step ${step.tag} - completed` : `Step ${step.tag} - failed`, result.success ? logs_types_1.LogEventStatus.SUCCESS : logs_types_1.LogEventStatus.FAIL, { duration: result.duration, error: result.error });
-                // Persist step result to backend
-                await this.persistStepResult(step, result.success ? types_1.LogEventStatus.SUCCESS : types_1.LogEventStatus.FAIL, result.output, result.error, result.duration, result.input);
+                // Step return value = resolved step.output schema with primitive result, or raw when no schema
+                const outputSchema = step.output;
+                const hasOutputSchema = outputSchema && typeof outputSchema === 'object' && !Array.isArray(outputSchema) && Object.keys(outputSchema).length > 0;
+                let stepReturnValue = result.output;
+                if (result.success && hasOutputSchema) {
+                    try {
+                        stepReturnValue = await this.resolveInput(outputSchema, result.output);
+                    }
+                    catch (_p) {
+                        stepReturnValue = result.output;
+                    }
+                }
+                else if (!result.success) {
+                    stepReturnValue = undefined;
+                }
+                console.warn(`[WorkflowExecutor] Step "${step.tag}" output:`, stepReturnValue);
+                // Persist step result to backend (use step return shape, not raw primitive)
+                await this.persistStepResult(step, result.success ? types_1.LogEventStatus.SUCCESS : types_1.LogEventStatus.FAIL, stepReturnValue, result.error, result.duration, result.input);
                 this.state.step_timings.push({
                     tag: step.tag,
                     duration_ms: result.duration,
@@ -577,8 +574,8 @@ class WorkflowExecutor {
                         },
                     };
                 }
-                // Store step output and mark as completed
-                this.state.steps[step.tag] = result.output;
+                // Store step return shape in state (same value we persisted)
+                this.state.steps[step.tag] = stepReturnValue;
                 this.state.completed_steps.push(step.tag);
             }
             this.state.status = types_1.WorkflowStatus.COMPLETED;
@@ -724,6 +721,21 @@ class WorkflowExecutor {
                     debugLog('[WorkflowExecutor] executeStep unknown step type (passthrough)', { step_tag: step.tag, step_type: step.type });
                     output = resolvedInput;
             }
+            // For action steps with no app: if step.output is a template with $ refs (e.g. $Sequence{main}{step-a}{value}-b),
+            // resolve it so downstream steps get the correct value (checkpoint / closure-style steps).
+            if (step.type === types_1.WorkflowStepType.ACTION &&
+                !step.app &&
+                step.output &&
+                typeof step.output === 'object' &&
+                !Array.isArray(step.output) &&
+                this.hasOperatorRefsInOutput(step.output)) {
+                try {
+                    output = (await this.resolveInput(step.output));
+                }
+                catch (_a) {
+                    // keep output from executeActionStep if resolve fails
+                }
+            }
             const duration = Date.now() - startTime;
             debugLog('[WorkflowExecutor] executeStep output', {
                 workflow_id: this.state.workflow_id,
@@ -1043,17 +1055,25 @@ class WorkflowExecutor {
      * Execute a child workflow step
      */
     async executeChildWorkflowStep(step, input) {
-        debugLog('[WorkflowExecutor] executeChildWorkflowStep', { workflow_id: this.state.workflow_id, step_tag: step.tag, child_workflow: step.workflow });
-        // Create a new executor for the child workflow
-        const childWorkflow = await this.productBuilder.fetchWorkflow(step.workflow);
+        let childTag = step.workflow;
+        if (childTag == null) {
+            const fromResolved = input === null || input === void 0 ? void 0 : input.workflow;
+            const fromStepInput = step.input && typeof step.input === 'object' ? step.input.workflow : undefined;
+            childTag = typeof fromResolved === 'string' ? fromResolved : typeof fromStepInput === 'string' ? fromStepInput : undefined;
+        }
+        debugLog('[WorkflowExecutor] executeChildWorkflowStep', { workflow_id: this.state.workflow_id, step_tag: step.tag, child_workflow: childTag });
+        if (!childTag) {
+            throw new Error('Child workflow step has no workflow tag (missing workflow or step.input.workflow)');
+        }
+        const childWorkflow = await this.productBuilder.fetchWorkflow(childTag);
         if (!childWorkflow) {
-            debugLog('[WorkflowExecutor] executeChildWorkflowStep child not found', { step_tag: step.tag, child_workflow: step.workflow });
-            throw new Error(`Child workflow ${step.workflow} not found`);
+            debugLog('[WorkflowExecutor] executeChildWorkflowStep child not found', { step_tag: step.tag, child_workflow: childTag });
+            throw new Error(`Child workflow ${childTag} not found`);
         }
         const childExecutor = new WorkflowExecutor(this.config, childWorkflow, {
             product: this.state.product,
             env: this.state.env,
-            tag: step.workflow,
+            tag: childTag,
             input,
         }, this._privateKey);
         const result = await childExecutor.execute();
@@ -2139,14 +2159,26 @@ class WorkflowExecutor {
             return lastStep ? this.state.steps[lastStep] : {};
         }
         const hasRefs = this.hasOperatorRefsInOutput(outputDef);
+        let result;
         if (hasRefs) {
-            return this.resolveInput(outputDef);
+            result = this.resolveInput(outputDef);
         }
-        if (this.isOutputTypeSchema(outputDef)) {
+        else if (this.isOutputTypeSchema(outputDef)) {
             const out = this.buildOutputFromStepsToMatchDefinition(outputDef);
-            return Object.keys(out).length > 0 ? out : {};
+            result = Object.keys(out).length > 0 ? out : {};
+        }
+        else {
+            result = this.resolveInput(outputDef);
         }
-        return this.resolveInput(outputDef);
+        // recordScenarios: workflow.output is from last scenario; override outcome from which branch actually ran
+        if (result != null && typeof result === 'object' && 'outcome' in result) {
+            const res = result;
+            if (this.state.completed_steps.includes('approve-request'))
+                res.outcome = 'approved';
+            else if (this.state.completed_steps.includes('reject-request'))
+                res.outcome = 'rejected';
+        }
+        return result;
     }
     /**
      * Build output with same keys as workflow definition, values from step_outputs (last step first, then others).
@@ -2160,6 +2192,7 @@ class WorkflowExecutor {
         const out = {};
         const stepsReversed = [...this.state.completed_steps].reverse();
         for (const key of keys) {
+            let found = false;
             for (const stepTag of stepsReversed) {
                 const stepData = this.state.steps[stepTag];
                 if (stepData == null || typeof stepData !== 'object')
@@ -2167,14 +2200,21 @@ class WorkflowExecutor {
                 const rec = stepData;
                 if (key in rec) {
                     out[key] = rec[key];
+                    found = true;
                     break;
                 }
                 const nested = (_a = rec.output) !== null && _a !== void 0 ? _a : rec.result;
                 if (nested != null && typeof nested === 'object' && key in nested) {
                     out[key] = nested[key];
+                    found = true;
                     break;
                 }
             }
+            // Handler return shape { a, b } often maps to steps step-a, step-b; use step output so out.a.value / out.b.value exist
+            if (!found && this.state.steps[`step-${key}`] != null) {
+                const stepResult = this.state.steps[`step-${key}`];
+                out[key] = ((stepResult === null || stepResult === void 0 ? void 0 : stepResult.output) != null ? stepResult.output : stepResult);
+            }
         }
         if (Object.keys(out).length === 0 && this.state.completed_steps.length > 0) {
             const lastStep = this.state.completed_steps[this.state.completed_steps.length - 1];
@@ -2276,8 +2316,23 @@ class WorkflowExecutor {
                 const result = await this.executeStep(step);
                 // Log step completion
                 this.logStepEvent(step, result.success ? `Step ${step.tag} - completed` : `Step ${step.tag} - failed`, result.success ? logs_types_1.LogEventStatus.SUCCESS : logs_types_1.LogEventStatus.FAIL, { duration: result.duration, error: result.error });
-                // Persist step result to backend
-                await this.persistStepResult(step, result.success ? types_1.LogEventStatus.SUCCESS : types_1.LogEventStatus.FAIL, result.output, result.error, result.duration, result.input);
+                // Step return value = resolved step.output schema with primitive result, or raw when no schema
+                const outputSchemaResume = step.output;
+                const hasOutputSchemaResume = outputSchemaResume && typeof outputSchemaResume === 'object' && !Array.isArray(outputSchemaResume) && Object.keys(outputSchemaResume).length > 0;
+                let stepReturnValueResume = result.output;
+                if (result.success && hasOutputSchemaResume) {
+                    try {
+                        stepReturnValueResume = await this.resolveInput(outputSchemaResume, result.output);
+                    }
+                    catch (_m) {
+                        stepReturnValueResume = result.output;
+                    }
+                }
+                else if (!result.success) {
+                    stepReturnValueResume = undefined;
+                }
+                // Persist step result to backend (use step return shape, not raw primitive)
+                await this.persistStepResult(step, result.success ? types_1.LogEventStatus.SUCCESS : types_1.LogEventStatus.FAIL, stepReturnValueResume, result.error, result.duration, result.input);
                 this.state.step_timings.push({
                     tag: step.tag,
                     duration_ms: result.duration,
@@ -2324,8 +2379,8 @@ class WorkflowExecutor {
                         },
                     };
                 }
-                // Store step output and mark as completed
-                this.state.steps[step.tag] = result.output;
+                // Store step return shape in state (same value we persisted)
+                this.state.steps[step.tag] = stepReturnValueResume;
                 this.state.completed_steps.push(step.tag);
             }
             this.state.status = types_1.WorkflowStatus.COMPLETED;