Maybe you can consider giving my app a try see if it sorts your issue, and if it doesn't I'm happy to build towards sorting it. The app's paid, but it's $20 one time, no subscription. I'm trying to raise awareness of it and get developers off subscriptions.
https://branchbay.dev/branchshell