Apply suggestions from code review

Author: mmsqe

CHANGELOG.md

@@ -115,7 +115,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (baseapp) [#19970](https://github.com/cosmos/cosmos-sdk/pull/19970) Fix default config values to use no-op mempool as default.
 * (crypto) [#20027](https://github.com/cosmos/cosmos-sdk/pull/20027) secp256r1 keys now implement gogoproto's customtype interface.
 * (x/bank) [#20028](https://github.com/cosmos/cosmos-sdk/pull/20028) Align query with multi denoms for send-enabled.
-* (cli) [#20033](https://github.com/cosmos/cosmos-sdk/pull/20033) Respect output format from client ctx.
+* (client/v2) [#20033](https://github.com/cosmos/cosmos-sdk/pull/20033) Respect output format from client ctx.
 
 ### API Breaking Changes
 

client/v2/autocli/common.go

@@ -226,11 +226,30 @@ func enhanceCustomCmd(builder *Builder, cmd *cobra.Command, cmdType cmdType, mod
 
 // outOrStdoutFormat formats the output based on the output flag and writes it to the command's output stream.
 func (b *Builder) outOrStdoutFormat(cmd *cobra.Command, out []byte) error {
-	clientCtx, err := client.GetClientTxContext(cmd)
-	if err != nil {
-		return err
+	var clientCtx client.Context
+	if v := cmd.Context().Value(client.ClientContextKey); v != nil {
+		clientCtx = *(v.(*client.Context))
+	} else {
+		clientCtx = client.Context{}
+	}
+
+	flagSet := cmd.Flags()
+	if clientCtx.OutputFormat == "" || flagSet.Changed(flags.FlagOutput) {
+		output, _ := flagSet.GetString(flags.FlagOutput)
+		clientCtx = clientCtx.WithOutputFormat(output)
+	}
+
+	if !clientCtx.IsAux || flagSet.Changed(flags.FlagAux) {
+		isAux, _ := flagSet.GetBool(flags.FlagAux)
+		if isAux {
+			// If the user didn't explicitly set an --output flag, use JSON by default.
+			if clientCtx.OutputFormat == "" || !flagSet.Changed(flags.FlagOutput) {
+				clientCtx = clientCtx.WithOutputFormat(flags.OutputFormatJSON)
+			}
+		}
 	}
 
+	var err error
 	outputType := clientCtx.OutputFormat
 	// if the output type is text, convert the json to yaml
 	// if output type is json or nil, default to json

client/v2/internal/flags/flags.go

@@ -17,6 +17,7 @@ const (
 	// FlagNoProposal is the flag convert a gov proposal command into a normal command.
 	// This is used to allow user of chains with custom authority to not use gov submit proposals for usual proposal commands.
 	FlagNoProposal = "no-proposal"
+	FlagAux        = "aux"
 )
 
 // List of supported output formats