> The problem is both solutions are inadequate in some cases.

Yes, it is true... the current implementation is looking for the tool name, and no its configuration... I agree to keep it simple and add more complex checking later if we need it.