client/v2/CHANGELOG.md (1)

61-61: Consider adding more context to the changelog entry.

While the entry correctly references the issue, it would be more helpful for users to understand the specific problem that was fixed. Consider expanding it to:

-* [cosmos/gaia#3412](https://github.com/cosmos/gaia/issues/3412) Fix duplicate command addition in `autocli`
+* [cosmos/gaia#3412](https://github.com/cosmos/gaia/issues/3412) Fix duplicate command addition in `autocli` where certain module commands appeared multiple times in the CLI help menu

client/v2/autocli/common.go (1)

143-151: LGTM! Consider enhancing error handling consistency.

The additional check for custom commands with names different from their modules effectively prevents duplicate command creation, addressing the core issue. This is a solid fix for the duplicate entries problem reported in issue #3412.

Consider wrapping the error returns in a more descriptive error using fmt.Errorf for consistency with other error handling in the codebase:

 if hasModuleOptions { // check if we need to enhance the existing command
-  if err := enhanceCustomCmd(b, subCmd, cmdType, modOpts); err != nil {
-    return err
-  }
+  if err := enhanceCustomCmd(b, subCmd, cmdType, modOpts); err != nil {
+    return fmt.Errorf("failed to enhance existing custom command %s: %w", custom.Name(), err)
+  }
 }

Configuration used: .coderabbit.yml
Review profile: CHILL

#!/bin/bash
# Description: Check for existing custom commands and their structure

# Look for custom command registrations
echo "Checking for custom command registrations..."
rg -A 5 "AddCommand\(.*custom.*\)" --type go

# Look for module command definitions
echo "Checking for module command definitions..."
rg "type.*Command.*struct" --type go

# Look for potential command name conflicts
echo "Checking for potential command name conflicts..."
rg "Use:.*\".*\"" --type go

#!/bin/bash
# Check for custom command handling and registration patterns
echo "Checking custom command handling..."
rg -B 5 -A 5 "findSubCommand" --type go

echo "Checking command registration patterns..."
rg -B 5 -A 5 "Name\(\)" --type go | grep -A 5 -B 5 "custom"

echo "Checking for potential command conflicts..."
rg -B 3 -A 3 "enhanceCustomCmd" --type go

client/v2/CHANGELOG.md (1)

61-61: Enhance the changelog entry description

While the entry correctly references the issue, consider making it more descriptive to better explain the fix:

-* [cosmos/gaia#3412](https://github.com/cosmos/gaia/issues/3412) Fix duplicate command addition in `autocli`
+* [cosmos/gaia#3412](https://github.com/cosmos/gaia/issues/3412) Fix duplicate command addition in `autocli` by improving command existence checks for non-prefixed module commands

This provides more context about the nature of the fix and aligns with the level of detail in other changelog entries.

Configuration used: .coderabbit.yml
Review profile: CHILL

client/v2/CHANGELOG.md (1)

61-61: Enhance the changelog entry with more details.

The current entry could be more descriptive about the root cause, impact, and solution.

Consider this more detailed entry:

-* [#22576](https://github.com/cosmos/cosmos-sdk/pull/22576) Fix duplicate command addition in `autocli` when custom enhanced command has a different name than module name
+* [#22576](https://github.com/cosmos/cosmos-sdk/pull/22576) Fix duplicate command entries in `autocli` help menu caused by custom enhanced commands having different names than their module names. The fix improves command name checking in `enhanceCommandCommon` to prevent unintended command duplication.

Configuration used: .coderabbit.yml
Review profile: CHILL