subflow results output extraction

Author: icecrasher321

apps/sim/executor/orchestrators/node.test.ts

@@ -234,14 +234,15 @@ describe('NodeExecutionOrchestrator parallel sentinel batching', () => {
 
     await orchestrator.handleNodeCompletion(ctx, endNode.id, {
       results: ['loop-result'],
+      shouldExit: true,
       selectedRoute: EDGE.LOOP_EXIT,
     })
 
     expect(parallelOrchestrator.handleParallelBranchCompletion).toHaveBeenCalledWith(
       ctx,
       'parent-parallel',
       endNode.id,
-      { results: ['loop-result'], selectedRoute: EDGE.LOOP_EXIT },
+      { results: ['loop-result'] },
       3
     )
   })
@@ -273,14 +274,15 @@ describe('NodeExecutionOrchestrator parallel sentinel batching', () => {
 
     await orchestrator.handleNodeCompletion(ctx, endNode.id, {
       results: ['parallel-result'],
+      sentinelEnd: true,
       selectedRoute: EDGE.PARALLEL_EXIT,
     })
 
     expect(loopOrchestrator.storeLoopNodeOutput).toHaveBeenCalledWith(
       ctx,
       'parent-loop',
       'nested-parallel',
-      { results: ['parallel-result'], selectedRoute: EDGE.PARALLEL_EXIT }
+      { results: ['parallel-result'] }
     )
   })
 })

apps/sim/executor/orchestrators/node.ts

@@ -24,6 +24,10 @@ function getResultCount(value: unknown): number {
   return Array.isArray(value) ? value.length : 0
 }
 
+function getSubflowResultOutput(output: NormalizedBlockOutput): NormalizedBlockOutput {
+  return { results: output.results ?? [] }
+}
+
 export interface NodeExecutionResult {
   nodeId: string
   output: NormalizedBlockOutput
@@ -311,13 +315,18 @@ export class NodeExecutionOrchestrator {
         ctx,
         parentEntry.parentId,
         node.id,
-        output,
+        getSubflowResultOutput(output),
         parentEntry.branchIndex
       )
       return
     }
 
-    this.loopOrchestrator.storeLoopNodeOutput(ctx, parentEntry.parentId, subflowId, output)
+    this.loopOrchestrator.storeLoopNodeOutput(
+      ctx,
+      parentEntry.parentId,
+      subflowId,
+      getSubflowResultOutput(output)
+    )
   }
 
   private handleRegularNodeCompletion(

apps/sim/executor/orchestrators/parallel.ts

@@ -7,7 +7,6 @@ import type { EdgeManager } from '@/executor/execution/edge-manager'
 import type { ParallelScope } from '@/executor/execution/state'
 import type { BlockStateWriter, ContextExtensions } from '@/executor/execution/types'
 import type { ExecutionContext, NormalizedBlockOutput } from '@/executor/types'
-import type { ParallelConfigWithNodes } from '@/executor/types/parallel'
 import { type ClonedSubflowInfo, ParallelExpander } from '@/executor/utils/parallel-expansion'
 import {
   addSubflowErrorLog,
@@ -587,14 +586,4 @@ export class ParallelOrchestrator {
   getParallelScope(ctx: ExecutionContext, parallelId: string): ParallelScope | undefined {
     return ctx.parallelExecutions?.get(parallelId)
   }
-
-  findParallelIdForNode(baseNodeId: string): string | undefined {
-    for (const [parallelId, config] of this.dag.parallelConfigs) {
-      const parallelConfig = config as ParallelConfigWithNodes
-      if (parallelConfig.nodes?.includes(baseNodeId)) {
-        return parallelId
-      }
-    }
-    return undefined
-  }
 }