Fix: Add the CLI handler in the context + dynamic CLI as in mindc

Fix: Add the CLI handler in the context + dynamic CLI as in mindc