### Description We want to simplify the logic we have around the CLI. ### References _No response_