Have you tried using light CLIs rather than MCP? I’ve found that CLIs are just easier for Claude, especially if you write them with Claude and during planning instruct it to think about adding guidance to users who get confused.
Our auth, log diving, infra state, etc, is all usable via cli, and it feels pretty good when pointing Claude at it.