Catheter-based delivery systems for delivery and retrieval of a leadless pacemaker include features to facilitate improved manipulation of the catheter and improved capture and docking functionality of leadless pacemakers. Such functionality includes mechanisms directed to deflecting and locking a deflectable catheter, maintaining tension on a retrieval feature, protection from anti-rotation, and improved docking cap and drive gear assemblies.