fix worker and cli

petitminionrequested to merge
fix-cli-and-worker into main

Merge request reports