adapt hosting cli extractor to reordering (#1295)

* adapt hosting cli extractor to reordering

* improve code to work with current and future code

* handle it better for fufture hosting cli

* remove typer

Author: adhami3310