fix: cli completions should filter by verb (#288)

Author: jahvon

cmd/internal/browse.go

@@ -33,13 +33,17 @@ func RegisterBrowseCmd(ctx *context.Context, rootCmd *cobra.Command) {
 			),
 		Args: cobra.MaximumNArgs(2),
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			verbStr := cmd.CalledAs()
+			verb := executable.Verb(verbStr)
 			execList, err := ctx.ExecutableCache.GetExecutableList()
 			if err != nil {
 				return nil, cobra.ShellCompDirectiveError
 			}
 			execIDs := make([]string, 0, len(execList))
 			for _, e := range execList {
-				execIDs = append(execIDs, e.ID())
+				if e.Verb.Equals(verb) {
+					execIDs = append(execIDs, e.ID())
+				}
 			}
 			return execIDs, cobra.ShellCompDirectiveNoFileComp
 		},

cmd/internal/exec.go

@@ -45,13 +45,17 @@ func RegisterExecCmd(ctx *context.Context, rootCmd *cobra.Command) {
 		),
 		Args: cobra.ArbitraryArgs,
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			verbStr := cmd.CalledAs()
+			verb := executable.Verb(verbStr)
 			execList, err := ctx.ExecutableCache.GetExecutableList()
 			if err != nil {
 				return nil, cobra.ShellCompDirectiveError
 			}
 			execIDs := make([]string, 0, len(execList))
 			for _, e := range execList {
-				execIDs = append(execIDs, e.ID())
+				if e.Verb.Equals(verb) {
+					execIDs = append(execIDs, e.ID())
+				}
 			}
 			return execIDs, cobra.ShellCompDirectiveNoFileComp
 		},

cmd/internal/workspace.go

@@ -120,7 +120,10 @@ func registerSwitchWorkspaceCmd(ctx *context.Context, setCmd *cobra.Command) {
 		Aliases: []string{"set", "use"},
 		Short:   "Switch the current workspace.",
 		Args:    cobra.ExactArgs(1),
-		Run:     func(cmd *cobra.Command, args []string) { switchWorkspaceFunc(ctx, cmd, args) },
+		ValidArgsFunction: func(_ *cobra.Command, _ []string, _ string) ([]cobra.Completion, cobra.ShellCompDirective) {
+			return maps.Keys(ctx.Config.Workspaces), cobra.ShellCompDirectiveNoFileComp
+		},
+		Run: func(cmd *cobra.Command, args []string) { switchWorkspaceFunc(ctx, cmd, args) },
 	}
 	RegisterFlag(ctx, workspaceCmd, *flags.FixedWsModeFlag)
 	setCmd.AddCommand(workspaceCmd)

tests/utils/builder/exec.go

@@ -1,4 +1,3 @@
-//nolint:lll
 package builder
 
 import (