My Tacklebox/Tackle projects bundle Virtualfish, which addresses this very elegantly.

More info: https://hackercodex.com/guide/tacklebox-fish-shell/