Merge branch 'invoke-ai:main' into dype-paper

Author: JPPhoto

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildFLUXGraph.ts

@@ -271,20 +271,26 @@ export const buildFLUXGraph = async (arg: GraphBuilderArg): Promise<GraphBuilder
       .filter((entity) => getGlobalReferenceImageWarnings(entity, model).length === 0);
 
     if (validFlux2RefImageConfigs.length > 0) {
-      const flux2KontextCollect = g.addNode({
-        type: 'collect',
-        id: getPrefixedId('flux2_kontext_collect'),
-      });
+      let prevCollect: Invocation<'collect'> | null = null;
       for (const { config } of validFlux2RefImageConfigs) {
         // FLUX.2 uses the same flux_kontext node - it just packages the image
         const kontextConditioning = g.addNode({
           type: 'flux_kontext',
           id: getPrefixedId('flux_kontext'),
           image: zImageField.parse(config.image?.crop?.image ?? config.image?.original.image),
         });
-        g.addEdge(kontextConditioning, 'kontext_cond', flux2KontextCollect, 'item');
+        const collectNode = g.addNode({
+          type: 'collect',
+          id: getPrefixedId('flux2_kontext_collect'),
+        });
+        g.addEdge(kontextConditioning, 'kontext_cond', collectNode, 'item');
+        if (prevCollect !== null) {
+          g.addEdge(prevCollect, 'collection', collectNode, 'collection');
+        }
+        prevCollect = collectNode;
       }
-      g.addEdge(flux2KontextCollect, 'collection', flux2Denoise, 'kontext_conditioning');
+      assert(prevCollect !== null);
+      g.addEdge(prevCollect, 'collection', flux2Denoise, 'kontext_conditioning');
 
       g.upsertMetadata({ ref_images: validFlux2RefImageConfigs }, 'merge');
     }