Refactor cli/command/formatter Upstream-commit: a7c25f954062de230dea0f1816b553992fa1d967 Component: engine