refactor: reduce code duplication in config validation

- Merge validateSpawnCommands and validateRecycleCommands into generic validateTemplates helper
- Extract extractFieldErrors helper to unify error extraction in outputJSON and outputText

Author: hay-kot

internal/commands/cmd_config_validate.go

@@ -81,56 +81,46 @@ func (cmd *ConfigValidateCmd) outputJSON(c *cli.Command, validationErr error, wa
 		Warnings: warnings,
 	}
 
-	if validationErr != nil {
-		var fieldErrs criterio.FieldErrors
-		if errors.As(validationErr, &fieldErrs) {
-			for _, fe := range fieldErrs {
-				out.Errors = append(out.Errors, fieldError{
-					Field:   fe.Field,
-					Message: fe.Err.Error(),
-				})
-			}
-		} else {
-			out.Errors = append(out.Errors, fieldError{
-				Message: validationErr.Error(),
-			})
-		}
+	for _, fe := range extractFieldErrors(validationErr) {
+		out.Errors = append(out.Errors, fieldError{Field: fe.Field, Message: fe.Err.Error()})
 	}
 
 	enc := json.NewEncoder(c.Root().Writer)
 	enc.SetIndent("", "  ")
 	return enc.Encode(out)
 }
 
+// extractFieldErrors extracts field errors from a validation error.
+func extractFieldErrors(err error) criterio.FieldErrors {
+	if err == nil {
+		return nil
+	}
+	var fieldErrs criterio.FieldErrors
+	if errors.As(err, &fieldErrs) {
+		return fieldErrs
+	}
+	return criterio.FieldErrors{{Err: err}}
+}
+
 func (cmd *ConfigValidateCmd) outputText(p *printer.Printer, validationErr error, warnings []config.ValidationWarning) error {
-	// Print errors first (grouped)
-	errorCount := 0
-	if validationErr != nil {
-		p.Printf("Errors")
+	fieldErrs := extractFieldErrors(validationErr)
 
-		var fieldErrs criterio.FieldErrors
-		if errors.As(validationErr, &fieldErrs) {
-			errorCount = len(fieldErrs)
-			for _, fe := range fieldErrs {
-				if fe.Field != "" {
-					p.Printf("  %s %s: %s", printer.Cross, fe.Field, fe.Err.Error())
-				} else {
-					p.Printf("  %s %s", printer.Cross, fe.Err.Error())
-				}
+	if len(fieldErrs) > 0 {
+		p.Printf("Errors")
+		for _, fe := range fieldErrs {
+			if fe.Field != "" {
+				p.Printf("  %s %s: %s", printer.Cross, fe.Field, fe.Err.Error())
+			} else {
+				p.Printf("  %s %s", printer.Cross, fe.Err.Error())
 			}
-		} else {
-			errorCount = 1
-			p.Printf("  %s %s", printer.Cross, validationErr.Error())
 		}
 	}
 
-	// Print warnings second (grouped)
 	if len(warnings) > 0 {
-		if errorCount > 0 {
+		if len(fieldErrs) > 0 {
 			p.Printf("")
 		}
 		p.Printf("Warnings")
-
 		for _, warn := range warnings {
 			msg := warn.Message
 			if warn.Item != "" {
@@ -140,7 +130,6 @@ func (cmd *ConfigValidateCmd) outputText(p *printer.Printer, validationErr error
 		}
 	}
 
-	// Print summary
 	p.Printf("")
 	if validationErr == nil {
 		if len(warnings) > 0 {
@@ -151,6 +140,6 @@ func (cmd *ConfigValidateCmd) outputText(p *printer.Printer, validationErr error
 		return nil
 	}
 
-	p.Errorf("%d error(s), %d warning(s)", errorCount, len(warnings))
+	p.Errorf("%d error(s), %d warning(s)", len(fieldErrs), len(warnings))
 	return cli.Exit("", 1)
 }

internal/core/config/validate.go

@@ -49,8 +49,8 @@ func (c *Config) ValidateDeep(configPath string) error {
 
 	return criterio.ValidateStruct(
 		c.validateFileAccess(configPath),
-		c.validateSpawnCommands(),
-		c.validateRecycleCommands(),
+		validateTemplates("commands.spawn", c.Commands.Spawn, SpawnTemplateData{}),
+		validateTemplates("commands.recycle", c.Commands.Recycle, RecycleTemplateData{}),
 		c.validateHooks(),
 		c.validateKeybindingTemplates(),
 	)
@@ -137,23 +137,12 @@ func isDirectoryOrNotExist(path string) error {
 	return nil
 }
 
-// validateSpawnCommands checks template syntax for spawn commands.
-func (c *Config) validateSpawnCommands() error {
+// validateTemplates checks template syntax for a slice of command templates.
+func validateTemplates(fieldPrefix string, commands []string, data any) error {
 	var errs criterio.FieldErrorsBuilder
-	for i, cmd := range c.Commands.Spawn {
-		if err := validateTemplate(cmd, SpawnTemplateData{}); err != nil {
-			errs = errs.Append(fmt.Sprintf("commands.spawn[%d]", i), fmt.Errorf("template error: %w", err))
-		}
-	}
-	return errs.ToError()
-}
-
-// validateRecycleCommands checks template syntax for recycle commands.
-func (c *Config) validateRecycleCommands() error {
-	var errs criterio.FieldErrorsBuilder
-	for i, cmd := range c.Commands.Recycle {
-		if err := validateTemplate(cmd, RecycleTemplateData{}); err != nil {
-			errs = errs.Append(fmt.Sprintf("commands.recycle[%d]", i), fmt.Errorf("template error: %w", err))
+	for i, cmd := range commands {
+		if err := validateTemplate(cmd, data); err != nil {
+			errs = errs.Append(fmt.Sprintf("%s[%d]", fieldPrefix, i), fmt.Errorf("template error: %w", err))
 		}
 	}
 	return errs.ToError()