Your first idea is the right one. The d4 sets the base amount of class dice each day, and cluster attacks adds more dice on top of that. 👍
