terminal: include markers in --collect-only output
#11812
+15
−7
Draft