fix: resolve 5 CLI help text consistency issues (#29335)

Author: Copilot

pkg/cli/add_command.go

@@ -49,7 +49,7 @@ type AddWorkflowsResult struct {
 func NewAddCommand(validateEngine func(string) error) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "add <workflow>...",
-		Short: "Add agentic workflows from repositories to .github/workflows",
+		Short: "Add agentic workflows from repositories or local files to .github/workflows",
 		Long: `Add one or more agentic workflows from repositories to .github/workflows.
 
 This command adds workflows directly without interactive prompts. Use 'add-wizard'

pkg/cli/add_command_test.go

@@ -25,7 +25,7 @@ func TestNewAddCommand(t *testing.T) {
 
 	require.NotNil(t, cmd, "NewAddCommand should not return nil")
 	assert.Equal(t, "add <workflow>...", cmd.Use, "Command use should be 'add <workflow>...'")
-	assert.Equal(t, "Add agentic workflows from repositories to .github/workflows", cmd.Short, "Command short description should match")
+	assert.Equal(t, "Add agentic workflows from repositories or local files to .github/workflows", cmd.Short, "Command short description should match")
 	assert.Contains(t, cmd.Long, "Add one or more agentic workflows", "Command long description should contain expected text")
 
 	// Verify Args validator is set

pkg/cli/logs_command.go

@@ -271,7 +271,7 @@ Examples:
 	logsCmd.Flags().String("format", "", "Output format for cross-run audit report: pretty, markdown (generates security audit report instead of default metrics table)")
 	logsCmd.Flags().Int("last", 0, "Alias for --count: number of recent runs to download")
 	logsCmd.Flags().StringSlice("artifacts", nil, "Artifact sets to download (default: all). Valid sets: "+strings.Join(ValidArtifactSetNames(), ", "))
-	logsCmd.Flags().String("after", "", "Remove locally cached run folders created before this date (cache cleanup). Use deltas like -1w or -1mo, or an absolute date YYYY-MM-DD. For example, --after -1w removes folders older than 1 week.")
+	logsCmd.Flags().String("after", "", "(Cache eviction) Delete locally cached run folders older than this cutoff date, before downloading. Use deltas like -1w or -1mo, or an absolute date YYYY-MM-DD. Note: this evicts old cache entries; it does not filter which runs are downloaded.")
 	logsCmd.Flags().Bool("stdin", false, "Read workflow run IDs or URLs from stdin (one per line) instead of discovering runs via the GitHub API")
 	logsCmd.MarkFlagsMutuallyExclusive("firewall", "no-firewall")
 

pkg/cli/mcp_add.go

@@ -308,11 +308,11 @@ func NewMCPAddSubcommand() *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "add [workflow] [server]",
-		Short: "Add an MCP tool to an agentic workflow",
-		Long: `Add an MCP tool to an agentic workflow by searching the MCP registry.
+		Short: "Add an MCP server to an agentic workflow",
+		Long: `Add an MCP server to an agentic workflow by searching the MCP registry.
 
 This command searches the MCP registry for the specified server, adds it to the workflow's tools section,
-and automatically compiles the workflow. If the tool already exists, the command will fail.
+and automatically compiles the workflow. If the server already exists, the command will fail.
 
 When called with no arguments, it will show a list of available MCP servers from the registry.
 
@@ -329,8 +329,8 @@ Examples:
 
 The command will:
 - Search the MCP registry for the specified server
-- Check that the tool doesn't already exist in the workflow
-- Add the MCP tool configuration to the workflow's frontmatter
+- Check that the server doesn't already exist in the workflow
+- Add the MCP server configuration to the workflow's frontmatter
 - Automatically compile the workflow to generate the .lock.yml file`,
 		Args: cobra.RangeArgs(0, 2),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -347,7 +347,7 @@ The command will:
 
 			// If only workflow ID/file is provided, show error (need both workflow and server)
 			if len(args) == 1 {
-				return errors.New("both workflow ID/file and server name are required to add an MCP tool\nUse 'gh aw mcp add' to list available servers")
+				return errors.New("both workflow ID/file and server name are required to add an MCP server\nUse 'gh aw mcp add' to list available servers")
 			}
 
 			// If both arguments are provided, add the MCP tool
@@ -359,7 +359,7 @@ The command will:
 	}
 
 	cmd.Flags().StringVar(&registryURL, "registry", "", "MCP registry URL (default: https://api.mcp.github.com/v0.1)")
-	cmd.Flags().StringVar(&transportType, "transport", "", "Preferred transport type (stdio, HTTP, Docker)")
+	cmd.Flags().StringVar(&transportType, "transport", "", "Preferred transport type (stdio, http, docker)")
 	cmd.Flags().StringVar(&customToolID, "tool-id", "", "Custom tool ID to use in the workflow (default: uses server ID)")
 
 	return cmd

pkg/cli/mcp_add_test.go

@@ -157,19 +157,23 @@ This is a test workflow.
 	}
 }
 
-func TestMCPAddTransportFlagDescriptionIncludesCapitalizedHTTPAndDocker(t *testing.T) {
+func TestMCPAddTransportFlagDescriptionUsesLowercaseValues(t *testing.T) {
 	cmd := NewMCPAddSubcommand()
 	transportFlag := cmd.Flags().Lookup("transport")
 	if transportFlag == nil {
 		t.Fatal("expected --transport flag to exist")
 	}
 
-	if !strings.Contains(transportFlag.Usage, "HTTP") {
-		t.Fatalf("expected --transport usage to include HTTP, got: %s", transportFlag.Usage)
+	if !strings.Contains(transportFlag.Usage, "http") {
+		t.Fatalf("expected --transport usage to include http (lowercase), got: %s", transportFlag.Usage)
 	}
 
-	if !strings.Contains(transportFlag.Usage, "Docker") {
-		t.Fatalf("expected --transport usage to include Docker, got: %s", transportFlag.Usage)
+	if !strings.Contains(transportFlag.Usage, "docker") {
+		t.Fatalf("expected --transport usage to include docker (lowercase), got: %s", transportFlag.Usage)
+	}
+
+	if !strings.Contains(transportFlag.Usage, "stdio") {
+		t.Fatalf("expected --transport usage to include stdio, got: %s", transportFlag.Usage)
 	}
 }
 

pkg/cli/trial_command.go

@@ -14,7 +14,7 @@ func NewTrialCommand(validateEngine func(string) error) *cobra.Command {
 		Short: "Run one or more agentic workflows in trial mode against a simulated repository",
 		Long: `Run one or more agentic workflows in trial mode as if they were running in a repository.
 
-This command creates a temporary private repository in your GitHub space, installs the specified
+This command creates a temporary private repository in your GitHub account, installs the specified
 workflow(s) from their source repositories, and runs them in "trial mode" to capture safe outputs without
 making actual changes to the "simulated" host repository.