This is the most lovely tl;dr- also I think Petra will be more than willing to eventually just set aside a set of rooms for River that she can ninja into whenever she needs. The castle residents are kind of transient, she's cool with that.

(Enfys takes credit, not blame.)