Fix: cib: The result is not valid when diffs fail to apply cleanly for CLI tools