45b87ce128
Resolved conflicts in cli.py by keeping structured metadata approach over inline text concatenation from PR #149. Our approach uses separate metadata dictionary which is cleaner and more maintainable than parsing embedded strings.