support new run/runclient split