added few tests

Author: ivpusic

cli/root.go

@@ -140,19 +140,28 @@ func Execute(version, commit, date, amplitudeKey string) {
 	}
 }
 
-// commandPathFromArgs extracts the subcommand path from os.Args, stripping
-// the binary name and any flags so the tracked path is e.g. "query list"
-// rather than "query list --limit 10".
+// commandPathFromArgs extracts the subcommand path from os.Args, skipping
+// the binary name, flags, and flag values so the tracked path is e.g.
+// "query list" even when invoked as "dune --api-key KEY query list --limit 10".
 func commandPathFromArgs(args []string) string {
 	var parts []string
+	skipNext := false
 	for _, a := range args[1:] { // skip binary name
+		if skipNext {
+			skipNext = false
+			continue
+		}
 		if strings.HasPrefix(a, "-") {
-			break
+			// --flag=value is self-contained; --flag value needs to skip the next arg.
+			if !strings.Contains(a, "=") {
+				skipNext = true
+			}
+			continue
 		}
 		parts = append(parts, a)
 	}
 	if len(parts) == 0 {
 		return "unknown"
 	}
 	return strings.Join(parts, " ")
-}
+}

cli/root_test.go

@@ -69,3 +69,58 @@ func TestPersistentPreRunEConfigFallback(t *testing.T) {
 	err := rootCmd.PersistentPreRunE(cmd, nil)
 	require.NoError(t, err)
 }
+
+func TestCommandPathFromArgs(t *testing.T) {
+	tests := []struct {
+		name string
+		args []string
+		want string
+	}{
+		{
+			name: "simple subcommand",
+			args: []string{"dune", "query", "list"},
+			want: "query list",
+		},
+		{
+			name: "root flag before subcommand",
+			args: []string{"dune", "--api-key", "KEY", "query", "list"},
+			want: "query list",
+		},
+		{
+			name: "flag with equals syntax",
+			args: []string{"dune", "--api-key=KEY", "query", "list"},
+			want: "query list",
+		},
+		{
+			name: "trailing flags after subcommand",
+			args: []string{"dune", "query", "list", "--limit", "10"},
+			want: "query list",
+		},
+		{
+			name: "flags before and after subcommand",
+			args: []string{"dune", "--api-key", "KEY", "query", "list", "--limit", "10"},
+			want: "query list",
+		},
+		{
+			name: "binary only",
+			args: []string{"dune"},
+			want: "unknown",
+		},
+		{
+			name: "only flags",
+			args: []string{"dune", "--help"},
+			want: "unknown",
+		},
+		{
+			name: "single subcommand",
+			args: []string{"dune", "auth"},
+			want: "auth",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.want, commandPathFromArgs(tt.args))
+		})
+	}
+}