diff --git a/cmd/gh-aw/main.go b/cmd/gh-aw/main.go
index 5ec963c3fe3..3fb284f778b 100644
--- a/cmd/gh-aw/main.go
+++ b/cmd/gh-aw/main.go
@@ -450,7 +450,7 @@ Examples:
 
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "Show gh aw extension version information",
+	Short: "Print the current version",
 	Long: `Show the installed version of the gh aw extension.
 
 Examples:
@@ -514,7 +514,7 @@ func init() {
 	}
 	rootCmd.InitDefaultVersionFlag()
 	if f := rootCmd.Flags().Lookup("version"); f != nil {
-		f.Usage = "Show version for " + string(constants.CLIExtensionPrefix)
+		f.Usage = "Print the current version"
 	}
 
 	// Fix usage lines so subcommands show "gh aw <cmd>" instead of "gh <cmd>".
diff --git a/pkg/cli/forecast_command.go b/pkg/cli/forecast_command.go
index 7798ca1bf67..28301b9b283 100644
--- a/pkg/cli/forecast_command.go
+++ b/pkg/cli/forecast_command.go
@@ -100,7 +100,7 @@ Examples:
 		},
 	}
 
-	cmd.Flags().Int("days", 30, "Historical window in days used to sample run history (7 or 30)")
+	cmd.Flags().Int("days", 30, "Historical window in days to sample run history; must be 7 or 30")
 	cmd.Flags().String("period", "month", "Aggregation period for projections: week or month")
 	cmd.Flags().Int("sample", 100, "Maximum number of completed runs to sample per workflow")
 	cmd.Flags().Bool("eval", false, "Evaluate forecast quality against past data (backtesting mode)")
diff --git a/pkg/cli/mcp.go b/pkg/cli/mcp.go
index 161180d82fe..e04f10e329b 100644
--- a/pkg/cli/mcp.go
+++ b/pkg/cli/mcp.go
@@ -21,7 +21,7 @@ MCP server configurations in your agentic workflows.
 
 Available subcommands:
   • list       - List MCP servers defined in agentic workflows
-  • list-tools - List available tools for a specific MCP server
+  • list-tools - List tools for a specific MCP server, or find workflows using it
   • inspect    - Inspect MCP servers and list available tools, resources, and roots
   • add        - Add an MCP server to an agentic workflow
 
diff --git a/pkg/cli/mcp_list_tools.go b/pkg/cli/mcp_list_tools.go
index b669c05698e..00faaaca27a 100644
--- a/pkg/cli/mcp_list_tools.go
+++ b/pkg/cli/mcp_list_tools.go
@@ -211,7 +211,7 @@ The command will:
 		},
 	}
 
-	cmd.Flags().StringVar(&serverFilter, "server", "", "MCP server name to list tools for")
+	cmd.Flags().StringVar(&serverFilter, "server", "", "MCP server name to list tools for (required)")
 	_ = cmd.MarkFlagRequired("server")
 
 	return cmd
diff --git a/pkg/cli/trial_command.go b/pkg/cli/trial_command.go
index d811e6c3aee..09a5d284f83 100644
--- a/pkg/cli/trial_command.go
+++ b/pkg/cli/trial_command.go
@@ -28,6 +28,7 @@ Examples:
   ` + string(constants.CLIExtensionPrefix) + ` trial githubnext/agentics/my-workflow --repeat 3                  # Run 4 times total (1 initial + 3 repeats)
   ` + string(constants.CLIExtensionPrefix) + ` trial githubnext/agentics/my-workflow --delete-host-repo-after    # Delete the trial host repository when done
   ` + string(constants.CLIExtensionPrefix) + ` trial githubnext/agentics/my-workflow --dry-run                   # Preview changes without executing
+  ` + string(constants.CLIExtensionPrefix) + ` trial githubnext/agentics/my-workflow --json                      # Output trial results in JSON format
   ` + string(constants.CLIExtensionPrefix) + ` trial githubnext/agentics/my-workflow --auto-merge-prs            # Auto-merge PRs created during the trial
   ` + string(constants.CLIExtensionPrefix) + ` trial githubnext/agentics/my-workflow --host-repo .               # Use the current repository as the host
   ` + string(constants.CLIExtensionPrefix) + ` trial ./local-workflow.md --clone-repo upstream/repo --repeat 2   # Run a local workflow against cloned contents
@@ -59,6 +60,7 @@ Trial results are saved both locally (in trials/ directory) and in the host repo
 			forceDeleteHostRepo, _ := cmd.Flags().GetBool("force-delete-host-repo-before")
 			yes, _ := cmd.Flags().GetBool("yes")
 			dryRun, _ := cmd.Flags().GetBool("dry-run")
+			jsonOutput, _ := cmd.Flags().GetBool("json")
 			timeout, _ := cmd.Flags().GetInt("timeout")
 			triggerContext, _ := cmd.Flags().GetString("trigger-context")
 			repeatCount, _ := cmd.Flags().GetInt("repeat")
@@ -91,6 +93,7 @@ Trial results are saved both locally (in trials/ directory) and in the host repo
 				ForceDelete:            forceDeleteHostRepo,
 				Quiet:                  yes,
 				DryRun:                 dryRun,
+				JSONOutput:             jsonOutput,
 				TimeoutMinutes:         timeout,
 				TriggerContext:         triggerContext,
 				RepeatCount:            repeatCount,
@@ -124,6 +127,7 @@ Trial results are saved both locally (in trials/ directory) and in the host repo
 	cmd.Flags().Int("repeat", 0, "Number of additional times to run after the initial execution (e.g., --repeat 3 runs 4 times total)")
 	cmd.Flags().Bool("auto-merge-prs", false, "Auto-merge any pull requests created during trial execution")
 	addEngineFlag(cmd)
+	addJSONFlag(cmd)
 	cmd.Flags().String("append", "", "Append extra content to the end of agentic workflow on installation")
 	cmd.Flags().Bool("disable-security-scanner", false, "Disable security scanning of workflow markdown content")
 	cmd.MarkFlagsMutuallyExclusive("host-repo", "repo")
diff --git a/pkg/cli/trial_types.go b/pkg/cli/trial_types.go
index 076474a274b..51ce5e6cc12 100644
--- a/pkg/cli/trial_types.go
+++ b/pkg/cli/trial_types.go
@@ -34,6 +34,7 @@ type TrialOptions struct {
 	ForceDelete            bool
 	Quiet                  bool
 	DryRun                 bool
+	JSONOutput             bool
 	TimeoutMinutes         int
 	TriggerContext         string
 	RepeatCount            int