fix(client/v2): improve resolver and tests (backport #16842)

[mergify]

This is an automatic backport of pull request #16842 done by Mergify.
Cherry-pick of 57ee5a2 has failed:

On branch mergify/bp/release/v0.50.x/pr-16842
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 57ee5a23d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   client/v2/autocli/app.go
	modified:   client/v2/autocli/builder.go
	modified:   client/v2/autocli/common.go
	modified:   client/v2/autocli/flag/register.go
	modified:   client/v2/autocli/msg.go
	modified:   client/v2/autocli/msg_test.go
	modified:   client/v2/autocli/query.go
	modified:   client/v2/autocli/query_test.go
	modified:   client/v2/internal/util/util.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/v2/autocli/common_test.go
	both modified:   client/v2/go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com