diff --git a/cmd/picoclaw/cmd_auth.go b/cmd/picoclaw/cmd_auth.go
index 112410066..67dd198d9 100644
--- a/cmd/picoclaw/cmd_auth.go
+++ b/cmd/picoclaw/cmd_auth.go
@@ -24,6 +24,16 @@ func newAuthCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "auth",
 		Short: "Manage authentication (login, logout, status)",
+		Long: `Manage authentication (login, logout, status)
+
+Examples:
+  picoclaw auth login --provider openai
+  picoclaw auth login --provider openai --device-code
+  picoclaw auth login --provider anthropic
+  picoclaw auth login --provider google-antigravity
+  picoclaw auth logout --provider openai
+  picoclaw auth status
+  picoclaw auth models`,
 	}
 	cmd.AddCommand(
 		newAuthLoginCmd(),
diff --git a/cmd/picoclaw/main.go b/cmd/picoclaw/main.go
index c914ba88c..50deaedcc 100644
--- a/cmd/picoclaw/main.go
+++ b/cmd/picoclaw/main.go
@@ -119,7 +119,17 @@ func init() {
 		newSkillsCmd(),
 		newVersionCmd(),
 	)
-	rootCmd.Version = formatVersion()
+	// Override cobra's default --version/-v to use printVersion() for full output
+	rootCmd.Flags().BoolP("version", "v", false, "Show version information")
+	rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {}
+	rootCmd.RunE = func(cmd *cobra.Command, args []string) error {
+		v, _ := cmd.Flags().GetBool("version")
+		if v {
+			printVersion()
+			return nil
+		}
+		return cmd.Help()
+	}
 }
 
 func main() {