post merge + lint

Author: bahrmichael

cmd/src/abc_variables_delete.go

@@ -13,9 +13,9 @@ import (
 )
 
 var abcVariablesDeleteCommand = clicompat.Wrap(&cli.Command{
-	Name:      "delete",
-	Usage:     "Delete variables on a workflow instance",
-	UsageText: "src abc variables delete [options] <workflow-instance-id> [<name> ...]",
+	Name:                      "delete",
+	Usage:                     "Delete variables on a workflow instance",
+	UsageText:                 "src abc variables delete [options] <workflow-instance-id> [<name> ...]",
 	DisableSliceFlagSeparator: true,
 	Description: `
 Delete workflow instance variables

cmd/src/abc_variables_set.go

@@ -25,9 +25,9 @@ const updateABCWorkflowInstanceVariablesMutation = `mutation UpdateAgenticWorkfl
 }`
 
 var abcVariablesSetCommand = clicompat.Wrap(&cli.Command{
-	Name:      "set",
-	UsageText: "src abc variables set [options] <workflow-instance-id> [<name>=<value> ...]",
-	Usage:     "Set variables on a workflow instance",
+	Name:                      "set",
+	UsageText:                 "src abc variables set [options] <workflow-instance-id> [<name>=<value> ...]",
+	Usage:                     "Set variables on a workflow instance",
 	DisableSliceFlagSeparator: true,
 	Description: `
 Set workflow instance variables

internal/clicompat/help.go

@@ -14,25 +14,23 @@ func Wrap(cmd *cli.Command) *cli.Command {
 	if cmd == nil {
 		return nil
 	}
-  
+
 	cmd.OnUsageError = OnUsageError
-	cmd.Action = wrapUsageAction(cmd.Action)
+	cmd.Action = wrapWithHelpOnUsageError(cmd.Action)
 	return cmd
 }
 
-func wrapUsageAction(action cli.ActionFunc) cli.ActionFunc {
+func wrapWithHelpOnUsageError(action cli.ActionFunc) cli.ActionFunc {
 	if action == nil {
 		return nil
 	}
 
 	return func(ctx context.Context, cmd *cli.Command) error {
 		err := action(ctx, cmd)
-		if err == nil || !errors.HasType[*cmderrors.UsageError](err) {
-			return err
+		if err != nil && errors.HasType[*cmderrors.UsageError](err) {
+			_, _ = fmt.Fprintf(cmd.Root().ErrWriter, "error: %s\n", err)
+			cli.DefaultPrintHelp(cmd.Root().ErrWriter, cmd.CustomHelpTemplate, cmd)
 		}
-
-		_, _ = fmt.Fprintf(cmd.Root().ErrWriter, "error: %s\n", err)
-		cli.DefaultPrintHelp(cmd.Root().ErrWriter, cmd.CustomHelpTemplate, cmd)
 		return err
 	}
 }