I was fine when they mentioned that you would lock your companions in after act 1, and I kind of still am, but after playing I definitely see good reasons to scrap that idea and let us keep them all at our camp. Not only is it quite obvious it'll be easy to drive them away with the wrong dialogue choices, but having those extra companions I can switch out is actually incredibly beneficial. I don't know if it's a story-driven decision to lock you into those companions or what but if it's not too late this is something that should be reconsidered.