Migrate workflow commands (run, status, logs, audit) to RunE

cmd/gh-aw/main.go

@@ -297,7 +297,7 @@ Examples:
   gh aw run daily-perf-improver --enable-if-needed # Enable if disabled, run, then restore state
   gh aw run daily-perf-improver --auto-merge-prs # Auto-merge any PRs created during execution`,
 	Args: cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		repeatCount, _ := cmd.Flags().GetInt("repeat")
 		enable, _ := cmd.Flags().GetBool("enable-if-needed")
 		engineOverride, _ := cmd.Flags().GetString("engine")
@@ -307,17 +307,10 @@ Examples:
 		pushSecrets, _ := cmd.Flags().GetBool("use-local-secrets")
 
 		if err := validateEngine(engineOverride); err != nil {
-			fmt.Fprintln(os.Stderr, console.FormatErrorMessage(err.Error()))
-			os.Exit(1)
+			return err
 		}
 
-		if err := cli.RunWorkflowsOnGitHub(args, repeatCount, enable, engineOverride, repoOverride, refOverride, autoMergePRs, pushSecrets, verboseFlag); err != nil {
-			fmt.Fprintln(os.Stderr, console.FormatError(console.CompilerError{
-				Type:    "error",
-				Message: fmt.Sprintf("running workflows on GitHub Actions: %v", err),
-			}))
-			os.Exit(1)
-		}
+		return cli.RunWorkflowsOnGitHub(args, repeatCount, enable, engineOverride, repoOverride, refOverride, autoMergePRs, pushSecrets, verboseFlag)
 	},
 }
 

pkg/cli/audit.go

@@ -53,25 +53,21 @@ Examples:
   ` + constants.CLIExtensionPrefix + ` audit 1234567890 -v  # Verbose output
   ` + constants.CLIExtensionPrefix + ` audit 1234567890 --parse  # Parse agent logs and firewall logs, generating log.md and firewall.md`,
 		Args: cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			runIDOrURL := args[0]
 
 			// Parse run information from input (either numeric ID or URL)
 			runInfo, err := parseRunURL(runIDOrURL)
 			if err != nil {
-				fmt.Fprintln(os.Stderr, console.FormatErrorMessage(err.Error()))
-				os.Exit(1)
+				return err
 			}
 
 			outputDir, _ := cmd.Flags().GetString("output")
 			verbose, _ := cmd.Flags().GetBool("verbose")
 			jsonOutput, _ := cmd.Flags().GetBool("json")
 			parse, _ := cmd.Flags().GetBool("parse")
 
-			if err := AuditWorkflowRun(runInfo, outputDir, verbose, parse, jsonOutput); err != nil {
-				fmt.Fprintln(os.Stderr, console.FormatErrorMessage(err.Error()))
-				os.Exit(1)
-			}
+			return AuditWorkflowRun(runInfo, outputDir, verbose, parse, jsonOutput)
 		},
 	}
 

pkg/cli/logs.go

@@ -358,7 +358,7 @@ Examples:
   ` + constants.CLIExtensionPrefix + ` logs --json                    # Output metrics in JSON format
   ` + constants.CLIExtensionPrefix + ` logs --parse --json            # Generate both markdown and JSON
   ` + constants.CLIExtensionPrefix + ` logs weekly-research --repo owner/repo  # Download logs from specific repository`,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			var workflowName string
 			if len(args) > 0 && args[0] != "" {
 				// Convert workflow ID to GitHub Actions workflow name
@@ -378,11 +378,10 @@ Examples:
 							"Check for typos in the workflow name",
 							"Use the workflow ID (e.g., 'test-claude') or GitHub Actions workflow name (e.g., 'Test Claude')",
 						}
-						fmt.Fprintln(os.Stderr, console.FormatErrorWithSuggestions(
+						return errors.New(console.FormatErrorWithSuggestions(
 							fmt.Sprintf("workflow '%s' not found", args[0]),
 							suggestions,
 						))
-						os.Exit(1)
 					}
 				} else {
 					workflowName = resolvedName
@@ -412,22 +411,14 @@ Examples:
 			if startDate != "" {
 				resolvedStartDate, err := workflow.ResolveRelativeDate(startDate, now)
 				if err != nil {
-					fmt.Fprintln(os.Stderr, console.FormatError(console.CompilerError{
-						Type:    "error",
-						Message: fmt.Sprintf("invalid start-date format '%s': %v", startDate, err),
-					}))
-					os.Exit(1)
+					return fmt.Errorf("invalid start-date format '%s': %v", startDate, err)
 				}
 				startDate = resolvedStartDate
 			}
 			if endDate != "" {
 				resolvedEndDate, err := workflow.ResolveRelativeDate(endDate, now)
 				if err != nil {
-					fmt.Fprintln(os.Stderr, console.FormatError(console.CompilerError{
-						Type:    "error",
-						Message: fmt.Sprintf("invalid end-date format '%s': %v", endDate, err),
-					}))
-					os.Exit(1)
+					return fmt.Errorf("invalid end-date format '%s': %v", endDate, err)
 				}
 				endDate = resolvedEndDate
 			}
@@ -437,21 +428,11 @@ Examples:
 				registry := workflow.GetGlobalEngineRegistry()
 				if !registry.IsValidEngine(engine) {
 					supportedEngines := registry.GetSupportedEngines()
-					fmt.Fprintln(os.Stderr, console.FormatError(console.CompilerError{
-						Type:    "error",
-						Message: fmt.Sprintf("invalid engine value '%s'. Must be one of: %s", engine, strings.Join(supportedEngines, ", ")),
-					}))
-					os.Exit(1)
+					return fmt.Errorf("invalid engine value '%s'. Must be one of: %s", engine, strings.Join(supportedEngines, ", "))
 				}
 			}
 
-			if err := DownloadWorkflowLogs(workflowName, count, startDate, endDate, outputDir, engine, ref, beforeRunID, afterRunID, repoOverride, verbose, toolGraph, noStaged, firewallOnly, noFirewall, parse, jsonOutput, timeout); err != nil {
-				fmt.Fprintln(os.Stderr, console.FormatError(console.CompilerError{
-					Type:    "error",
-					Message: err.Error(),
-				}))
-				os.Exit(1)
-			}
+			return DownloadWorkflowLogs(workflowName, count, startDate, endDate, outputDir, engine, ref, beforeRunID, afterRunID, repoOverride, verbose, toolGraph, noStaged, firewallOnly, noFirewall, parse, jsonOutput, timeout)
 		},
 	}
 

pkg/cli/status.go

@@ -1,10 +1,6 @@
 package cli
 
 import (
-	"fmt"
-	"os"
-
-	"github.com/githubnext/gh-aw/pkg/console"
 	"github.com/githubnext/gh-aw/pkg/constants"
 	"github.com/spf13/cobra"
 )
@@ -26,18 +22,15 @@ Examples:
   ` + constants.CLIExtensionPrefix + ` status ci-                 # Show workflows with 'ci-' in name
   ` + constants.CLIExtensionPrefix + ` status --json              # Output in JSON format
   ` + constants.CLIExtensionPrefix + ` status --ref main          # Show latest run status for main branch`,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			var pattern string
 			if len(args) > 0 {
 				pattern = args[0]
 			}
 			verbose, _ := cmd.Flags().GetBool("verbose")
 			jsonFlag, _ := cmd.Flags().GetBool("json")
 			ref, _ := cmd.Flags().GetString("ref")
-			if err := StatusWorkflows(pattern, verbose, jsonFlag, ref); err != nil {
-				fmt.Fprintln(os.Stderr, console.FormatErrorMessage(err.Error()))
-				os.Exit(1)
-			}
+			return StatusWorkflows(pattern, verbose, jsonFlag, ref)
 		},
 	}