Fix: support latest CliEngine API, fixes implicit command bugs