Use standard help handling for the version command

internal/cli/run.go

@@ -71,26 +71,15 @@ func Run(ctx context.Context, args []string, stdout, stderr io.Writer) int {
 }
 
 func runVersion(args []string, stdout, stderr io.Writer) int {
-	if len(args) == 1 && (args[0] == "-h" || args[0] == "--help") {
-		writeVersionUsage(stdout)
-		return 0
-	}
-	for _, arg := range args {
-		if arg == "-h" || arg == "--help" {
-			fmt.Fprintln(stderr, "audita version: help flags cannot be combined with other arguments")
-			fmt.Fprintln(stderr)
-			writeVersionUsage(stderr)
-			return 2
-		}
-	}
 	flags := flag.NewFlagSet("version", flag.ContinueOnError)
 	flags.SetOutput(stderr)
-	flags.Usage = func() { writeVersionUsage(stderr) }
+	flags.Usage = func() {} // Route usage after parsing so help stays on stdout.
 	if err := flags.Parse(args); err != nil {
 		if err == flag.ErrHelp {
 			writeVersionUsage(stdout)
 			return 0
 		}
+		writeVersionUsage(stderr)
 		return 2
 	}
 	if positional := flags.Args(); len(positional) > 0 {

internal/cli/version_test.go

@@ -34,6 +34,8 @@ func TestVersionCommandHelp(t *testing.T) {
 		{name: "help version", args: []string{"help", "version"}, want: "audita version"},
 		{name: "short flag", args: []string{"version", "-h"}, want: "audita version"},
 		{name: "long flag", args: []string{"version", "--help"}, want: "audita version"},
+		{name: "parser help", args: []string{"version", "--h"}, want: "audita version"},
+		{name: "help short circuits", args: []string{"version", "-h", "--help", "extra"}, want: "audita version"},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			var stdout, stderr bytes.Buffer
@@ -54,7 +56,6 @@ func TestVersionCommandRejectsUnexpectedArguments(t *testing.T) {
 	for _, args := range [][]string{
 		{"version", "extra"},
 		{"version", "--unknown"},
-		{"version", "--help", "extra"},
 	} {
 		t.Run(strings.Join(args, " "), func(t *testing.T) {
 			var stdout, stderr bytes.Buffer