Merge branch 'master' into fix/qwen-layered-blueprint-drop-duplicate-first-image

.coderabbit.yaml

@@ -11,6 +11,10 @@ reviews:
   review_status: false
   review_details: true
   commit_status: true
+  # Without this, a review that never happened (rate limit, internal error)
+  # still posts a green "CodeRabbit" commit status, so a throttled review is
+  # indistinguishable from a clean one.
+  fail_commit_status: true
   collapse_walkthrough: true
   changed_files_summary: false
   sequence_diagrams: false

README.md

@@ -194,7 +194,7 @@ Python 3.14 works but some custom nodes may have issues. The free threaded varia
 
 Python 3.13 is very well supported. If you have trouble with some custom node dependencies on 3.13 you can try 3.12
 
-torch 2.5 is minimally supported but using a newer version is extremely recommended. Some features and optimizations might only work on newer versions. We generally recommend using the latest major version of pytorch with the latest cuda version unless it is less than 2 weeks old. If your pytorch is more than 6 months old, please update it.
+torch 2.7 is minimally supported but using a newer version is extremely recommended. Using a cu130 or above version of pytorch is required on Nvidia 20 series and above. Some features and optimizations might only work on newer versions. We generally recommend using the latest major version of pytorch with the latest cuda version unless it is less than 2 weeks old. If your pytorch is more than 6 months old, please update it.
 
 ### Instructions:
 

comfy/background_removal/birefnet.py

@@ -433,19 +433,16 @@ class DeformableConv2d(nn.Module):
     def forward(self, x):
         offset = self.offset_conv(x)
         modulator = 2. * torch.sigmoid(self.modulator_conv(x))
-        weight, bias, offload_info = comfy.ops.cast_bias_weight(self.regular_conv, x, offloadable=True)
-
-        x = deform_conv2d(
-            input=x,
-            offset=offset,
-            weight=weight,
-            bias=None,
-            padding=self.padding,
-            mask=modulator,
-            stride=self.stride,
-        )
-        comfy.ops.uncast_bias_weight(self.regular_conv, weight, bias, offload_info)
-        return x
+        with comfy.ops.CastBiasWeightContext(self.regular_conv, x, offloadable=True) as (weight, _bias):
+            return deform_conv2d(
+                input=x,
+                offset=offset,
+                weight=weight,
+                bias=None,
+                padding=self.padding,
+                mask=modulator,
+                stride=self.stride,
+            )
 
 class BasicDecBlk(nn.Module):
     def __init__(self, in_channels=64, out_channels=64, inter_channels=64, device=None, dtype=None, operations=None):

comfy/controlnet.py

@@ -381,13 +381,10 @@ class ControlLoraOps:
             self.bias = None
 
         def forward(self, input):
-            weight, bias, offload_stream = comfy.ops.cast_bias_weight(self, input, offloadable=True)
-            if self.up is not None:
-                x = torch.nn.functional.linear(input, weight + (torch.mm(self.up.flatten(start_dim=1), self.down.flatten(start_dim=1))).reshape(self.weight.shape).type(input.dtype), bias)
-            else:
-                x = torch.nn.functional.linear(input, weight, bias)
-            comfy.ops.uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with comfy.ops.CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                if self.up is None:
+                    return torch.nn.functional.linear(input, weight, bias)
+                return torch.nn.functional.linear(input, weight + (torch.mm(self.up.flatten(start_dim=1), self.down.flatten(start_dim=1))).reshape(self.weight.shape).type(input.dtype), bias)
 
     class Conv2d(torch.nn.Module, comfy.ops.CastWeightBiasOp):
         def __init__(

comfy/ldm/minimax/audio_vae.py

@@ -99,7 +99,7 @@ class UpSample1d(nn.Module):
     def forward(self, x):
         _, C, _ = x.shape
         x = F.pad(x, (self.pad, self.pad), mode="replicate")
-        x = F.conv_transpose1d(x, self.filter.expand(C, -1, -1).to(x.dtype), stride=self.stride, groups=C).mul_(self.ratio)
+        x = F.conv_transpose1d(x, comfy.ops.cast_to_input(self.filter.expand(C, -1, -1), x), stride=self.stride, groups=C).mul_(self.ratio)
         x = x[..., self.pad_left:-self.pad_right]
         return x
 
@@ -115,7 +115,7 @@ class LowPassFilter1d(nn.Module):
     def forward(self, x):
         _, C, _ = x.shape
         x = F.pad(x, (self.pad_left, self.pad_right), mode="replicate")
-        return F.conv1d(x, self.filter.expand(C, -1, -1).to(x.dtype), stride=self.stride, groups=C)
+        return F.conv1d(x, comfy.ops.cast_to_input(self.filter.expand(C, -1, -1), x), stride=self.stride, groups=C)
 
 
 class DownSample1d(nn.Module):

comfy/ldm/minimax/model.py

@@ -489,14 +489,14 @@ class MiniMaxH3Model(nn.Module):
         # the sampler carries the audio as (sigma_v / sigma_a) * x_audio; undo it outside
         # the wrappers so they and the network see the stream's own latent and velocity
         scale = float((minimax_payload or {}).get("audio_scale", 1.0))
-        audio_x = x[1]
+        audio_src = x[1]
         if scale != 1.0:
             shift_v = float(transformer_options.get("minimax_h3_sigma_shift_video", self.sigma_shift_video))
             shift_a = float(transformer_options.get("minimax_h3_sigma_shift_audio", self.sigma_shift_audio))
             sigma_v = (timestep.flatten()[0] / 1000.0).float().clamp(min=1e-6)
             sigma_a = time_shift_sigma(sigma_v, shift_v, shift_a)
-            audio_x = audio_x * (sigma_a / sigma_v).to(audio_x.dtype)
-            x = [x[0], audio_x]
+            carry = (sigma_a / sigma_v).to(audio_src.dtype)
+            x = [x[0], audio_src * carry]
 
         out = comfy.patcher_extension.WrapperExecutor.new_class_executor(
             self._forward,
@@ -506,7 +506,7 @@ class MiniMaxH3Model(nn.Module):
 
         if scale != 1.0:
             # d/d(sigma_v) of the carried variable
-            out[1] = ((1.0 - scale) * audio_x
+            out[1] = ((1.0 - scale) * (audio_src * carry)
                       + (1.0 + (scale - 1.0) * sigma_a).to(out[1].dtype) * out[1])
         return out
 

comfy/nested_tensor.py

@@ -83,6 +83,9 @@ class NestedTensor:
     def layout(self):
         return self.tensors[0].layout
 
+    def __repr__(self):
+        return f"{type(self).__name__}({self.tensors!r})"
+
 
 def cat_nested(tensors, *args, **kwargs):
     cated_tensors = []

comfy/ops.py

@@ -452,6 +452,26 @@ def uncast_bias_weight(s, weight, bias, offload_stream):
             device = bias_a.device
     os.wait_stream(comfy.model_management.current_stream(device))
 
+class CastBiasWeightContext:
+    # When initialized with no arguments or the first is None, the context
+    # will return the tuple (None, None).
+    def __init__(self, *args, **kwargs):
+        self.slf = args[0] if len(args) else None
+        self.state = (None, None) if self.slf is None else cast_bias_weight(*args, **kwargs)
+
+    def __enter__(self):
+        result = self.state
+        if len(result) < 3 or result[2] is None:
+            # Not offloaded, immediately drop references.
+            self.state = self.slf = None
+        return result[:2]
+
+    def __exit__(self, *_args) -> None:
+        if self.slf is None:
+            return
+        slf, state = self.slf, self.state
+        self.state = self.slf = None
+        uncast_bias_weight(slf, *state)
 
 class CastWeightBiasOp:
     comfy_cast_weights = False
@@ -538,10 +558,8 @@ class disable_weight_init:
             return None
 
         def forward_comfy_cast_weights(self, input):
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            x = torch.nn.functional.linear(input, weight, bias)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                return torch.nn.functional.linear(input, weight, bias)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -555,10 +573,8 @@ class disable_weight_init:
             return None
 
         def forward_comfy_cast_weights(self, input):
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            x = self._conv_forward(input, weight, bias)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                return self._conv_forward(input, weight, bias)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -572,10 +588,8 @@ class disable_weight_init:
             return None
 
         def forward_comfy_cast_weights(self, input):
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            x = self._conv_forward(input, weight, bias)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                return self._conv_forward(input, weight, bias)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -600,10 +614,8 @@ class disable_weight_init:
                 return super()._conv_forward(input, weight, bias, *args, **kwargs)
 
         def forward_comfy_cast_weights(self, input, autopad=None):
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            x = self._conv_forward(input, weight, bias, autopad=autopad)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                return self._conv_forward(input, weight, bias, autopad=autopad)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -617,10 +629,8 @@ class disable_weight_init:
             return None
 
         def forward_comfy_cast_weights(self, input):
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            x = torch.nn.functional.group_norm(input, self.num_groups, weight, bias, self.eps)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                return torch.nn.functional.group_norm(input, self.num_groups, weight, bias, self.eps)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -634,12 +644,10 @@ class disable_weight_init:
             return None
 
         def forward_comfy_cast_weights(self, input):
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            running_mean = self.running_mean.to(device=input.device, dtype=weight.dtype) if self.running_mean is not None else None
-            running_var = self.running_var.to(device=input.device, dtype=weight.dtype) if self.running_var is not None else None
-            x = torch.nn.functional.batch_norm(input, running_mean, running_var, weight, bias, self.training, self.momentum, self.eps)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                running_mean = self.running_mean.to(device=input.device, dtype=weight.dtype) if self.running_mean is not None else None
+                running_var = self.running_var.to(device=input.device, dtype=weight.dtype) if self.running_var is not None else None
+                return torch.nn.functional.batch_norm(input, running_mean, running_var, weight, bias, self.training, self.momentum, self.eps)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -653,15 +661,8 @@ class disable_weight_init:
             return None
 
         def forward_comfy_cast_weights(self, input):
-            if self.weight is not None:
-                weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            else:
-                weight = None
-                bias = None
-                offload_stream = None
-            x = torch.nn.functional.layer_norm(input, self.normalized_shape, weight, bias, self.eps)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self if self.weight is not None else None, input, offloadable=True) as (weight, bias):
+                return torch.nn.functional.layer_norm(input, self.normalized_shape, weight, bias, self.eps)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -676,15 +677,8 @@ class disable_weight_init:
             return None
 
         def forward_comfy_cast_weights(self, input):
-            if self.weight is not None:
-                weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            else:
-                weight = None
-                bias = None
-                offload_stream = None
-            x = torch.nn.functional.rms_norm(input, self.normalized_shape, weight, self.eps)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self if self.weight is not None else None, input, offloadable=True) as (weight, bias):
+                return torch.nn.functional.rms_norm(input, self.normalized_shape, weight, self.eps)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -703,12 +697,10 @@ class disable_weight_init:
                 input, output_size, self.stride, self.padding, self.kernel_size,
                 num_spatial_dims, self.dilation)
 
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            x = torch.nn.functional.conv_transpose2d(
-                input, weight, bias, self.stride, self.padding,
-                output_padding, self.groups, self.dilation)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                return torch.nn.functional.conv_transpose2d(
+                       input, weight, bias, self.stride, self.padding,
+                       output_padding, self.groups, self.dilation)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -727,12 +719,10 @@ class disable_weight_init:
                 input, output_size, self.stride, self.padding, self.kernel_size,
                 num_spatial_dims, self.dilation)
 
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            x = torch.nn.functional.conv_transpose1d(
-                input, weight, bias, self.stride, self.padding,
-                output_padding, self.groups, self.dilation)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                return torch.nn.functional.conv_transpose1d(
+                       input, weight, bias, self.stride, self.padding,
+                       output_padding, self.groups, self.dilation)
 
         def forward(self, *args, **kwargs):
             run_every_op()
@@ -795,10 +785,8 @@ class disable_weight_init:
             output_dtype = out_dtype
             if self.weight.dtype == torch.float16 or self.weight.dtype == torch.bfloat16:
                 out_dtype = None
-            weight, bias, offload_stream = cast_bias_weight(self, device=input.device, dtype=out_dtype, offloadable=True)
-            x = torch.nn.functional.embedding(input, weight, self.padding_idx, self.max_norm, self.norm_type, self.scale_grad_by_freq, self.sparse).to(dtype=output_dtype)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, device=input.device, dtype=out_dtype, offloadable=True) as (weight, bias):
+                return torch.nn.functional.embedding(input, weight, self.padding_idx, self.max_norm, self.norm_type, self.scale_grad_by_freq, self.sparse).to(dtype=output_dtype)
 
 
         def forward(self, *args, **kwargs):
@@ -874,7 +862,6 @@ def fp8_linear(self, input):
     if input.ndim != 2:
         return None
     lora_compute_dtype=comfy.model_management.lora_compute_dtype(input.device)
-    w, bias, offload_stream = cast_bias_weight(self, input, dtype=dtype, bias_dtype=input_dtype, offloadable=True, compute_dtype=lora_compute_dtype, want_requant=True)
     scale_weight = torch.ones((), device=input.device, dtype=torch.float32)
 
     scale_input = torch.ones((), device=input.device, dtype=torch.float32)
@@ -883,15 +870,16 @@ def fp8_linear(self, input):
     layout_params_input = TensorCoreFP8Layout.Params(scale=scale_input, orig_dtype=input_dtype, orig_shape=tuple(input_fp8.shape))
     quantized_input = QuantizedTensor(input_fp8, "TensorCoreFP8Layout", layout_params_input)
 
-    # Wrap weight in QuantizedTensor - this enables unified dispatch
-    # Call F.linear - __torch_dispatch__ routes to fp8_linear handler in quant_ops.py!
-    layout_params_weight = TensorCoreFP8Layout.Params(scale=scale_weight, orig_dtype=input_dtype, orig_shape=tuple(w.shape))
-    quantized_weight = QuantizedTensor(w, "TensorCoreFP8Layout", layout_params_weight)
-    o = torch.nn.functional.linear(quantized_input, quantized_weight, bias)
+    with CastBiasWeightContext(self, input, dtype=dtype, bias_dtype=input_dtype, offloadable=True, compute_dtype=lora_compute_dtype, want_requant=True) as (w, bias):
+        # Wrap weight in QuantizedTensor - this enables unified dispatch
+        # Call F.linear - __torch_dispatch__ routes to fp8_linear handler in quant_ops.py!
+        w_shape = tuple(w.shape)
+        layout_params_weight = TensorCoreFP8Layout.Params(scale=scale_weight, orig_dtype=input_dtype, orig_shape=w_shape)
+        quantized_weight = QuantizedTensor(w, "TensorCoreFP8Layout", layout_params_weight)
+        o = torch.nn.functional.linear(quantized_input, quantized_weight, bias)
 
-    uncast_bias_weight(self, w, bias, offload_stream)
     if tensor_3d:
-        o = o.reshape((input_shape[0], input_shape[1], w.shape[0]))
+        o = o.reshape((input_shape[0], input_shape[1], w_shape[0]))
 
     return o
 
@@ -911,10 +899,8 @@ class fp8_ops(manual_cast):
                 except Exception as e:
                     logging.info("Exception during fp8 op: {}".format(e))
 
-            weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-            x = torch.nn.functional.linear(input, weight, bias)
-            uncast_bias_weight(self, weight, bias, offload_stream)
-            return x
+            with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                return torch.nn.functional.linear(input, weight, bias)
 
 CUBLAS_IS_AVAILABLE = False
 try:
@@ -930,10 +916,8 @@ if CUBLAS_IS_AVAILABLE:
                 return None
 
             def forward_comfy_cast_weights(self, input):
-                weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-                x = cublas_half_matmul(input, weight, bias, self._epilogue_str, self.has_bias)
-                uncast_bias_weight(self, weight, bias, offload_stream)
-                return x
+                with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
+                    return cublas_half_matmul(input, weight, bias, self._epilogue_str, self.has_bias)
 
             def forward(self, *args, **kwargs):
                 run_every_op()
@@ -1211,6 +1195,26 @@ def _load_quantized_module(module, super_load, state_dict, prefix, local_metadat
                 "quant_group_size": 64,
                 "linear_dtype": layer_conf.get("linear_dtype", params_conf.get("linear_dtype", "int4")),
             }
+        elif module.quant_format == "asym_w4a8_int8":
+            # int4 weight (packed int8 [N,K/2]) + fp8 per-group scale (weight_s_rel),
+            # fp32 per-channel scale (weight_s_channel) + optional Lloyd-Max codebook.
+            scale = pop_scale("weight_s_rel")
+            if scale is None:
+                raise ValueError(f"Missing W4A8 group scale (weight_s_rel) for layer {layer_name}")
+            if scale.dtype == torch.uint8:
+                scale = scale.view(torch.float8_e4m3fn)
+            params_conf = layer_conf.get("params", {})
+            if not isinstance(params_conf, dict):
+                params_conf = {}
+            scales = {
+                "scale": scale,
+                "s_channel": pop_scale("weight_s_channel"),
+                "codebook": pop_scale("weight_codebook"),
+                "group_size": int(layer_conf.get("group_size", params_conf.get("group_size", 16))),
+                "convrot_groupsize": int(
+                    layer_conf.get("convrot_groupsize", params_conf.get("convrot_groupsize", 256))
+                ),
+            }
         else:
             raise ValueError(f"Unsupported quantization format: {module.quant_format}")
 
@@ -1262,6 +1266,9 @@ def _quantized_weight_state_dict(module, sd, prefix, extra_quant_conf=None, extr
             linear_dtype = getattr(params, "linear_dtype", "int4")
             if linear_dtype != "int4":
                 quant_conf["linear_dtype"] = linear_dtype
+        elif module.quant_format == "asym_w4a8_int8":
+            quant_conf["group_size"] = getattr(params, "group_size", 16)
+            quant_conf["convrot_groupsize"] = getattr(params, "convrot_groupsize", 256)
         if extra_quant_conf:
             quant_conf.update(extra_quant_conf)
         sd[f"{prefix}comfy_quant"] = torch.tensor(list(json.dumps(quant_conf).encode("utf-8")), dtype=torch.uint8)
@@ -1321,29 +1328,28 @@ def mixed_precision_ops(quant_config={}, compute_dtype=torch.bfloat16, full_prec
                 want_requant=False,
                 weight_only_quant=False,
             ):
-                if weight_only_quant:
-                    weight, bias, offload_stream = cast_bias_weight(
-                        self,
-                        input=None,
-                        dtype=self.weight.dtype,
-                        device=input.device,
-                        bias_dtype=input.dtype,
-                        offloadable=True,
-                        compute_dtype=compute_dtype,
-                        want_requant=True,
-                    )
-                    weight = weight.to(dtype=input.dtype)
-                else:
-                    weight, bias, offload_stream = cast_bias_weight(
+                if not weight_only_quant:
+                    with CastBiasWeightContext(
                         self,
                         input,
                         offloadable=True,
                         compute_dtype=compute_dtype,
                         want_requant=want_requant,
-                    )
-                x = self._forward(input, weight, bias)
-                uncast_bias_weight(self, weight, bias, offload_stream)
-                return x
+                    ) as (weight, bias):
+                        return self._forward(input, weight, bias)
+
+                with CastBiasWeightContext(
+                    self,
+                    input=None,
+                    dtype=self.weight.dtype,
+                    device=input.device,
+                    bias_dtype=input.dtype,
+                    offloadable=True,
+                    compute_dtype=compute_dtype,
+                    want_requant=True,
+                ) as (weight, bias):
+                    weight = weight.to(dtype=input.dtype)
+                    return self._forward(input, weight, bias)
 
             def forward(self, input, *args, **kwargs):
                 run_every_op()
@@ -1368,25 +1374,20 @@ def mixed_precision_ops(quant_config={}, compute_dtype=torch.bfloat16, full_prec
 
                 # Training path: quantized forward with compute_dtype backward via autograd function
                 if (input.requires_grad and _use_quantized and quantize_input):
-
-                    weight, bias, offload_stream = cast_bias_weight(
+                    with CastBiasWeightContext(
                         self,
                         input,
                         offloadable=True,
                         compute_dtype=compute_dtype,
                         want_requant=True
-                    )
+                    ) as (weight, bias):
+                        scale = getattr(self, 'input_scale', None)
+                        if scale is not None:
+                            scale = comfy.model_management.cast_to_device(scale, input.device, None)
 
-                    scale = getattr(self, 'input_scale', None)
-                    if scale is not None:
-                        scale = comfy.model_management.cast_to_device(scale, input.device, None)
-
-                    output = QuantLinearFunc.apply(
-                        input, weight, bias, self.layout_type, scale, compute_dtype
-                    )
-
-                    uncast_bias_weight(self, weight, bias, offload_stream)
-                    return output
+                        return QuantLinearFunc.apply(
+                            input, weight, bias, self.layout_type, scale, compute_dtype
+                        )
 
                 # Inference path (unchanged)
                 if _use_quantized and quantize_input:
@@ -1497,13 +1498,11 @@ def mixed_precision_ops(quant_config={}, compute_dtype=torch.bfloat16, full_prec
                 """Cast the whole bank once; expert_linear inside reuses the cast.
                 Not re-entrant — do not nest calls on the same instance.
                 """
-                weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-                self._resident_bank = (weight, bias)
-                try:
-                    yield self
-                finally:
-                    self._resident_bank = None
-                    uncast_bias_weight(self, weight, bias, offload_stream)
+                with CastBiasWeightContext(self, input, offloadable=True) as self._resident_bank:
+                    try:
+                        yield self
+                    finally:
+                        self._resident_bank = None
 
             def expert_linear(self, input: torch.Tensor, i: int) -> torch.Tensor:
                 """Linear against expert i's weight (with optional bias)."""
@@ -1511,11 +1510,8 @@ def mixed_precision_ops(quant_config={}, compute_dtype=torch.bfloat16, full_prec
                 if resident is not None:
                     weight, bias = resident
                     return self._expert_linear_impl(input, weight, bias, i)
-                weight, bias, offload_stream = cast_bias_weight(self, input, offloadable=True)
-                try:
+                with CastBiasWeightContext(self, input, offloadable=True) as (weight, bias):
                     return self._expert_linear_impl(input, weight, bias, i)
-                finally:
-                    uncast_bias_weight(self, weight, bias, offload_stream)
 
             def _expert_linear_impl(self, input, weight, bias, i):
                 if isinstance(weight, QuantizedTensor):
@@ -1618,25 +1614,23 @@ def mixed_precision_ops(quant_config={}, compute_dtype=torch.bfloat16, full_prec
 
                 # Optimized path: lookup in fp8/int8, dequantize only the selected rows.
                 if isinstance(weight, QuantizedTensor) and len(self.weight_function) == 0:
-                    qdata, _, offload_stream = cast_bias_weight(self, device=input.device, dtype=weight.dtype, offloadable=True)
-                    if isinstance(qdata, QuantizedTensor):
-                        params = qdata._params
-                        scale = params.scale
-                        qdata = qdata._qdata
-                    else:
-                        params = weight._params
-                        scale = None
+                    with CastBiasWeightContext(self, device=input.device, dtype=weight.dtype, offloadable=True) as (qdata, _bias):
+                        if isinstance(qdata, QuantizedTensor):
+                            params = qdata._params
+                            scale = params.scale
+                            qdata = qdata._qdata
+                        else:
+                            params = weight._params
+                            scale = None
 
-                    # int8: per-row scale possible ConvRot, so let the layout do the gather
-                    if self.quant_format == "int8_tensorwise":
-                        x = get_layout_class(self.layout_type).dequantize_embedding(qdata, params, input)
-                        uncast_bias_weight(self, qdata, None, offload_stream)
-                        return x if out_dtype is None else x.to(dtype=out_dtype)
+                        # int8: per-row scale possible ConvRot, so let the layout do the gather
+                        if self.quant_format == "int8_tensorwise":
+                            x = get_layout_class(self.layout_type).dequantize_embedding(qdata, params, input)
+                            return x if out_dtype is None else x.to(dtype=out_dtype)
 
-                    x = torch.nn.functional.embedding(
-                        input, qdata, self.padding_idx, self.max_norm,
-                        self.norm_type, self.scale_grad_by_freq, self.sparse)
-                    uncast_bias_weight(self, qdata, None, offload_stream)
+                        x = torch.nn.functional.embedding(
+                            input, qdata, self.padding_idx, self.max_norm,
+                            self.norm_type, self.scale_grad_by_freq, self.sparse)
                     target_dtype = out_dtype if out_dtype is not None else weight._params.orig_dtype
                     x = x.to(dtype=target_dtype)
                     if scale is not None and scale != 1.0:

comfy/quant_ops.py

@@ -28,6 +28,7 @@ try:
         TensorCoreNVFP4Layout as _CKNvfp4Layout,
         TensorCoreConvRotW4A4Layout as _CKTensorCoreConvRotW4A4Layout,
         TensorWiseINT8Layout as _CKTensorWiseINT8Layout,
+        AsymW4A8Int8Layout as _CKAsymW4A8Int8Layout,
         register_layout_op,
         register_layout_class,
         get_layout_class,
@@ -83,6 +84,9 @@ except ImportError as e:
     class _CKTensorCoreConvRotW4A4Layout:
         pass
 
+    class _CKAsymW4A8Int8Layout:
+        pass
+
     def register_layout_class(name, cls):
         pass
 
@@ -212,7 +216,7 @@ class TensorCoreFP8E5M2Layout(_TensorCoreFP8LayoutBase):
 TensorCoreFP8Layout = TensorCoreFP8E4M3Layout
 TensorWiseINT8Layout = _CKTensorWiseINT8Layout
 TensorCoreConvRotW4A4Layout = _CKTensorCoreConvRotW4A4Layout
-
+AsymW4A8Int8Layout = _CKAsymW4A8Int8Layout
 
 # ==============================================================================
 # Registry
@@ -226,6 +230,7 @@ register_layout_class("TensorWiseINT8Layout", _CKTensorWiseINT8Layout)
 register_layout_class("TensorCoreConvRotW4A4Layout", _CKTensorCoreConvRotW4A4Layout)
 if _CK_MXFP8_AVAILABLE:
     register_layout_class("TensorCoreMXFP8Layout", TensorCoreMXFP8Layout)
+register_layout_class("AsymW4A8Int8Layout", _CKAsymW4A8Int8Layout)
 
 QUANT_ALGOS = {
     "float8_e4m3fn": {
@@ -268,6 +273,13 @@ QUANT_ALGOS["convrot_w4a4"] = {
     "quantize_input": False,
 }
 
+QUANT_ALGOS["asym_w4a8_int8"] = {
+    "storage_t": torch.int8,
+    "parameters": {"weight_scale"},
+    "comfy_tensor_layout": "AsymW4A8Int8Layout",
+    "quantize_input": False,
+}
+
 
 # ==============================================================================
 # Re-exports for backward compatibility
@@ -282,6 +294,7 @@ __all__ = [
     "TensorCoreNVFP4Layout",
     "TensorCoreConvRotW4A4Layout",
     "TensorWiseINT8Layout",
+    "AsymW4A8Int8Layout",
     "QUANT_ALGOS",
     "register_layout_op",
 ]

comfy/text_encoders/llama.py

@@ -868,16 +868,10 @@ class BaseGenerate:
         else:
             module = self.model.embed_tokens
 
-        offload_stream = None
-        if module.comfy_cast_weights:
-            weight, _, offload_stream = comfy.ops.cast_bias_weight(module, input, offloadable=True)
-        else:
-            weight = self.model.embed_tokens.weight.to(x)
-
-        x = torch.nn.functional.linear(input, weight, None)
-
-        comfy.ops.uncast_bias_weight(module, weight, None, offload_stream)
-        return x
+        if not module.comfy_cast_weights:
+            return torch.nn.functional.linear(input, self.model.embed_tokens.weight.to(x), None)
+        with comfy.ops.CastBiasWeightContext(module, input, offloadable=True) as (weight, _bias):
+            return torch.nn.functional.linear(input, weight, None)
 
     def init_kv_cache(self, batch, max_cache_len, device, execution_dtype):
         model_config = self.model.config

comfy_api/latest/_io.py

@@ -847,6 +847,61 @@ class Load3DAnimation(Load3D):
     ...
 
 
+@comfytype(io_type="LAYERS")
+class Layers(ComfyTypeIO):
+    BlendMode = Literal[
+        "normal", "multiply", "screen", "overlay", "darken", "lighten",
+        "color-dodge", "color-burn", "hard-light", "soft-light", "difference",
+        "exclusion", "linear-dodge", "linear-burn", "vivid-light", "pin-light",
+        "linear-light", "hard-mix", "subtract", "divide", "grain-extract",
+        "grain-merge", "hue", "saturation", "color", "luminosity",
+    ]
+
+    class LayerItem(TypedDict):
+        image: torch.Tensor
+        type: Literal["raster"]
+        x: NotRequired[int]
+        y: NotRequired[int]
+        mask: NotRequired[torch.Tensor]
+        z_index: int
+        name: NotRequired[str]
+        opacity: NotRequired[float]
+        blend_mode: NotRequired["Layers.BlendMode"]
+        visible: NotRequired[bool]
+        flip_h: NotRequired[bool]
+        flip_v: NotRequired[bool]
+        rotation: NotRequired[float]
+        w: NotRequired[int]
+        h: NotRequired[int]
+
+    class Document(TypedDict):
+        version: int
+        canvas: NotRequired[tuple[int, int]]
+        layers: list["Layers.LayerItem"]
+
+    Type = Document
+
+
+@comfytype(io_type="COMPOSITOR")
+class Compositor(ComfyTypeIO):
+    class LayerState(TypedDict):
+        version: NotRequired[int]
+        canvas: dict
+        background: NotRequired[dict]
+        inputs: NotRequired[list[str]]
+        order: NotRequired[list[int]]
+        layers: list[dict]
+
+    Type = LayerState
+
+    class Input(WidgetInput):
+        def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None,
+                     socketless: bool=True, default: dict=None, advanced: bool=None):
+            super().__init__(id, display_name, optional, tooltip, None, default, socketless, None, None, None, None, advanced)
+            if default is None:
+                self.default = {}
+
+
 @comfytype(io_type="PHOTOMAKER")
 class Photomaker(ComfyTypeIO):
     Type = Any
@@ -2403,6 +2458,8 @@ __all__ = [
     "Load3DModelInfo",
     "Load3D",
     "Load3DAnimation",
+    "Compositor",
+    "Layers",
     "Photomaker",
     "Point",
     "FaceAnalysis",

comfy_api_nodes/apis/bytedance.py

@@ -35,6 +35,23 @@ class Seedream4TaskCreationRequest(BaseModel):
     optimize_prompt_options: Seedream5OptimizePromptOptions | None = None
 
 
+class Seedream5LayerOptimizePromptOptions(BaseModel):
+    mode: Literal["standard", "fast"] = Field(...)
+
+
+class Seedream5LayerSeparationRequest(BaseModel):
+    model: str = Field(...)
+    prompt: str | None = Field(None)
+    image: str = Field(..., description="Single image URL")
+    size: str = Field("auto")
+    seed: int = Field(..., ge=0, le=2147483647)
+    response_format: str = Field("url")
+    output_format: str = Field("png")
+    layer_decomposition: bool = Field(True)
+    watermark: bool = Field(False)
+    optimize_prompt_options: Seedream5LayerOptimizePromptOptions | None = Field(None)
+
+
 class ImageTaskCreationResponse(BaseModel):
     model: str = Field(...)
     created: int = Field(..., description="Unix timestamp (in seconds) indicating time when the request was created.")
@@ -95,9 +112,10 @@ class Seedance2TaskCreationRequest(BaseModel):
     generate_audio: bool | None = Field(None)
     resolution: str | None = Field(None)
     ratio: str | None = Field(None)
-    duration: int | None = Field(None, ge=4, le=15)
+    duration: int | None = Field(None)
     seed: int | None = Field(None, ge=0, le=2147483647)
     watermark: bool | None = Field(None)
+    output_format: str | None = Field(None)
 
 
 class TaskCreationResponse(BaseModel):
@@ -186,6 +204,10 @@ SEEDANCE2_PRICE_PER_1K_TOKENS = {
     ("dreamina-seedance-2-0-mini", True, "480p"): 0.0021,
     ("dreamina-seedance-2-0-mini", False, "720p"): 0.0035,
     ("dreamina-seedance-2-0-mini", True, "720p"): 0.0021,
+    ("dreamina-seedance-2-5-260628", False, "480p"): 0.0107,
+    ("dreamina-seedance-2-5-260628", True, "480p"): 0.0064,
+    ("dreamina-seedance-2-5-260628", False, "720p"): 0.0107,
+    ("dreamina-seedance-2-5-260628", True, "720p"): 0.0064,
 }
 
 
@@ -304,8 +326,31 @@ SEEDANCE2_REF_VIDEO_PIXEL_LIMITS = {
         "480p": {"min": 409_600, "max": 927_408},
         "720p": {"min": 409_600, "max": 927_408},
     },
+    "dreamina-seedance-2-5-260628": {
+        "480p": {"min": 409_600, "max": 8_295_044},
+        "720p": {"min": 409_600, "max": 8_295_044},
+    },
 }
 
+SEEDANCE2_REFERENCE_LIMITS_DEFAULT = {
+    "max_images": 9,
+    "max_videos": 3,
+    "max_audios": 3,
+    "max_total_seconds": 15.1,
+}
+SEEDANCE2_REFERENCE_LIMITS = {
+    "dreamina-seedance-2-5-260628": {
+        "max_images": 30,
+        "max_videos": 10,
+        "max_audios": 10,
+        "max_total_seconds": 30.1,
+    },
+}
+
+
+def seedance2_reference_limits(model_id: str) -> dict:
+    return SEEDANCE2_REFERENCE_LIMITS.get(model_id, SEEDANCE2_REFERENCE_LIMITS_DEFAULT)
+
 # The time in this dictionary are given for 10 seconds duration.
 VIDEO_TASKS_EXECUTION_TIME = {
     "seedance-1-0-lite-t2v-250428": {

comfy_api_nodes/nodes_gemini.py

@@ -76,8 +76,8 @@ GEMINI_IMAGE_2_PRICE_BADGE = IO.PriceBadge(
       $m := widgets.model;
       $r := widgets.resolution;
       $isFlash := $contains($m, "nano banana 2");
-      $flashPrices := {"1k": 0.0696, "2k": 0.1014, "4k": 0.154};
-      $proPrices := {"1k": 0.134, "2k": 0.134, "4k": 0.24};
+      $flashPrices := {"1k": 0.0835, "2k": 0.1217, "4k": 0.1848};
+      $proPrices := {"1k": 0.1608, "2k": 0.1608, "4k": 0.288};
       $prices := $isFlash ? $flashPrices : $proPrices;
       {"type":"usd","usd": $lookup($prices, $r), "format":{"suffix":"/Image","approximate":true}}
     )
@@ -1464,10 +1464,10 @@ class GeminiNanoBanana2V2(IO.ComfyNode):
                 expr="""
                 (
                   $contains(widgets.model, "lite")
-                    ? {"type":"usd","usd": 0.034, "format":{"suffix":"/Image","approximate":true}}
+                    ? {"type":"usd","usd": 0.0408, "format":{"suffix":"/Image","approximate":true}}
                     : (
                         $r := $lookup(widgets, "model.resolution");
-                        $prices := {"1k": 0.0696, "2k": 0.1014, "4k": 0.154};
+                        $prices := {"1k": 0.0835, "2k": 0.1217, "4k": 0.1848};
                         {"type":"usd","usd": $lookup($prices, $r), "format":{"suffix":"/Image","approximate":true}}
                       )
                 )

comfy_api_nodes/nodes_openai.py

@@ -494,9 +494,9 @@ class OpenAIGPTImage1(IO.ComfyNode):
                       "high":   [0.133, 0.22]
                     },
                     "gpt-image-2": {
-                      "low":    [0.0048, 0.019],
-                      "medium": [0.041, 0.168],
-                      "high":   [0.165, 0.67]
+                      "low":    [0.0058, 0.0228],
+                      "medium": [0.0492, 0.2016],
+                      "high":   [0.198, 0.804]
                     }
                   };
                   $range := $lookup($lookup($ranges, widgets.model), widgets.quality);
@@ -792,9 +792,9 @@ class OpenAIGPTImageNodeV2(IO.ComfyNode):
                       "high":   [0.133, 0.22]
                     },
                     "gpt-image-2": {
-                      "low":    [0.0048, 0.019],
-                      "medium": [0.041, 0.168],
-                      "high":   [0.165, 0.67]
+                      "low":    [0.0058, 0.0228],
+                      "medium": [0.0492, 0.2016],
+                      "high":   [0.198, 0.804]
                     }
                   };
                   $range := $lookup($lookup($ranges, widgets.model), $lookup(widgets, "model.quality"));

comfy_execution/jobs.py

@@ -197,6 +197,7 @@ def normalize_queue_item(item: tuple, status: str) -> dict:
         'priority': priority,
         'create_time': create_time,
         'outputs_count': 0,
+        'previewable_outputs_count': 0,
         'workflow_id': workflow_id,
     })
 
@@ -215,6 +216,7 @@ def normalize_history_item(prompt_id: str, history_item: dict, include_outputs:
 
     outputs = history_item.get('outputs', {})
     outputs_count, preview_output = get_outputs_summary(outputs)
+    previewable_outputs_count = count_previewable_outputs(outputs)
 
     execution_error = None
     execution_start_time = None
@@ -251,6 +253,7 @@ def normalize_history_item(prompt_id: str, history_item: dict, include_outputs:
         'execution_end_time': execution_end_time,
         'execution_error': execution_error,
         'outputs_count': outputs_count,
+        'previewable_outputs_count': previewable_outputs_count,
         'preview_output': preview_output,
         'workflow_id': workflow_id,
     })
@@ -345,6 +348,33 @@ def get_outputs_summary(outputs: dict) -> tuple[int, Optional[dict]]:
     return count, preview_output or fallback_preview or text_file_fallback or text_fallback
 
 
+def count_previewable_outputs(outputs: dict) -> int:
+    """
+    Count only outputs that would actually render in the expanded asset view,
+    i.e. items is_previewable() accepts (image/video/audio/3D/text). Kept
+    separate from get_outputs_summary()'s outputs_count, which counts every
+    output item regardless of media type, so a job with a non-previewable
+    saved file alongside real media (e.g. SaveLatent's .latent output next to
+    a SaveImage output) doesn't inflate the Media Assets badge beyond what
+    the expanded view shows.
+    """
+    count = 0
+    for node_outputs in outputs.values():
+        if not isinstance(node_outputs, dict):
+            continue
+        for media_type, items in node_outputs.items():
+            if media_type == 'animated' or not isinstance(items, list):
+                continue
+            for item in items:
+                if not isinstance(item, dict):
+                    item = normalize_output_item(item)
+                    if item is None:
+                        continue
+                if is_previewable(media_type, item):
+                    count += 1
+    return count
+
+
 def apply_sorting(jobs: list[dict], sort_by: str, sort_order: str) -> list[dict]:
     """Sort jobs list by specified field and order."""
     reverse = (sort_order == 'desc')

comfy_extras/compositor_blend.py

@@ -0,0 +1,331 @@
+import math
+from typing import NamedTuple, Optional, Union
+
+import numpy as np
+
+EPSILON = 1e-6
+
+LUM_R = 0.2224884
+LUM_G = 0.71690369
+LUM_B = 0.06060791
+
+ArrayLike = Union[np.ndarray, float]
+
+
+def srgb_to_linear(c: ArrayLike) -> np.ndarray:
+    c = np.asarray(c, dtype=np.float32)
+    high = ((np.maximum(c, 0.0) + 0.055) / 1.055) ** 2.4
+    return np.where(c <= 0.04045, c / 12.92, high).astype(np.float32)
+
+
+def linear_to_srgb(c: ArrayLike) -> np.ndarray:
+    c = np.asarray(c, dtype=np.float32)
+    high = 1.055 * np.maximum(c, 0.0) ** (1.0 / 2.4) - 0.055
+    return np.where(c <= 0.0031308, 12.92 * c, high).astype(np.float32)
+
+
+def luminance(rgb: np.ndarray) -> np.ndarray:
+    return rgb[..., 0] * LUM_R + rgb[..., 1] * LUM_G + rgb[..., 2] * LUM_B
+
+
+def safe_div(a: ArrayLike, b: ArrayLike) -> np.ndarray:
+    a, b = np.broadcast_arrays(
+        np.asarray(a, dtype=np.float32), np.asarray(b, dtype=np.float32)
+    )
+    out = np.zeros(b.shape, dtype=np.float32)
+    np.divide(a, b, out=out, where=np.abs(b) >= EPSILON)
+    return out
+
+
+CHANNEL_BLEND = {
+    "normal": lambda i, l: l,
+    "multiply": lambda i, l: i * l,
+    "screen": lambda i, l: 1 - (1 - i) * (1 - l),
+    "overlay": lambda i, l: np.where(i < 0.5, 2 * i * l, 1 - 2 * (1 - l) * (1 - i)),
+    "darken": lambda i, l: np.minimum(i, l),
+    "lighten": lambda i, l: np.maximum(i, l),
+    "color-dodge": lambda i, l: np.where(
+        i <= 0,
+        0.0,
+        np.where(1 - l <= EPSILON, 1.0, np.minimum(safe_div(i, 1 - l), 1.0)),
+    ),
+    "color-burn": lambda i, l: np.where(
+        i >= 1,
+        1.0,
+        np.where(l <= EPSILON, 0.0, 1 - np.minimum(safe_div(1 - i, l), 1.0)),
+    ),
+    "hard-light": lambda i, l: np.where(
+        l > 0.5,
+        np.minimum(1 - (1 - i) * (1 - (l - 0.5) * 2), 1),
+        np.minimum(i * (l * 2), 1),
+    ),
+    "soft-light": lambda i, l: (1 - i) * (i * l) + i * (1 - (1 - i) * (1 - l)),
+    "difference": lambda i, l: np.abs(i - l),
+    "exclusion": lambda i, l: 0.5 - 2 * (i - 0.5) * (l - 0.5),
+    "linear-dodge": lambda i, l: i + l,
+    "linear-burn": lambda i, l: i + l - 1,
+    "vivid-light": lambda i, l: np.where(
+        l <= 0.5,
+        np.where(
+            i >= 1,
+            1.0,
+            np.where(
+                2 * l <= EPSILON,
+                0.0,
+                np.maximum(1 - safe_div(1 - i, 2 * l), 0.0),
+            ),
+        ),
+        np.where(
+            i <= 0,
+            0.0,
+            np.where(
+                2 * (1 - l) <= EPSILON,
+                1.0,
+                np.minimum(safe_div(i, 2 * (1 - l)), 1.0),
+            ),
+        ),
+    ),
+    "pin-light": lambda i, l: np.where(
+        l > 0.5, np.maximum(i, 2 * (l - 0.5)), np.minimum(i, 2 * l)
+    ),
+    "linear-light": lambda i, l: i + 2 * l - 1,
+    "hard-mix": lambda i, l: np.where(i + l < 1, 0.0, 1.0),
+    "subtract": lambda i, l: np.maximum(i - l, 0),
+    "divide": lambda i, l: np.clip(i / np.maximum(l, EPSILON), 0, 1),
+    "grain-extract": lambda i, l: i - l + 0.5,
+    "grain-merge": lambda i, l: i + l - 0.5,
+}
+
+
+def _blend_hue(i: np.ndarray, l: np.ndarray) -> np.ndarray:
+    src_min = l.min(axis=-1)
+    src_max = l.max(axis=-1)
+    src_delta = src_max - src_min
+    achromatic = src_delta <= EPSILON
+    dest_max = i.max(axis=-1)
+    dest_delta = dest_max - i.min(axis=-1)
+    dest_s = np.where(dest_max != 0, dest_delta / np.where(dest_max != 0, dest_max, 1), 0)
+    ratio = np.where(
+        achromatic, 0, dest_s * dest_max / np.where(achromatic, 1, src_delta)
+    )
+    offset = dest_max - src_max * ratio
+    return np.where(achromatic[..., None], i, l * ratio[..., None] + offset[..., None])
+
+
+def _blend_saturation(i: np.ndarray, l: np.ndarray) -> np.ndarray:
+    dest_max = i.max(axis=-1)
+    dest_delta = dest_max - i.min(axis=-1)
+    flat = dest_delta <= EPSILON
+    src_max = l.max(axis=-1)
+    src_delta = src_max - l.min(axis=-1)
+    src_s = np.where(src_max != 0, src_delta / np.where(src_max != 0, src_max, 1), 0)
+    ratio = np.where(flat, 0, src_s * dest_max / np.where(flat, 1, dest_delta))
+    offset = (1 - ratio) * dest_max
+    return np.where(
+        flat[..., None],
+        np.broadcast_to(dest_max[..., None], i.shape),
+        i * ratio[..., None] + offset[..., None],
+    )
+
+
+def _blend_color(i: np.ndarray, l: np.ndarray) -> np.ndarray:
+    dest_l = (i.min(axis=-1) + i.max(axis=-1)) / 2
+    src_l = (l.min(axis=-1) + l.max(axis=-1)) / 2
+    gray = (np.abs(src_l) <= EPSILON) | (np.abs(1 - src_l) <= EPSILON)
+    dest_high = dest_l > 0.5
+    src_high = src_l > 0.5
+    dl = np.minimum(dest_l, 1 - dest_l)
+    sl = np.minimum(src_l, 1 - src_l)
+    ratio = dl / np.where(gray, 1, sl)
+    offset = np.where(dest_high, 1 - 2 * dl, 0) + np.where(src_high, 2 * dl - ratio, 0)
+    return np.where(
+        gray[..., None],
+        np.broadcast_to(dest_l[..., None], i.shape),
+        l * ratio[..., None] + offset[..., None],
+    )
+
+
+def _blend_luminosity(i: np.ndarray, l: np.ndarray) -> np.ndarray:
+    # Scale the backdrop so it carries the layer's luminance. Where the backdrop
+    # has no luminance to scale there is no hue or saturation to preserve either,
+    # so the result is a neutral grey at the layer's luminance - which is also the
+    # analytic limit of i * lum(l)/lum(i) as a grey backdrop approaches black.
+    # Guarding the numerator here instead (returning black) makes a luminosity
+    # layer disappear over dark backdrops; see tests-unit/comfy_extras_test/
+    # compositor_blend_golden.json.
+    lum_i = luminance(i)
+    lum_l = luminance(l)
+    degenerate = lum_i <= EPSILON
+    ratio = np.where(degenerate, 0.0, lum_l / np.where(degenerate, 1.0, lum_i))
+    return np.where(
+        degenerate[..., None],
+        np.broadcast_to(lum_l[..., None], i.shape),
+        i * ratio[..., None],
+    )
+
+
+HSL_BLEND = {
+    "hue": _blend_hue,
+    "saturation": _blend_saturation,
+    "color": _blend_color,
+    "luminosity": _blend_luminosity,
+}
+
+
+def blend_pixel(blend: str, in_rgb: np.ndarray, layer_rgb: np.ndarray) -> np.ndarray:
+    in_rgb = np.asarray(in_rgb, dtype=np.float32)
+    layer_rgb = np.asarray(layer_rgb, dtype=np.float32)
+    hsl = HSL_BLEND.get(blend)
+    if hsl is not None:
+        return np.asarray(hsl(in_rgb, layer_rgb), dtype=np.float32)
+    fn = CHANNEL_BLEND.get(blend, CHANNEL_BLEND["normal"])
+    return np.asarray(fn(in_rgb, layer_rgb), dtype=np.float32)
+
+
+def _composite_union(in_c, layer, comp, cov):
+    in_a = in_c[..., 3]
+    layer_a = layer[..., 3] * cov
+    new_a = layer_a + (1 - layer_a) * in_a
+    ratio = np.where(new_a != 0, layer_a / np.where(new_a != 0, new_a, 1), 0)
+    blended = (
+        ratio[..., None]
+        * (in_a[..., None] * (comp - layer[..., :3]) + layer[..., :3] - in_c[..., :3])
+        + in_c[..., :3]
+    )
+    keep = (layer_a == 0) | (new_a == 0)
+    rgb = np.where(
+        keep[..., None],
+        in_c[..., :3],
+        np.where((in_a == 0)[..., None], layer[..., :3], blended),
+    )
+    return np.concatenate([rgb, new_a[..., None]], axis=-1)
+
+
+def _composite_clip_to_backdrop(in_c, layer, comp, cov):
+    in_a = in_c[..., 3]
+    layer_a = layer[..., 3] * cov
+    mixed = comp * layer_a[..., None] + in_c[..., :3] * (1 - layer_a[..., None])
+    keep = (in_a == 0) | (layer_a == 0)
+    rgb = np.where(keep[..., None], in_c[..., :3], mixed)
+    return np.concatenate([rgb, in_a[..., None]], axis=-1)
+
+
+def _composite_clip_to_layer(in_c, layer, comp, cov):
+    in_a = in_c[..., 3]
+    layer_a = layer[..., 3] * cov
+    mixed = comp * in_a[..., None] + layer[..., :3] * (1 - in_a[..., None])
+    rgb = np.where(
+        (layer_a == 0)[..., None],
+        in_c[..., :3],
+        np.where((in_a == 0)[..., None], layer[..., :3], mixed),
+    )
+    return np.concatenate([rgb, layer_a[..., None]], axis=-1)
+
+
+def _composite_intersection(in_c, layer, comp, cov):
+    new_a = in_c[..., 3] * layer[..., 3] * cov
+    rgb = np.where((new_a == 0)[..., None], in_c[..., :3], comp)
+    return np.concatenate([rgb, new_a[..., None]], axis=-1)
+
+
+_COMPOSITE = {
+    "union": _composite_union,
+    "clip-to-backdrop": _composite_clip_to_backdrop,
+    "clip-to-layer": _composite_clip_to_layer,
+    "intersection": _composite_intersection,
+}
+
+
+def run_composite(mode: str, in_c, layer, comp, cov) -> np.ndarray:
+    fn = _COMPOSITE.get(mode, _composite_union)
+    return fn(in_c, layer, comp, cov)
+
+
+def _to_space(rgb: np.ndarray, space: str) -> np.ndarray:
+    return rgb if space == "linear" else linear_to_srgb(rgb)
+
+
+def _from_space(rgb: np.ndarray, space: str) -> np.ndarray:
+    return rgb if space == "linear" else srgb_to_linear(rgb)
+
+
+class EffectiveMode(NamedTuple):
+    blend: str
+    blend_space: str
+    composite: str
+
+
+_LAYER_MODES = {
+    "normal": ("linear", "union"),
+    "multiply": ("linear", "clip-to-backdrop"),
+    "screen": ("perceptual", "clip-to-backdrop"),
+    "overlay": ("perceptual", "clip-to-backdrop"),
+    "darken": ("linear", "clip-to-backdrop"),
+    "lighten": ("linear", "clip-to-backdrop"),
+    "color-dodge": ("perceptual", "clip-to-backdrop"),
+    "color-burn": ("perceptual", "clip-to-backdrop"),
+    "hard-light": ("perceptual", "clip-to-backdrop"),
+    "soft-light": ("perceptual", "clip-to-backdrop"),
+    "difference": ("perceptual", "clip-to-backdrop"),
+    "exclusion": ("perceptual", "clip-to-backdrop"),
+    "linear-dodge": ("linear", "clip-to-backdrop"),
+    "linear-burn": ("perceptual", "clip-to-backdrop"),
+    "vivid-light": ("perceptual", "clip-to-backdrop"),
+    "pin-light": ("perceptual", "clip-to-backdrop"),
+    "linear-light": ("perceptual", "clip-to-backdrop"),
+    "hard-mix": ("perceptual", "clip-to-backdrop"),
+    "subtract": ("linear", "clip-to-backdrop"),
+    "divide": ("linear", "clip-to-backdrop"),
+    "grain-extract": ("perceptual", "clip-to-backdrop"),
+    "grain-merge": ("perceptual", "clip-to-backdrop"),
+    "hue": ("perceptual", "clip-to-backdrop"),
+    "saturation": ("perceptual", "clip-to-backdrop"),
+    "color": ("perceptual", "clip-to-backdrop"),
+    "luminosity": ("linear", "clip-to-backdrop"),
+}
+
+
+def resolve_mode(blend: str = "normal") -> EffectiveMode:
+    blend_space, composite = _LAYER_MODES.get(blend, _LAYER_MODES["normal"])
+    return EffectiveMode(
+        blend=blend,
+        blend_space=blend_space,
+        composite=composite,
+    )
+
+
+def blend_composite(
+    mode: EffectiveMode,
+    backdrop: np.ndarray,
+    layer: np.ndarray,
+    opacity: float,
+    mask: Optional[ArrayLike] = None,
+) -> np.ndarray:
+    backdrop = np.asarray(backdrop, dtype=np.float32)
+    layer = np.asarray(layer, dtype=np.float32)
+    cov = opacity * (1.0 if mask is None else mask)
+
+    in_b = _to_space(backdrop[..., :3], mode.blend_space)
+    layer_b = _to_space(layer[..., :3], mode.blend_space)
+    comp = _from_space(blend_pixel(mode.blend, in_b, layer_b), mode.blend_space)
+
+    return run_composite(mode.composite, backdrop, layer, comp, cov)
+
+
+def placed_bounds(
+    x: float, y: float, w: float, h: float, rotation: float
+) -> tuple[int, int, int, int]:
+    cx = x + w / 2
+    cy = y + h / 2
+    cos = math.cos(rotation)
+    sin = math.sin(rotation)
+    hw = w / 2
+    hh = h / 2
+    corners = ((-hw, -hh), (hw, -hh), (hw, hh), (-hw, hh))
+    xs = [cx + dx * cos - dy * sin for dx, dy in corners]
+    ys = [cy + dx * sin + dy * cos for dx, dy in corners]
+    bx = math.floor(min(xs))
+    by = math.floor(min(ys))
+    bw = max(1, math.ceil(max(xs)) - bx)
+    bh = max(1, math.ceil(max(ys)) - by)
+    return bx, by, bw, bh

comfy_extras/nodes_compositor.py

@@ -0,0 +1,855 @@
+import hashlib
+import json
+import math
+
+import numpy as np
+import torch
+from PIL import Image
+
+from comfy_api.latest import ComfyExtension, io, UI
+from comfy_extras.compositor_blend import (
+    _LAYER_MODES,
+    blend_composite,
+    linear_to_srgb,
+    placed_bounds,
+    resolve_mode,
+    srgb_to_linear,
+)
+from comfy_extras.color_util import hex_to_rgb
+from comfy_extras.nodes_bounding_boxes import boxes_from_input
+from nodes import MAX_RESOLUTION
+from typing_extensions import override
+
+
+MAX_LAYERS = 50
+
+
+def document_items(doc) -> list[dict]:
+    if not isinstance(doc, dict):
+        return []
+    version = doc.get("version")
+    if version is not None and version != 1:
+        raise ValueError(f"LAYERS document version {version!r} is not supported")
+    items = []
+    for item in doc.get("layers") or []:
+        if not isinstance(item, dict):
+            continue
+        item_type = item.get("type", "raster")
+        if item_type != "raster":
+            raise ValueError(f"LAYERS item type {item_type!r} is not supported yet")
+        if not isinstance(item.get("image"), torch.Tensor):
+            continue
+        blend = item.get("blend_mode")
+        if blend is not None and blend not in _LAYER_MODES:
+            raise ValueError(f"LAYERS item blend_mode {blend!r} is not a known blend mode")
+        items.append(item)
+    return sorted(items, key=lambda item: _int(item.get("z_index"), 0))
+
+
+def document_canvas(doc) -> tuple[int, int] | None:
+    if not isinstance(doc, dict):
+        return None
+    canvas = doc.get("canvas")
+    if not isinstance(canvas, (tuple, list)) or len(canvas) != 2:
+        return None
+    w, h = _int(canvas[0], 0), _int(canvas[1], 0)
+    return (w, h) if w > 0 and h > 0 else None
+
+
+def _int(value, default: int) -> int:
+    return int(value) if isinstance(value, (int, float)) and not isinstance(value, bool) else default
+
+
+def _bbox_list(bboxes, canvas_width: int, canvas_height: int) -> list[dict]:
+    if bboxes is None:
+        return []
+    if isinstance(bboxes, str):
+        text = bboxes.strip()
+        if not text:
+            return []
+        try:
+            bboxes = json.loads(text)
+        except (json.JSONDecodeError, ValueError) as exc:
+            raise ValueError(f"bboxes string input is not valid JSON: {exc}") from exc
+    probe = bboxes if isinstance(bboxes, list) else [bboxes]
+    if probe and isinstance(probe[0], list):
+        probe = probe[0]
+    has_elements = any(
+        isinstance(box, dict) and isinstance(box.get("bbox"), (list, tuple))
+        for box in probe
+    )
+    if has_elements and (canvas_width <= 0 or canvas_height <= 0):
+        raise ValueError(
+            "normalized element boxes need canvas_width and canvas_height to resolve to pixels"
+        )
+    return boxes_from_input(bboxes, canvas_width, canvas_height)
+
+
+def _item_mask_frame(mask, index: int) -> torch.Tensor | None:
+    if not isinstance(mask, torch.Tensor):
+        return None
+    if mask.shape[0] == 1:
+        return mask[:1]
+    if index < mask.shape[0]:
+        return mask[index : index + 1]
+    return None
+
+
+def expand_item_frames(items: list[dict]) -> list[dict]:
+    frames = []
+    for item in items:
+        image = item["image"]
+        for index in range(image.shape[0]):
+            width = _int(item.get("w"), 0)
+            height = _int(item.get("h"), 0)
+            rotation = item.get("rotation")
+            frames.append({
+                "tensor": image[index : index + 1],
+                "mask": _item_mask_frame(item.get("mask"), index),
+                "name": item.get("name") if isinstance(item.get("name"), str) else None,
+                "x": _int(item.get("x"), 0),
+                "y": _int(item.get("y"), 0),
+                "w": width if width > 0 else int(image.shape[2]),
+                "h": height if height > 0 else int(image.shape[1]),
+                "rotation": float(rotation)
+                if isinstance(rotation, (int, float)) and not isinstance(rotation, bool)
+                else 0.0,
+                "opacity": item.get("opacity", 1.0),
+                "blend": item.get("blend_mode", "normal"),
+                "visible": item.get("visible", True),
+                "flip_h": bool(item.get("flip_h", False)),
+                "flip_v": bool(item.get("flip_v", False)),
+            })
+    if len(frames) > MAX_LAYERS:
+        raise ValueError(
+            f"Compositor supports at most {MAX_LAYERS} layers, got {len(frames)}"
+        )
+    return frames
+
+
+def frame_alpha(
+    tensor: torch.Tensor, mask: torch.Tensor | None
+) -> torch.Tensor | None:
+    alpha = tensor[:1, :, :, 3] if tensor.shape[-1] == 4 else None
+    if mask is None:
+        return alpha
+    h, w = tensor.shape[1], tensor.shape[2]
+    m = mask[:1].to(device=tensor.device, dtype=torch.float32)
+    if m.shape[1] != h or m.shape[2] != w:
+        m = torch.nn.functional.interpolate(
+            m.unsqueeze(1), size=(h, w), mode="bilinear"
+        ).squeeze(1)
+    inv = torch.clamp(1.0 - m, 0.0, 1.0)
+    return inv if alpha is None else alpha * inv
+
+
+def layer_preview_tensor(
+    tensor: torch.Tensor, alpha: torch.Tensor | None
+) -> torch.Tensor:
+    rgb = tensor[:1, :, :, :3]
+    if alpha is None:
+        return rgb
+    return torch.cat([rgb, alpha.unsqueeze(-1)], dim=-1)
+
+
+def canvas_extent(frames: list[dict]) -> tuple[int, int]:
+    right = 1
+    bottom = 1
+    for frame in frames:
+        bx, by, bw, bh = placed_bounds(
+            frame["x"], frame["y"], frame["w"], frame["h"], frame["rotation"]
+        )
+        right = max(right, bx + bw)
+        bottom = max(bottom, by + bh)
+    return (right, bottom)
+
+
+def input_fingerprints(
+    frames: list[dict], alphas: list[torch.Tensor | None]
+) -> list[str]:
+    fingerprints = []
+    for frame, alpha in zip(frames, alphas):
+        tensor = frame["tensor"]
+        rgb = tensor[0, :, :, :3].detach().cpu().numpy()
+        rgb8 = np.clip(np.rint(rgb * 255.0), 0, 255).astype(np.uint8)
+        digest = hashlib.sha256()
+        digest.update(repr(tuple(tensor.shape)).encode())
+        digest.update(rgb8.tobytes())
+        if alpha is not None:
+            alpha8 = np.clip(
+                np.rint(alpha[0].detach().cpu().numpy() * 255.0), 0, 255
+            ).astype(np.uint8)
+            digest.update(alpha8.tobytes())
+        digest.update(
+            repr((
+                frame["x"],
+                frame["y"],
+                frame["w"],
+                frame["h"],
+                frame["rotation"],
+                frame["opacity"],
+                frame["blend"],
+                bool(frame["visible"]),
+                frame["flip_h"],
+                frame["flip_v"],
+            )).encode()
+        )
+        fingerprints.append(digest.hexdigest()[:16])
+    return fingerprints
+
+
+def state_from_items(frames: list[dict], canvas: tuple[int, int]) -> dict:
+    layers = []
+    for frame in frames:
+        layers.append({
+            "name": frame["name"],
+            "visible": bool(frame["visible"]),
+            "opacity": frame["opacity"],
+            "blend": frame["blend"],
+            "flipH": frame["flip_h"],
+            "flipV": frame["flip_v"],
+            "transform": {
+                "x": frame["x"],
+                "y": frame["y"],
+                "w": frame["w"],
+                "h": frame["h"],
+                "rotation": frame["rotation"],
+            },
+        })
+    return {
+        "canvas": canvas,
+        "layers": layers,
+        "inputs": None,
+        "background": {"color": "#ffffff", "opacity": 1.0, "visible": False},
+    }
+
+
+def layer_ui_entries(frames: list[dict]) -> list:
+    entries = []
+    for frame in frames:
+        entries.append({
+            "x": frame["x"],
+            "y": frame["y"],
+            "width": int(frame["w"]),
+            "height": int(frame["h"]),
+            "rotation": frame["rotation"],
+            "name": frame["name"],
+            "visible": bool(frame["visible"]),
+            "opacity": frame["opacity"] if isinstance(frame["opacity"], (int, float)) else 1.0,
+            "blend": frame["blend"] if isinstance(frame["blend"], str) else "normal",
+            "flipH": frame["flip_h"],
+            "flipV": frame["flip_v"],
+        })
+    return entries
+
+
+_HEX_DIGITS = set("0123456789abcdef")
+
+
+def _normalize_hex_color(value) -> str:
+    if isinstance(value, str):
+        text = value.strip().lower()
+        if text.startswith("#"):
+            digits = text[1:]
+            if len(digits) == 3 and set(digits) <= _HEX_DIGITS:
+                digits = "".join(ch * 2 for ch in digits)
+            if len(digits) == 6 and set(digits) <= _HEX_DIGITS:
+                return "#" + digits
+    return "#ffffff"
+
+
+def _parse_background(entry) -> dict | None:
+    if not isinstance(entry, dict):
+        return None
+    return {
+        "color": _normalize_hex_color(entry.get("color")),
+        "opacity": min(max(_number(entry, "opacity", 1.0), 0.0), 1.0),
+        "visible": bool(entry.get("visible", True)),
+    }
+
+
+def _parse_order(value, layer_count: int) -> list[int] | None:
+    if not isinstance(value, list) or not value:
+        return None
+    if not all(
+        isinstance(item, int) and not isinstance(item, bool) for item in value
+    ):
+        return None
+    if sorted(value) != list(range(layer_count)):
+        return None
+    return value
+
+
+def layer_state_provided(raw) -> bool:
+    if isinstance(raw, dict):
+        return bool(raw)
+    if isinstance(raw, str):
+        return raw not in ("", "{}")
+    return False
+
+
+def parse_layer_state(raw) -> dict | None:
+    if isinstance(raw, str):
+        if not raw.strip():
+            return None
+        try:
+            raw = json.loads(raw)
+        except (json.JSONDecodeError, ValueError):
+            return None
+    if not isinstance(raw, dict):
+        return None
+    state = raw
+    version = state.get("version")
+    if version is not None and version != 1:
+        return None
+    canvas = state.get("canvas")
+    layers = state.get("layers")
+    if not isinstance(canvas, dict) or not isinstance(layers, list) or not layers:
+        return None
+    try:
+        w = int(round(float(canvas.get("w"))))
+        h = int(round(float(canvas.get("h"))))
+    except (TypeError, ValueError, OverflowError):
+        return None
+    if w <= 0 or h <= 0:
+        return None
+    inputs = state.get("inputs")
+    if (
+        not isinstance(inputs, list)
+        or len(inputs) != len(layers)
+        or not all(isinstance(entry, str) for entry in inputs)
+    ):
+        inputs = None
+    return {
+        "canvas": (w, h),
+        "layers": layers,
+        "inputs": inputs,
+        "background": _parse_background(state.get("background")),
+        "order": _parse_order(state.get("order"), len(layers)),
+    }
+
+
+def _number(source: dict, key: str, default: float) -> float:
+    value = source.get(key, default)
+    if not isinstance(value, (int, float)) or not math.isfinite(value):
+        return float(default)
+    return float(value)
+
+
+def _clamped_size(value: float, natural: int) -> float:
+    return float(natural) if value <= 0 else min(value, float(MAX_RESOLUTION))
+
+
+def _layer_params(entry, natural_w: int, natural_h: int) -> dict:
+    if not isinstance(entry, dict):
+        entry = {}
+    transform = entry.get("transform")
+    if not isinstance(transform, dict):
+        transform = {}
+    blend = entry.get("blend")
+    return {
+        "visible": bool(entry.get("visible", True)),
+        # The layer state is untrusted input: it round-trips through the saved
+        # workflow and can be posted directly to /prompt. An out-of-range opacity
+        # would otherwise reach blend_composite as a raw coverage multiplier and
+        # produce negative or greater-than-white RGB. _parse_background already
+        # clamps the same field.
+        "opacity": min(max(_number(entry, "opacity", 1.0), 0.0), 1.0),
+        "blend": blend if isinstance(blend, str) else "normal",
+        "x": min(max(_number(transform, "x", 0.0), -MAX_RESOLUTION), MAX_RESOLUTION),
+        "y": min(max(_number(transform, "y", 0.0), -MAX_RESOLUTION), MAX_RESOLUTION),
+        "w": _clamped_size(_number(transform, "w", natural_w), natural_w),
+        "h": _clamped_size(_number(transform, "h", natural_h), natural_h),
+        "rotation": _number(transform, "rotation", 0.0),
+        "flip_h": bool(entry.get("flipH", False)),
+        "flip_v": bool(entry.get("flipV", False)),
+    }
+
+
+def _prepare_layer_bitmap(
+    tensor: torch.Tensor, params: dict, alpha: torch.Tensor | None
+) -> Image.Image:
+    frame = tensor[0, :, :, :3].detach().cpu().numpy()
+    rgb8 = np.clip(np.rint(frame * 255.0), 0, 255).astype(np.uint8)
+    if alpha is None:
+        img = Image.fromarray(rgb8, "RGB").convert("RGBA")
+    else:
+        alpha8 = np.clip(
+            np.rint(alpha[0].detach().cpu().numpy() * 255.0), 0, 255
+        ).astype(np.uint8)
+        img = Image.fromarray(np.dstack([rgb8, alpha8]), "RGBA")
+    if params["flip_h"]:
+        img = img.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
+    if params["flip_v"]:
+        img = img.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
+    target = (max(1, round(params["w"])), max(1, round(params["h"])))
+    if img.size != target:
+        img = img.resize(target, Image.Resampling.LANCZOS)
+    if params["rotation"] != 0:
+        img = img.rotate(
+            -math.degrees(params["rotation"]),
+            expand=True,
+            resample=Image.Resampling.BICUBIC,
+            fillcolor=(0, 0, 0, 0),
+        )
+    return img
+
+
+def _place_in_bounds(img: Image.Image, bw: int, bh: int) -> np.ndarray:
+    arr = np.asarray(img, dtype=np.float32) / 255.0
+    rgba = np.concatenate([srgb_to_linear(arr[..., :3]), arr[..., 3:4]], axis=-1)
+    aw, ah = img.size
+    buf = np.zeros((bh, bw, 4), dtype=np.float32)
+    ox = (bw - aw) // 2
+    oy = (bh - ah) // 2
+    dx0, dy0 = max(ox, 0), max(oy, 0)
+    dx1, dy1 = min(ox + aw, bw), min(oy + ah, bh)
+    if dx0 < dx1 and dy0 < dy1:
+        buf[dy0:dy1, dx0:dx1] = rgba[dy0 - oy : dy1 - oy, dx0 - ox : dx1 - ox]
+    return buf
+
+
+def _fill_background(canvas: np.ndarray, background: dict) -> np.ndarray:
+    layer = np.empty(canvas.shape, dtype=np.float32)
+    layer[..., :3] = srgb_to_linear(
+        np.array(hex_to_rgb(background["color"]), dtype=np.float32) / 255.0
+    )
+    layer[..., 3] = 1.0
+    return blend_composite(
+        resolve_mode("normal"), canvas, layer, background["opacity"]
+    )
+
+
+def composite_from_state(
+    tensors: list[torch.Tensor],
+    state: dict,
+    alphas: list[torch.Tensor | None],
+) -> torch.Tensor:
+    cw, ch = state["canvas"]
+    if cw > MAX_RESOLUTION or ch > MAX_RESOLUTION:
+        raise ValueError(
+            f"Compositor canvas {cw}x{ch} exceeds the maximum supported size of "
+            f"{MAX_RESOLUTION}x{MAX_RESOLUTION}"
+        )
+    canvas = np.zeros((ch, cw, 4), dtype=np.float32)
+    background = state.get("background")
+    if background is not None and background["visible"] and background["opacity"] > 0:
+        canvas = _fill_background(canvas, background)
+    layers = state["layers"]
+    order = state.get("order") or range(len(tensors))
+    for index in order:
+        if index < 0 or index >= len(tensors):
+            continue
+        tensor = tensors[index]
+        entry = layers[index] if index < len(layers) else None
+        params = _layer_params(entry, tensor.shape[2], tensor.shape[1])
+        if not params["visible"]:
+            continue
+        img = _prepare_layer_bitmap(
+            tensor, params, alphas[index] if index < len(alphas) else None
+        )
+        bx, by, bw, bh = placed_bounds(
+            params["x"], params["y"], params["w"], params["h"], params["rotation"]
+        )
+        buf = _place_in_bounds(img, bw, bh)
+        x0, y0 = max(bx, 0), max(by, 0)
+        x1, y1 = min(bx + bw, cw), min(by + bh, ch)
+        if x0 >= x1 or y0 >= y1:
+            continue
+        region = buf[y0 - by : y1 - by, x0 - bx : x1 - bx]
+        mode = resolve_mode(params["blend"])
+        canvas[y0:y1, x0:x1] = blend_composite(
+            mode, canvas[y0:y1, x0:x1], region, params["opacity"]
+        )
+    rgb = linear_to_srgb(np.clip(canvas[..., :3], 0.0, 1.0))
+    alpha = np.clip(canvas[..., 3:4], 0.0, 1.0)
+    rgba = np.concatenate([rgb, alpha], axis=-1)
+    return torch.from_numpy(rgba.astype(np.float32)).unsqueeze(0)
+
+
+OPAQUE_EPSILON = 1e-3
+
+
+def composite_outputs(out: torch.Tensor) -> tuple[torch.Tensor, torch.Tensor]:
+    if out.shape[-1] != 4:
+        return out, torch.zeros(out.shape[:3], dtype=torch.float32)
+    alpha = out[..., 3]
+    if bool((alpha >= 1.0 - OPAQUE_EPSILON).all()):
+        return out[..., :3], torch.zeros_like(alpha)
+    return out, torch.clamp(1.0 - alpha, 0.0, 1.0)
+
+
+class ImageCompositor(io.ComfyNode):
+    @classmethod
+    def define_schema(cls):
+        return io.Schema(
+            node_id="ImageCompositor",
+            display_name="Create Layered Image",
+            category="image",
+            search_aliases=["compositor", "composite", "layer", "layers", "layer editor", "psd"],
+            is_experimental=True,
+            # both flags on purpose: terminal compositor graphs must execute (the
+            # editor needs a run to open), and cache hits must replay the layer UI
+            is_output_node=True,
+            has_intermediate_output=True,
+            inputs=[
+                io.Layers.Input(
+                    "layers",
+                    tooltip="Layer stack to composite; build it with Add Layer. Items are stacked by z_index, batch frames inside an item expand to consecutive layers, and item placement, opacity, and blend mode define the initial composition. Without an explicit document canvas the size is a best-effort maximum extent of the placed layers. A saved composition that matches the current inputs takes priority.",
+                ),
+                io.Compositor.Input(
+                    "compositor",
+                    tooltip="Layered composition saved by the compositor editor.",
+                ),
+            ],
+            outputs=[
+                io.Image.Output(
+                    tooltip="Composited image. Carries an alpha channel when the composite has transparent areas (e.g. hidden background), otherwise plain RGB."
+                ),
+                io.Mask.Output(
+                    tooltip="Transparency of the composite (1 = fully transparent). All zeros when the composite is opaque."
+                ),
+            ],
+        )
+
+    @classmethod
+    def execute(cls, layers: io.Layers.Type, compositor: io.Compositor.Type = None) -> io.NodeOutput:
+        frames = expand_item_frames(document_items(layers))
+        tensors = [frame["tensor"] for frame in frames]
+        alphas = [frame_alpha(frame["tensor"], frame["mask"]) for frame in frames]
+
+        layer_refs = []
+        for tensor, alpha in zip(tensors, alphas):
+            layer_refs.extend(
+                UI.PreviewImage(layer_preview_tensor(tensor, alpha), cls=cls).values
+            )
+
+        fp = input_fingerprints(frames, alphas)
+        raw_state = compositor
+        state = parse_layer_state(raw_state)
+        replay = bool(state is not None and tensors and state["inputs"] == fp)
+        if replay:
+            out = composite_from_state(tensors, state, alphas)
+        elif tensors:
+            canvas = document_canvas(layers) or canvas_extent(frames)
+            out = composite_from_state(
+                tensors, state_from_items(frames, canvas), alphas
+            )
+        else:
+            out = torch.zeros((1, 64, 64, 3), dtype=torch.float32)
+        state_stale = layer_state_provided(raw_state) and not replay
+        out, mask = composite_outputs(out)
+
+        ui_dict = UI.PreviewImage(out, cls=cls).as_dict()
+        ui_dict["compositor_layers"] = layer_refs
+        ui_dict["compositor_inputs"] = fp
+        ui_dict["compositor_bboxes"] = layer_ui_entries(frames)
+        if state_stale:
+            ui_dict["compositor_state_stale"] = [True]
+        return io.NodeOutput(out, mask, ui=ui_dict)
+
+
+class AddLayer(io.ComfyNode):
+    @classmethod
+    def define_schema(cls):
+        return io.Schema(
+            node_id="AddLayer",
+            display_name="Add Layer",
+            category="image",
+            is_experimental=True,
+            inputs=[
+                io.Layers.Input(
+                    "layers",
+                    optional=True,
+                    tooltip="Layer stack to append to. Leave unconnected to start a new stack.",
+                ),
+                io.Image.Input(
+                    "image",
+                    tooltip="Layer content at its native size. A batch expands to consecutive layers.",
+                ),
+                io.Mask.Input(
+                    "mask",
+                    optional=True,
+                    tooltip="Transparency mask for this layer. Masked areas (value 1) become transparent, multiplying with any alpha channel the image already carries.",
+                ),
+                io.String.Input(
+                    "name",
+                    optional=True,
+                    default="",
+                    tooltip="Layer name shown in the compositor editor.",
+                ),
+                io.Int.Input(
+                    "x",
+                    optional=True,
+                    default=0,
+                    min=-MAX_RESOLUTION,
+                    max=MAX_RESOLUTION,
+                    tooltip="Initial horizontal placement on the canvas.",
+                ),
+                io.Int.Input(
+                    "y",
+                    optional=True,
+                    default=0,
+                    min=-MAX_RESOLUTION,
+                    max=MAX_RESOLUTION,
+                    tooltip="Initial vertical placement on the canvas.",
+                ),
+                io.Float.Input(
+                    "opacity",
+                    optional=True,
+                    default=1.0,
+                    min=0.0,
+                    max=1.0,
+                    step=0.01,
+                    tooltip="Initial layer opacity.",
+                ),
+                io.Combo.Input(
+                    "blend_mode",
+                    options=list(_LAYER_MODES),
+                    default="normal",
+                    optional=True,
+                    tooltip="Initial blend mode, applied against the layers below. On the bottom layer over the default transparent background, non-normal modes produce transparency.",
+                ),
+                io.Float.Input(
+                    "rotation",
+                    optional=True,
+                    default=0.0,
+                    min=-360.0,
+                    max=360.0,
+                    step=1.0,
+                    tooltip="Initial rotation in degrees, clockwise.",
+                ),
+                io.Int.Input(
+                    "width",
+                    optional=True,
+                    default=0,
+                    min=0,
+                    max=MAX_RESOLUTION,
+                    tooltip="Initial display width. 0 keeps the image's native width.",
+                ),
+                io.Int.Input(
+                    "height",
+                    optional=True,
+                    default=0,
+                    min=0,
+                    max=MAX_RESOLUTION,
+                    tooltip="Initial display height. 0 keeps the image's native height.",
+                ),
+                io.Int.Input(
+                    "z_index",
+                    optional=True,
+                    default=0,
+                    min=-1000,
+                    max=1000,
+                    tooltip="Stacking override. Layers are stable-sorted by z_index; equal values keep their list order.",
+                ),
+                io.Boolean.Input(
+                    "flip_h",
+                    optional=True,
+                    default=False,
+                    tooltip="Flip the layer horizontally.",
+                ),
+                io.Boolean.Input(
+                    "flip_v",
+                    optional=True,
+                    default=False,
+                    tooltip="Flip the layer vertically.",
+                ),
+            ],
+            outputs=[
+                io.Layers.Output(tooltip="The layer stack with this layer appended."),
+            ],
+        )
+
+    @classmethod
+    def execute(cls, image: io.Image.Type, layers: io.Layers.Type = None, mask: io.Mask.Type = None, name: str = "", x: int = 0, y: int = 0, opacity: float = 1.0, blend_mode: str = "normal", rotation: float = 0.0, width: int = 0, height: int = 0, z_index: int = 0, flip_h: bool = False, flip_v: bool = False) -> io.NodeOutput:
+        item: dict = {
+            "image": image,
+            "type": "raster",
+            "x": int(x),
+            "y": int(y),
+            "z_index": int(z_index),
+        }
+        if mask is not None:
+            item["mask"] = mask
+        if name:
+            item["name"] = name
+        if opacity != 1.0:
+            item["opacity"] = float(opacity)
+        if blend_mode != "normal":
+            item["blend_mode"] = blend_mode
+        if rotation != 0.0:
+            item["rotation"] = math.radians(rotation)
+        if width > 0:
+            item["w"] = int(width)
+        if height > 0:
+            item["h"] = int(height)
+        if flip_h:
+            item["flip_h"] = True
+        if flip_v:
+            item["flip_v"] = True
+        previous = layers if isinstance(layers, dict) else None
+        document: dict = {
+            "version": 1,
+            "layers": [*(previous.get("layers") or []), item] if previous else [item],
+        }
+        previous_canvas = document_canvas(previous)
+        if previous_canvas:
+            document["canvas"] = previous_canvas
+        return io.NodeOutput(document)
+
+
+class LayersFromBoundingBoxes(io.ComfyNode):
+    @classmethod
+    def define_schema(cls):
+        return io.Schema(
+            node_id="LayersFromBoundingBoxes",
+            display_name="Layers From Bounding Boxes",
+            category="image",
+            is_experimental=True,
+            description=(
+                "Turn an image batch plus its bounding boxes into a layer stack, one layer per frame, "
+                "each placed by its own box. Use this when a node emits layers as a batch - a batch "
+                "carries a single placement for every frame, so the individual positions are otherwise lost."
+            ),
+            inputs=[
+                io.Image.Input(
+                    "image",
+                    tooltip="Image batch; each frame becomes one layer.",
+                ),
+                io.MultiType.Input(
+                    "bboxes",
+                    [io.BoundingBox, io.Array, io.String],
+                    tooltip=(
+                        "Placement boxes, index-aligned with the image batch. Accepts bounding boxes "
+                        "(x, y, width, height), normalized elements (with a 'bbox' - these need "
+                        "canvas_width/canvas_height to resolve to pixels), or a JSON string of either. "
+                        "Frames without a matching box are placed at the origin. A box's width/height "
+                        "scales the layer to fit it. metadata.name (or desc) and metadata.z_index are "
+                        "used when present, and metadata.content_rect (frame-relative) crops the frame "
+                        "to its real content."
+                    ),
+                ),
+                io.Mask.Input(
+                    "mask",
+                    optional=True,
+                    tooltip=(
+                        "Per-frame transparency, index-aligned with the image batch "
+                        "(1 = transparent, LoadImage convention)."
+                    ),
+                ),
+                io.Layers.Input(
+                    "layers",
+                    optional=True,
+                    tooltip="Layer stack to append to. Leave unconnected to start a new stack.",
+                ),
+                io.Boolean.Input(
+                    "crop_to_content",
+                    default=True,
+                    optional=True,
+                    tooltip=(
+                        "Crop each frame to metadata.content_rect where present and place the content "
+                        "at the box position plus the rect offset. Leave on for batches whose frames "
+                        "are padded - it keeps only the real content at its true spot."
+                    ),
+                ),
+                io.Int.Input(
+                    "canvas_width",
+                    default=0,
+                    min=0,
+                    max=MAX_RESOLUTION,
+                    optional=True,
+                    tooltip="Document canvas width. 0 derives it from the placed layers.",
+                ),
+                io.Int.Input(
+                    "canvas_height",
+                    default=0,
+                    min=0,
+                    max=MAX_RESOLUTION,
+                    optional=True,
+                    tooltip="Document canvas height. 0 derives it from the placed layers.",
+                ),
+            ],
+            outputs=[
+                io.Layers.Output(tooltip="The layer stack, ready for Create Layered Image."),
+            ],
+        )
+
+    @classmethod
+    def execute(
+        cls,
+        image: io.Image.Type,
+        bboxes: io.MultiType.Type,
+        mask: io.Mask.Type = None,
+        layers: io.Layers.Type = None,
+        crop_to_content: bool = True,
+        canvas_width: int = 0,
+        canvas_height: int = 0,
+    ) -> io.NodeOutput:
+        boxes = _bbox_list(bboxes, canvas_width, canvas_height)
+        previous = layers if isinstance(layers, dict) else None
+        items: list[dict] = list((previous.get("layers") or []) if previous else [])
+        base_z = max((_int(i.get("z_index"), 0) for i in items), default=-1) + 1
+
+        for index in range(image.shape[0]):
+            box = boxes[index] if index < len(boxes) else {}
+            meta = box.get("metadata") if isinstance(box.get("metadata"), dict) else {}
+            frame = image[index : index + 1]
+            frame_mask = _item_mask_frame(mask, index)
+
+            x, y = _int(box.get("x"), 0), _int(box.get("y"), 0)
+            box_w, box_h = _int(box.get("width"), 0), _int(box.get("height"), 0)
+            cropped = False
+            rect = meta.get("content_rect")
+            if crop_to_content and isinstance(rect, (list, tuple)) and len(rect) == 4:
+                left, top, cw, ch = (_int(v, 0) for v in rect)
+                left = min(max(left, 0), int(frame.shape[2]))
+                top = min(max(top, 0), int(frame.shape[1]))
+                cw = min(max(cw, 0), int(frame.shape[2]) - left)
+                ch = min(max(ch, 0), int(frame.shape[1]) - top)
+                if cw > 0 and ch > 0:
+                    frame = frame[:, top : top + ch, left : left + cw]
+                    if frame_mask is not None:
+                        frame_mask = frame_mask[:, top : top + ch, left : left + cw]
+                    x, y = x + left, y + top
+                    cropped = True
+
+            item: dict = {
+                "image": frame,
+                "type": "raster",
+                "x": x,
+                "y": y,
+                "z_index": _int(meta.get("z_index"), base_z + index),
+            }
+            if not cropped:
+                if box_w > 0:
+                    item["w"] = box_w
+                if box_h > 0:
+                    item["h"] = box_h
+            if frame_mask is not None:
+                item["mask"] = frame_mask
+            name = meta.get("name")
+            if not (isinstance(name, str) and name):
+                name = meta.get("desc")
+            if isinstance(name, str) and name:
+                item["name"] = name
+            items.append(item)
+
+        document: dict = {"version": 1, "layers": items}
+        if canvas_width > 0 and canvas_height > 0:
+            document["canvas"] = (canvas_width, canvas_height)
+        else:
+            inherited = document_canvas(previous)
+            if inherited:
+                document["canvas"] = inherited
+        return io.NodeOutput(document)
+
+
+class CompositorExtension(ComfyExtension):
+    @override
+    async def get_node_list(self) -> list[type[io.ComfyNode]]:
+        return [ImageCompositor, AddLayer, LayersFromBoundingBoxes]
+
+
+async def comfy_entrypoint() -> CompositorExtension:
+    return CompositorExtension()

comfy_extras/nodes_custom_sampler.py

@@ -591,7 +591,7 @@ class SamplerER_SDE(io.ComfyNode):
             inputs=[
                 io.Combo.Input("solver_type", options=["ER-SDE", "Reverse-time SDE", "ODE"]),
                 io.Int.Input("max_stage", default=3, min=1, max=3, advanced=True),
-                io.Float.Input("eta", default=1.0, min=0.0, max=100.0, step=0.01, round=False, tooltip="Stochastic strength of reverse-time SDE.\nWhen eta=0, it reduces to deterministic ODE. This setting doesn't apply to ER-SDE solver type.", advanced=True),
+                io.Float.Input("eta", default=1.0, min=0.0, max=10.0, step=0.01, round=False, tooltip="Stochastic strength of SDEs.\nWhen eta=0, they reduce to deterministic ODE.\nLarge eta may cause invalid outputs. If this occurs, try decreasing this value.", advanced=True),
                 io.Float.Input("s_noise", default=1.0, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
             ],
             outputs=[io.Sampler.Output()]
@@ -599,21 +599,35 @@ class SamplerER_SDE(io.ComfyNode):
 
     @classmethod
     def execute(cls, solver_type, max_stage, eta, s_noise) -> io.NodeOutput:
-        if solver_type == "ODE" or (solver_type == "Reverse-time SDE" and eta == 0):
-            eta = 0
-            s_noise = 0
+        # Extend existing noise scalers phi(x) with eta-controlled noise scalers:
+        #   psi(x) = x**(1-eta) * phi(x)**eta
+        # where eta is constant and directly scales the h^2(t) contribution.
 
-        def reverse_time_sde_noise_scaler(x):
+        def er_sde_noise_scaler(x: torch.Tensor) -> torch.Tensor:
+            return x * ((x ** 0.3).exp() + 10.0) ** eta
+
+        def reverse_time_sde_noise_scaler(x: torch.Tensor) -> torch.Tensor:
             return x ** (eta + 1)
 
-        if solver_type == "ER-SDE":
-            # Use the default one in sample_er_sde()
-            noise_scaler = None
-        else:
-            noise_scaler = reverse_time_sde_noise_scaler
+        def ode_noise_scaler(x: torch.Tensor) -> torch.Tensor:
+            return x
+
+        solver_scalers = {
+            "ER-SDE": er_sde_noise_scaler,
+            "Reverse-time SDE": reverse_time_sde_noise_scaler,
+            "ODE": ode_noise_scaler,
+        }
+
+        if solver_type == "ODE" or eta == 0:
+            s_noise = 0.0
+            solver_type = "ODE"
+        noise_scaler = solver_scalers[solver_type]
 
         sampler_name = "er_sde"
-        sampler = comfy.samplers.ksampler(sampler_name, {"s_noise": s_noise, "noise_scaler": noise_scaler, "max_stage": max_stage})
+        sampler = comfy.samplers.ksampler(
+            sampler_name,
+            {"s_noise": s_noise, "noise_scaler": noise_scaler, "max_stage": max_stage},
+        )
         return io.NodeOutput(sampler)
 
     get_sampler = execute

comfy_extras/nodes_upscale_model.py

@@ -72,7 +72,7 @@ class ImageUpscaleWithModel(io.ComfyNode):
 
         memory_required = (512 * 512 * 3) * image.element_size() * max(upscale_model.scale, 1.0) * 384.0 #The 384.0 is an estimate of how much some of these models take, TODO: make it more accurate
         memory_required += image.nelement() * image.element_size()
-        model_management.load_models_gpu([upscale_model.patcher], memory_required=memory_required)
+        model_management.load_models_gpu([upscale_model.patcher], memory_required=memory_required, force_full_load=True)
 
         in_img = image.movedim(-1,-3).to(device)
 

comfyui_version.py

@@ -1,3 +1,3 @@
 # This file is automatically generated by the build process when version is
 # updated in pyproject.toml.
-__version__ = "0.30.0"
+__version__ = "0.31.0"

nodes.py

@@ -2501,6 +2501,7 @@ async def init_builtin_extra_nodes():
         "nodes_math.py",
         "nodes_number_convert.py",
         "nodes_painter.py",
+        "nodes_compositor.py",
         "nodes_curve.py",
         "nodes_bg_removal.py",
         "nodes_rtdetr.py",

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ComfyUI"
-version = "0.30.0"
+version = "0.31.0"
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.10"

requirements.txt

@@ -1,5 +1,5 @@
-comfyui-frontend-package==1.48.6
-comfyui-workflow-templates==0.11.31
+comfyui-frontend-package==1.48.7
+comfyui-workflow-templates==0.11.37
 comfyui-embedded-docs==0.5.9
 torch
 torchsde
@@ -22,7 +22,7 @@ alembic
 SQLAlchemy>=2.0.0
 filelock
 av>=16.0.0
-comfy-kitchen==0.2.26
+comfy-kitchen==0.2.28
 comfy-aimdo==0.4.13
 requests
 simpleeval>=1.0.0

tests-unit/comfy_extras_test/compositor_blend_fixture_gen.py

@@ -0,0 +1,111 @@
+"""Regenerate ``compositor_blend_golden.json``.
+
+The golden file is the *shared contract* for layer blending. Every
+implementation of these 26 modes must reproduce it within ``tolerance``:
+
+* ``comfy_extras/compositor_blend.py`` - numpy, server-side compositing
+* ``layerBlend.frag`` - GLSL, the live preview in the layer editor
+* any future CPU reference in the frontend
+
+Run from the repository root::
+
+    python tests-unit/comfy_extras_test/compositor_blend_fixture_gen.py
+
+and review the diff. A change to this file is a change to user-visible
+blending behaviour in every implementation, so it should never be
+regenerated just to make a test pass.
+"""
+
+import json
+import os
+import sys
+
+import numpy as np
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
+
+from comfy_extras.compositor_blend import CHANNEL_BLEND, HSL_BLEND, blend_pixel  # noqa: E402
+
+GOLDEN_PATH = os.path.join(os.path.dirname(__file__), "compositor_blend_golden.json")
+
+# Scalar grid for the per-channel modes: both endpoints, the midpoint, values
+# just inside each endpoint, and values inside the 1e-6 epsilon guards.
+SCALARS = [0.0, 1e-7, 0.001, 0.25, 0.5, 0.75, 0.999, 1.0 - 1e-7, 1.0]
+
+# Colour pairs for the HSL modes, which read all three channels at once.
+COLORS = [
+    [0.0, 0.0, 0.0],
+    [1.0, 1.0, 1.0],
+    [0.5, 0.5, 0.5],
+    [1.0, 0.0, 0.0],
+    [0.0, 0.0, 1.0],
+    [0.2, 0.4, 0.6],
+    [0.9, 0.1, 0.35],
+    [1e-7, 1e-7, 1e-7],
+    [1e-7, 0.0, 0.0],
+    [0.05, 0.05, 0.05],
+]
+
+
+def _round(value) -> float:
+    return round(float(value), 7)
+
+
+def build() -> dict:
+    channel = {}
+    for mode in CHANNEL_BLEND:
+        rows = []
+        for i in SCALARS:
+            for l in SCALARS:
+                out = blend_pixel(mode, np.float32([i] * 3), np.float32([l] * 3))
+                rows.append([_round(i), _round(l), _round(np.asarray(out).reshape(3)[0])])
+        channel[mode] = rows
+    hsl = {}
+    for mode in HSL_BLEND:
+        rows = []
+        for i in COLORS:
+            for l in COLORS:
+                out = blend_pixel(mode, np.float32(i), np.float32(l))
+                rows.append([
+                    [_round(v) for v in i],
+                    [_round(v) for v in l],
+                    [_round(v) for v in np.asarray(out).reshape(3)],
+                ])
+        hsl[mode] = rows
+    return {
+        "_comment": (
+            "Golden blend values shared by comfy_extras/compositor_blend.py and "
+            "layerBlend.frag. Inputs are unpremultiplied colours already in the "
+            "blend space; outputs are unclamped (the compositor clamps once, at "
+            "the end). 'channel' rows are [i, l, out] applied per channel; 'hsl' "
+            "rows are [rgb_backdrop, rgb_layer, rgb_out]. Regenerate with "
+            "tests-unit/comfy_extras_test/compositor_blend_fixture_gen.py."
+        ),
+        "tolerance": 1e-4,
+        "channel": channel,
+        "hsl": hsl,
+    }
+
+
+def dumps(data: dict) -> str:
+    """One row per line, so a behaviour change shows up as a readable diff."""
+    lines = ["{", f'  "_comment": {json.dumps(data["_comment"])},', f'  "tolerance": {data["tolerance"]},']
+    for section in ("channel", "hsl"):
+        lines.append(f'  "{section}": {{')
+        modes = sorted(data[section])
+        for m_index, mode in enumerate(modes):
+            lines.append(f'    "{mode}": [')
+            rows = data[section][mode]
+            for r_index, row in enumerate(rows):
+                comma = "" if r_index == len(rows) - 1 else ","
+                lines.append(f"      {json.dumps(row)}{comma}")
+            lines.append("    ]" + ("" if m_index == len(modes) - 1 else ","))
+        lines.append("  }" + ("," if section == "channel" else ""))
+    lines.append("}")
+    return "\n".join(lines) + "\n"
+
+
+if __name__ == "__main__":
+    with open(GOLDEN_PATH, "w") as handle:
+        handle.write(dumps(build()))
+    sys.stdout.write(f"wrote {GOLDEN_PATH}\n")

tests-unit/comfy_extras_test/compositor_blend_test.py

@@ -0,0 +1,157 @@
+"""Blend-mode parity tests for the compositor.
+
+The compositor blends in three places: this numpy module (server-side), the
+``layerBlend.frag`` GLSL shader (the live preview the user actually sees), and
+anything the frontend adds later. They have diverged before, silently, and the
+divergences only show up as "the render does not look like the preview".
+
+``compositor_blend_golden.json`` is the shared contract. This file pins the
+numpy implementation to it and additionally spells out, by hand, the boundary
+rules that the epsilon guards exist to enforce - so a future refactor of
+``safe_div`` cannot quietly re-introduce the old behaviour by regenerating the
+fixture.
+"""
+
+import json
+import os
+
+import numpy as np
+import pytest
+
+from comfy_extras.compositor_blend import (
+    CHANNEL_BLEND,
+    HSL_BLEND,
+    EffectiveMode,
+    blend_composite,
+    blend_pixel,
+    resolve_mode,
+)
+
+GOLDEN_PATH = os.path.join(os.path.dirname(__file__), "compositor_blend_golden.json")
+
+with open(GOLDEN_PATH) as _handle:
+    GOLDEN = json.load(_handle)
+
+TOLERANCE = GOLDEN["tolerance"]
+
+
+def _blend(mode: str, i, l) -> np.ndarray:
+    return np.asarray(
+        blend_pixel(mode, np.float32(i), np.float32(l)), dtype=np.float64
+    ).reshape(3)
+
+
+def test_golden_covers_every_mode():
+    """A new blend mode must arrive with golden values, not silently."""
+    assert set(GOLDEN["channel"]) == set(CHANNEL_BLEND)
+    assert set(GOLDEN["hsl"]) == set(HSL_BLEND)
+
+
+@pytest.mark.parametrize("mode", sorted(CHANNEL_BLEND))
+def test_channel_modes_match_golden(mode):
+    for i, l, expected in GOLDEN["channel"][mode]:
+        actual = _blend(mode, [i] * 3, [l] * 3)
+        assert actual == pytest.approx([expected] * 3, abs=TOLERANCE), (
+            f"{mode}(i={i}, l={l}) -> {actual.tolist()}, golden {expected}"
+        )
+
+
+@pytest.mark.parametrize("mode", sorted(HSL_BLEND))
+def test_hsl_modes_match_golden(mode):
+    for i, l, expected in GOLDEN["hsl"][mode]:
+        actual = _blend(mode, i, l)
+        assert actual == pytest.approx(expected, abs=TOLERANCE), (
+            f"{mode}(i={i}, l={l}) -> {actual.tolist()}, golden {expected}"
+        )
+
+
+@pytest.mark.parametrize("mode", sorted(set(CHANNEL_BLEND) | set(HSL_BLEND)))
+def test_no_mode_produces_nan_or_inf(mode):
+    edges = [0.0, 1e-7, 1e-6, 0.5, 1.0 - 1e-7, 1.0]
+    for i in edges:
+        for l in edges:
+            out = _blend(mode, [i, 0.0, 1.0], [l, 1.0, 0.0])
+            assert np.all(np.isfinite(out)), f"{mode}(i={i}, l={l}) -> {out.tolist()}"
+
+
+class TestBoundaryRules:
+    """The rules the epsilon guards encode, written out independently of the fixture."""
+
+    def test_color_dodge_full_layer_is_white_not_black(self):
+        # Guarding the denominator returns 0 here, which reads as "the dodge
+        # layer turned the image black" - the exact inversion CodeRabbit flagged.
+        assert _blend("color-dodge", [0.5] * 3, [1.0] * 3) == pytest.approx([1.0] * 3)
+
+    def test_color_dodge_black_backdrop_stays_black(self):
+        assert _blend("color-dodge", [0.0] * 3, [1.0] * 3) == pytest.approx([0.0] * 3)
+
+    def test_color_dodge_is_clamped(self):
+        assert _blend("color-dodge", [0.6] * 3, [0.9] * 3) == pytest.approx([1.0] * 3)
+
+    def test_color_burn_empty_layer_is_black_not_white(self):
+        assert _blend("color-burn", [0.5] * 3, [0.0] * 3) == pytest.approx([0.0] * 3)
+
+    def test_color_burn_white_backdrop_stays_white(self):
+        assert _blend("color-burn", [1.0] * 3, [0.0] * 3) == pytest.approx([1.0] * 3)
+
+    def test_vivid_light_boundaries(self):
+        assert _blend("vivid-light", [0.5] * 3, [0.0] * 3) == pytest.approx([0.0] * 3)
+        assert _blend("vivid-light", [0.5] * 3, [1.0] * 3) == pytest.approx([1.0] * 3)
+        assert _blend("vivid-light", [1.0] * 3, [0.0] * 3) == pytest.approx([1.0] * 3)
+        assert _blend("vivid-light", [0.0] * 3, [1.0] * 3) == pytest.approx([0.0] * 3)
+
+    def test_divide_by_zero_is_clamped_to_one(self):
+        assert _blend("divide", [0.5] * 3, [0.0] * 3) == pytest.approx([1.0] * 3)
+
+    def test_luminosity_over_black_takes_the_layer_luminance(self):
+        # A luminosity layer over a black backdrop must not vanish. There is no
+        # hue or saturation in the backdrop to preserve, so the result is a
+        # neutral grey at the layer's luminance.
+        assert _blend("luminosity", [0.0] * 3, [1.0] * 3) == pytest.approx([1.0] * 3)
+        assert _blend("luminosity", [0.0] * 3, [0.5] * 3) == pytest.approx([0.5] * 3)
+
+    def test_luminosity_is_continuous_approaching_black(self):
+        near = _blend("luminosity", [1e-7] * 3, [1.0] * 3)
+        at = _blend("luminosity", [0.0] * 3, [1.0] * 3)
+        assert near == pytest.approx(at, abs=TOLERANCE)
+
+    def test_luminosity_preserves_backdrop_chroma(self):
+        out = _blend("luminosity", [0.4, 0.2, 0.1], [0.5] * 3)
+        assert out[0] > out[1] > out[2]
+
+
+class TestCompositeAndModeTable:
+    def test_unknown_blend_mode_falls_back_to_normal(self):
+        unknown = resolve_mode("not-a-mode")
+        assert (unknown.blend_space, unknown.composite) == (
+            resolve_mode("normal").blend_space,
+            resolve_mode("normal").composite,
+        )
+        assert _blend("not-a-mode", [0.1, 0.2, 0.3], [0.4, 0.5, 0.6]) == pytest.approx(
+            _blend("normal", [0.1, 0.2, 0.3], [0.4, 0.5, 0.6])
+        )
+
+    def test_every_blend_mode_has_a_composite_entry(self):
+        for mode in set(CHANNEL_BLEND) | set(HSL_BLEND):
+            resolved = resolve_mode(mode)
+            assert isinstance(resolved, EffectiveMode)
+            assert resolved.blend == mode
+            assert resolved.blend_space in ("linear", "perceptual")
+            assert resolved.composite in (
+                "union",
+                "clip-to-backdrop",
+                "clip-to-layer",
+                "intersection",
+            )
+
+    def test_normal_over_transparent_backdrop_keeps_the_layer(self):
+        backdrop = np.zeros((1, 1, 4), dtype=np.float32)
+        layer = np.float32([[[0.25, 0.5, 0.75, 1.0]]])
+        out = blend_composite(resolve_mode("normal"), backdrop, layer, 1.0)
+        assert out[0, 0].tolist() == pytest.approx([0.25, 0.5, 0.75, 1.0])
+
+    def test_zero_opacity_is_a_no_op(self):
+        backdrop = np.float32([[[0.1, 0.2, 0.3, 1.0]]])
+        layer = np.float32([[[1.0, 1.0, 1.0, 1.0]]])
+        out = blend_composite(resolve_mode("multiply"), backdrop, layer, 0.0)
+        assert out[0, 0].tolist() == pytest.approx([0.1, 0.2, 0.3, 1.0])

tests-unit/comfy_extras_test/compositor_node_test.py

@@ -0,0 +1,72 @@
+"""Regression tests for ImageCompositor's handling of untrusted layer state.
+
+The compositor's `compositor` widget value is persisted into the saved workflow
+and is accepted verbatim on `POST /prompt`, so every field in it is untrusted
+input, not an internal invariant.
+"""
+
+import numpy as np
+import pytest
+import torch
+
+from comfy_extras.nodes_compositor import (
+    _layer_params,
+    composite_from_state,
+    expand_item_frames,
+    state_from_items,
+)
+
+
+def _solid(color, w=4, h=4) -> torch.Tensor:
+    frame = np.zeros((h, w, len(color)), dtype=np.float32)
+    frame[:] = color
+    return torch.from_numpy(frame).unsqueeze(0)
+
+
+class TestLayerOpacity:
+    @pytest.mark.parametrize(
+        ("raw", "expected"),
+        [(-0.5, 0.0), (0.0, 0.0), (0.25, 0.25), (1.0, 1.0), (3.0, 1.0)],
+    )
+    def test_opacity_is_clamped(self, raw, expected):
+        assert _layer_params({"opacity": raw}, 4, 4)["opacity"] == expected
+
+    def test_opacity_defaults_to_opaque(self):
+        assert _layer_params({}, 4, 4)["opacity"] == 1.0
+
+    def test_out_of_range_opacity_does_not_leak_into_the_next_layer(self):
+        # The canvas is only clamped once, after every layer has been composited,
+        # so an out-of-range coverage multiplier on one layer changes the *blend*
+        # of the layer above it. White at opacity 3.0 over black leaves the canvas
+        # at 3.0; the multiply above it then reads 3.0 as its backdrop and the
+        # result is visibly lighter than the same stack at opacity 1.0.
+        def run(opacity):
+            state = {
+                "canvas": (2, 2),
+                "layers": [{"opacity": opacity}, {"opacity": 1.0, "blend": "multiply"}],
+                "inputs": None,
+                "background": {"color": "#000000", "opacity": 1.0, "visible": True},
+                "order": None,
+            }
+            tensors = [_solid([1.0, 1.0, 1.0], 2, 2), _solid([0.5, 0.5, 0.5], 2, 2)]
+            return composite_from_state(tensors, state, [None, None])[0, 0, 0, :3]
+
+        assert run(3.0).tolist() == pytest.approx(run(1.0).tolist(), abs=1e-6)
+
+
+class TestGraphOnlyBackground:
+    def test_default_layout_background_is_hidden(self):
+        # A visible white background here would make every graph-only run emit a
+        # white matte instead of transparency.
+        frames = expand_item_frames([{"image": _solid([1.0, 0.0, 0.0])}])
+        state = state_from_items(frames, (4, 4))
+        assert state["background"]["visible"] is False
+
+    def test_uncovered_canvas_stays_transparent(self):
+        tensors = [_solid([1.0, 0.0, 0.0], w=2, h=2)]
+        frames = expand_item_frames([{"image": tensors[0]}])
+        state = state_from_items(frames, (4, 4))
+        out = composite_from_state(tensors, state, [None])[0]
+        assert out.shape[-1] == 4
+        assert float(out[0, 0, 3]) == pytest.approx(1.0)
+        assert float(out[3, 3, 3]) == pytest.approx(0.0)

tests/execution/test_jobs.py

@@ -10,6 +10,7 @@ from comfy_execution.jobs import (
     normalize_output_item,
     normalize_outputs,
     get_outputs_summary,
+    count_previewable_outputs,
     apply_sorting,
     has_3d_extension,
     validate_job_id,
@@ -361,6 +362,79 @@ class TestGetOutputsSummary:
         assert preview['mediaType'] == 'files'
 
 
+class TestCountPreviewableOutputs:
+    """Unit tests for count_previewable_outputs()
+
+    Kept separate from get_outputs_summary()'s outputs_count: the Media Assets
+    badge should reflect only what the expanded asset view actually renders
+    (previewable outputs), while outputs_count keeps counting every output
+    item for other consumers.
+    """
+
+    def test_empty_outputs(self):
+        assert count_previewable_outputs({}) == 0
+
+    def test_previewable_outputs_all_counted(self):
+        """When every output is previewable, the two counts should match."""
+        outputs = {
+            'node1': {'images': [{'filename': 'a.png', 'type': 'output'}]},
+            'node2': {'images': [{'filename': 'b.png', 'type': 'output'}]},
+        }
+        outputs_count, _ = get_outputs_summary(outputs)
+        assert count_previewable_outputs(outputs) == outputs_count == 2
+
+    def test_save_latent_counted_but_not_previewable(self):
+        """SaveLatent (nodes.py) emits a real saved file under the 'latents'
+        media type: {'latents': [{'filename': '..._00001_.latent',
+        'subfolder': '', 'type': 'output'}]}. It has no previewable media
+        type, format, or extension, so it inflates outputs_count without
+        ever rendering in the expanded asset view."""
+        outputs = {
+            'node1': {
+                'images': [{'filename': 'ComfyUI_00001_.png', 'subfolder': '', 'type': 'output'}]
+            },
+            'node2': {
+                'latents': [{'filename': 'ComfyUI_00001_.latent', 'subfolder': '', 'type': 'output'}]
+            },
+        }
+        outputs_count, _ = get_outputs_summary(outputs)
+        assert outputs_count == 2
+        assert count_previewable_outputs(outputs) == 1
+
+    def test_save_text_file_output_is_previewable_by_extension(self):
+        """SaveText (comfy_extras/nodes_text.py) emits its saved file under a
+        'files' media type via ui.SavedResult: {'files': [{'filename':
+        '..._00001.txt', 'subfolder': ..., 'type': 'output'}]}. The .txt
+        extension makes it previewable even though 'files' itself isn't a
+        previewable media type."""
+        outputs = {
+            'node1': {
+                'files': [{'filename': 'ComfyUI_00001.txt', 'subfolder': '', 'type': 'output'}]
+            }
+        }
+        assert count_previewable_outputs(outputs) == 1
+
+    def test_preview_any_text_tuple_not_counted(self):
+        """PreviewAny (comfy_extras/nodes_preview_any.py) emits only
+        {'text': (value,)} with no saved file. Since the value is a tuple,
+        not a list, it is excluded from both outputs_count and
+        previewable_outputs_count — matching get_outputs_summary()."""
+        outputs = {
+            'node1': {'text': ('some previewed value',)}
+        }
+        outputs_count, _ = get_outputs_summary(outputs)
+        assert outputs_count == 0
+        assert count_previewable_outputs(outputs) == 0
+
+    def test_string_3d_filename_previewable(self):
+        """String 3D filenames (e.g. Preview3D) normalize into a previewable
+        item just like they do for outputs_count."""
+        outputs = {
+            'node1': {'result': ['preview3d_abc123.glb', None]}
+        }
+        assert count_previewable_outputs(outputs) == 1
+
+
 class TestHas3DExtension:
     """Unit tests for has_3d_extension()"""
 
@@ -447,6 +521,7 @@ class TestNormalizeQueueItem:
         assert 'execution_error' not in job
         assert 'preview_output' not in job
         assert job['outputs_count'] == 0
+        assert job['previewable_outputs_count'] == 0
         assert job['workflow_id'] == 'workflow-abc'
 
 
@@ -635,6 +710,54 @@ class TestNormalizeHistoryItem:
             {'filename': 'photo.png', 'type': 'output', 'subfolder': ''},
         ]
 
+    def test_previewable_outputs_count_excludes_non_previewable_outputs(self):
+        """Regression test for the Media Assets badge overcount: a job with an
+        image (SaveImage) and a SaveLatent output should report previewable_
+        outputs_count == 1 while outputs_count == 2, so the frontend badge
+        (once switched to previewable_outputs_count) matches what the
+        expanded asset view actually renders."""
+        history_item = {
+            'prompt': (
+                5,
+                'prompt-mixed',
+                {'nodes': {}},
+                {'create_time': 1234567890},
+                ['node1', 'node2'],
+            ),
+            'status': {'status_str': 'success', 'completed': True, 'messages': []},
+            'outputs': {
+                'node1': {
+                    'images': [{'filename': 'ComfyUI_00001_.png', 'subfolder': '', 'type': 'output'}]
+                },
+                'node2': {
+                    'latents': [{'filename': 'ComfyUI_00001_.latent', 'subfolder': '', 'type': 'output'}]
+                },
+            },
+        }
+        job = normalize_history_item('prompt-mixed', history_item)
+
+        assert job['outputs_count'] == 2
+        assert job['previewable_outputs_count'] == 1
+
+    def test_previewable_outputs_count_zero_pruned_by_prune_dict(self):
+        """A job with no outputs at all should still report both counts as 0,
+        not omit the field (prune_dict only strips None, not 0)."""
+        history_item = {
+            'prompt': (
+                5,
+                'prompt-empty',
+                {'nodes': {}},
+                {'create_time': 1234567890},
+                ['node1'],
+            ),
+            'status': {'status_str': 'success', 'completed': True, 'messages': []},
+            'outputs': {},
+        }
+        job = normalize_history_item('prompt-empty', history_item)
+
+        assert job['outputs_count'] == 0
+        assert job['previewable_outputs_count'] == 0
+
 
 class TestNormalizeOutputItem:
     """Unit tests for normalize_output_item()"""