This fixes the shell completion by removing the flags removed from the CLI in 0768428 and adding the new options flag.