chore(cli): prepare cli for programmatic toolkit

chore(cli): prepare cli for programmatic toolkit #4951