feat(cli): repeatable surface flags + id-leading-separator fix

feat(cli): repeatable surface flags + id-leading-separator fix #69