fix(wfctl): accept trailing plugin install flags

Author: intel352

cmd/wfctl/plugin_install.go

@@ -87,7 +87,7 @@ func runPluginInstall(args []string) error {
 		fmt.Fprintf(fs.Output(), "Usage: wfctl plugin install [options] [<name>[@<version>]]\n\nInstall a plugin from the registry, a URL, a local directory, or from the lockfile.\n\n  wfctl plugin install <name>              Install latest from registry\n  wfctl plugin install <name>@v1.0.0       Install specific version\n  wfctl plugin install --url <url>          Install from a direct download URL\n  wfctl plugin install --local <dir>        Install from a local build directory\n  wfctl plugin install --from-config <f>    Install all requires.plugins[] from workflow config\n  wfctl plugin install                      Install all plugins from .wfctl-lock.yaml\n\nOptions:\n")
 		fs.PrintDefaults()
 	}
-	if err := fs.Parse(args); err != nil {
+	if err := fs.Parse(interspersedPluginInstallArgs(fs, args)); err != nil {
 		return err
 	}
 	// Validate flag combinations before doing anything else.
@@ -251,6 +251,46 @@ func runPluginInstall(args []string) error {
 	return nil
 }
 
+type boolFlag interface {
+	IsBoolFlag() bool
+}
+
+func interspersedPluginInstallArgs(fs *flag.FlagSet, args []string) []string {
+	if len(args) == 0 {
+		return args
+	}
+	flags := make([]string, 0, len(args))
+	positionals := make([]string, 0, len(args))
+	for i := 0; i < len(args); i++ {
+		arg := args[i]
+		if arg == "--" {
+			positionals = append(positionals, args[i:]...)
+			break
+		}
+		if !strings.HasPrefix(arg, "-") || arg == "-" {
+			positionals = append(positionals, arg)
+			continue
+		}
+		flags = append(flags, arg)
+		name := strings.TrimLeft(arg, "-")
+		if idx := strings.IndexByte(name, '='); idx >= 0 {
+			name = name[:idx]
+		}
+		f := fs.Lookup(name)
+		if f == nil || strings.Contains(arg, "=") {
+			continue
+		}
+		if bf, ok := f.Value.(boolFlag); ok && bf.IsBoolFlag() {
+			continue
+		}
+		if i+1 < len(args) {
+			i++
+			flags = append(flags, args[i])
+		}
+	}
+	return append(flags, positionals...)
+}
+
 // installPluginFromManifest downloads, extracts, and installs a plugin using the
 // provided registry manifest. It is shared by runPluginInstall and runPluginUpdate.
 // The plugin.json is always written/updated from the manifest to keep version tracking correct.
@@ -1431,10 +1471,10 @@ func preparePluginStagingDir(destDir string) (stagingDir string, cleanup func(),
 // renamed to a trash location on the same filesystem. Only after the new
 // directory is successfully renamed into place is the trash removed.
 //
-//   1. Rename destDir → destDir+".uninstalling"  (no-op if destDir absent)
-//   2. Rename stagingDir → destDir
-//   3. On step-2 failure: restore destDir+".uninstalling" → destDir
-//   4. On step-2 success: remove destDir+".uninstalling"
+//  1. Rename destDir → destDir+".uninstalling"  (no-op if destDir absent)
+//  2. Rename stagingDir → destDir
+//  3. On step-2 failure: restore destDir+".uninstalling" → destDir
+//  4. On step-2 success: remove destDir+".uninstalling"
 //
 // On success stagingDir no longer exists on disk; the deferred cleanup
 // returned by preparePluginStagingDir becomes a harmless no-op.

cmd/wfctl/plugin_install_test.go

@@ -749,8 +749,6 @@ func sha256sum(data []byte) string {
 	return hex.EncodeToString(h[:])
 }
 
-
-
 func TestVerifyChecksum_MismatchFormat(t *testing.T) {
 	err := verifyChecksum([]byte("data"), strings.Repeat("0", 64))
 	if err == nil {
@@ -976,6 +974,24 @@ func TestRunPluginInstallCompatSkipsNewerKnownFail(t *testing.T) {
 	}
 }
 
+func TestRunPluginInstallHonorsTrailingPluginDirFlag(t *testing.T) {
+	reg := newCompatInstallRegistry(t, "test", "v0.2.0", []compatInstallVersion{
+		{Version: "v0.2.0", Status: PluginCompatibilityStatusPass},
+	})
+	pluginDir := t.TempDir()
+	if err := runPluginInstall([]string{
+		"test",
+		"--config", reg.ConfigPath,
+		"--plugin-dir", pluginDir,
+		"--engine-version", "v0.51.2",
+	}); err != nil {
+		t.Fatalf("runPluginInstall: %v", err)
+	}
+	if got := readInstalledVersion(filepath.Join(pluginDir, "test")); got != "v0.2.0" {
+		t.Fatalf("installed version in trailing --plugin-dir = %q, want v0.2.0", got)
+	}
+}
+
 func TestRunPluginInstallCompatRequestedFailErrorsAndWarnPermits(t *testing.T) {
 	reg := newCompatInstallRegistry(t, "test", "v0.2.0", []compatInstallVersion{
 		{Version: "v0.2.0", Status: PluginCompatibilityStatusFail},