diff --git a/cmd/picoclaw/cmd_auth.go b/cmd/picoclaw/cmd_auth.go
index 3fddeb02a..9ce6ffd99 100644
--- a/cmd/picoclaw/cmd_auth.go
+++ b/cmd/picoclaw/cmd_auth.go
@@ -25,6 +25,14 @@ func authCmd() {
 		return
 	}
 
+	subcommand := os.Args[2]
+
+	if strings.HasPrefix(subcommand, "-") {
+		fmt.Printf("Error: %s is an unknown flag\n", subcommand)
+		authHelp()
+		os.Exit(1)
+	}
+
 	switch os.Args[2] {
 	case "login":
 		authLoginCmd()
diff --git a/cmd/picoclaw/cmd_cron.go b/cmd/picoclaw/cmd_cron.go
index 3fc264687..694e2db50 100644
--- a/cmd/picoclaw/cmd_cron.go
+++ b/cmd/picoclaw/cmd_cron.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/sipeed/picoclaw/pkg/cron"
@@ -20,6 +21,12 @@ func cronCmd() {
 
 	subcommand := os.Args[2]
 
+	if strings.HasPrefix(subcommand, "-") {
+		fmt.Printf("Error: %s is an unknown flag\n", subcommand)
+		cronHelp()
+		os.Exit(1)
+	}
+
 	// Load config to get workspace path
 	cfg, err := loadConfig()
 	if err != nil {
diff --git a/cmd/picoclaw/main.go b/cmd/picoclaw/main.go
index 25ad701ca..cd43e49a1 100644
--- a/cmd/picoclaw/main.go
+++ b/cmd/picoclaw/main.go
@@ -12,6 +12,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 
 	"github.com/sipeed/picoclaw/pkg/config"
 	"github.com/sipeed/picoclaw/pkg/skills"
@@ -123,6 +124,12 @@ func main() {
 
 		subcommand := os.Args[2]
 
+		if strings.HasPrefix(subcommand, "-") {
+			fmt.Printf("Error: %s is an unknown flag\n", subcommand)
+			skillsHelp()
+			os.Exit(1)
+		}
+
 		cfg, err := loadConfig()
 		if err != nil {
 			fmt.Printf("Error loading config: %v\n", err)