Allow passing --branch and --target instead of providing them

interactively

Author: Bruce Hill

pkg/cmd/dev.go

@@ -264,6 +264,16 @@ var devCommand = cli.Command{
 			Aliases: []string{"config"},
 			Usage:   "Path to Stainless config file",
 		},
+		&cli.StringFlag{
+			Name:    "branch",
+			Aliases: []string{"b"},
+			Usage:   "Which branch to use",
+		},
+		&cli.StringSliceFlag{
+			Name:    "target",
+			Aliases: []string{"t"},
+			Usage:   "The target build language(s)",
+		},
 		&cli.BoolFlag{
 			Name:    "watch",
 			Aliases: []string{"w"},
@@ -288,7 +298,68 @@ func runPreview(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	var selectedBranch string
+	if cmd.IsSet("branch") {
+		selectedBranch = cmd.String("branch")
+	} else {
+		selectedBranch, err = chooseBranch(gitUser)
+		if err != nil {
+			return err
+		}
+	}
+	Property("branch", selectedBranch)
 
+	// Phase 2: Language selection
+	var selectedTargets []string
+	targetInfos := getAvailableTargetInfo(ctx, cc.client, cmd.String("project"), cc.workspaceConfig)
+	if cmd.IsSet("target") {
+		selectedTargets = cmd.StringSlice("target")
+		for _, target := range selectedTargets {
+			if !isValidTarget(targetInfos, target) {
+				return fmt.Errorf("invalid language target: %s", target)
+			}
+		}
+	} else {
+		selectedTargets, err = chooseSelectedTargets(targetInfos)
+	}
+
+	if len(selectedTargets) == 0 {
+		return fmt.Errorf("no languages selected")
+	}
+
+	Property("targets", strings.Join(selectedTargets, ", "))
+
+	// Convert string targets to stainless.Target
+	targets := make([]stainless.Target, len(selectedTargets))
+	for i, target := range selectedTargets {
+		targets[i] = stainless.Target(target)
+	}
+
+	// Phase 3: Start build and monitor progress in a loop
+	for {
+		// Make the user get past linter errors
+		if err := runLinter(ctx, cmd, true); err != nil {
+			if errors.Is(err, ErrUserCancelled) {
+				return nil
+			}
+			return err
+		}
+
+		// Start the build process
+		if err := runDevBuild(ctx, cc, cmd, selectedBranch, targets); err != nil {
+			if errors.Is(err, ErrUserCancelled) {
+				return nil
+			}
+			return err
+		}
+
+		if !cmd.Bool("watch") {
+			break
+		}
+	}
+	return nil
+}
+
+func chooseBranch(gitUser string) (string, error) {
 	now := time.Now()
 	randomBytes := make([]byte, 3)
 	rand.Read(randomBytes)
@@ -306,6 +377,7 @@ func runPreview(ctx context.Context, cmd *cli.Command) error {
 		huh.NewOption(fmt.Sprintf("%s/<random>", gitUser), randomBranch),
 	)
 
+	var selectedBranch string
 	branchForm := huh.NewForm(
 		huh.NewGroup(
 			huh.NewSelect[string]().
@@ -317,20 +389,16 @@ func runPreview(ctx context.Context, cmd *cli.Command) error {
 	).WithTheme(GetFormTheme(0))
 
 	if err := branchForm.Run(); err != nil {
-		return fmt.Errorf("branch selection failed: %v", err)
+		return selectedBranch, fmt.Errorf("branch selection failed: %v", err)
 	}
 
-	Property("branch", selectedBranch)
-
-	// Phase 2: Language selection
-	var selectedTargets []string
-
-	// Use cached workspace config for intelligent defaults
-	config := cc.workspaceConfig
+	return selectedBranch, nil
+}
 
-	targetInfo := getAvailableTargetInfo(ctx, cc.client, cmd.String("project"), config)
-	targetOptions := targetInfoToOptions(targetInfo)
+func chooseSelectedTargets(targetInfos []TargetInfo) ([]string, error) {
+	targetOptions := targetInfoToOptions(targetInfos)
 
+	var selectedTargets []string
 	targetForm := huh.NewForm(
 		huh.NewGroup(
 			huh.NewMultiSelect[string]().
@@ -342,44 +410,9 @@ func runPreview(ctx context.Context, cmd *cli.Command) error {
 	).WithTheme(GetFormTheme(0))
 
 	if err := targetForm.Run(); err != nil {
-		return fmt.Errorf("target selection failed: %v", err)
-	}
-
-	if len(selectedTargets) == 0 {
-		return fmt.Errorf("no languages selected")
-	}
-
-	Property("targets", strings.Join(selectedTargets, ", "))
-
-	// Convert string targets to stainless.Target
-	targets := make([]stainless.Target, len(selectedTargets))
-	for i, target := range selectedTargets {
-		targets[i] = stainless.Target(target)
+		return nil, fmt.Errorf("target selection failed: %v", err)
 	}
-
-	// Phase 3: Start build and monitor progress in a loop
-	for {
-		// Make the user get past linter errors
-		if err := runLinter(ctx, cmd, true); err != nil {
-			if errors.Is(err, ErrUserCancelled) {
-				return nil
-			}
-			return err
-		}
-
-		// Start the build process
-		if err := runDevBuild(ctx, cc, cmd, selectedBranch, targets); err != nil {
-			if errors.Is(err, ErrUserCancelled) {
-				return nil
-			}
-			return err
-		}
-
-		if !cmd.Bool("watch") {
-			break
-		}
-	}
-	return nil
+	return selectedTargets, nil
 }
 
 func runDevBuild(ctx context.Context, cc *apiCommandContext, cmd *cli.Command, branch string, languages []stainless.Target) error {

pkg/cmd/init.go

@@ -523,6 +523,15 @@ func getAllTargetInfo() []TargetInfo {
 	}
 }
 
+func isValidTarget(targetInfos []TargetInfo, name string) bool {
+	for _, info := range targetInfos {
+		if info.Name == name {
+			return true
+		}
+	}
+	return false
+}
+
 // targetInfoToOptions converts TargetInfo slice to huh.Options
 func targetInfoToOptions(targets []TargetInfo) []huh.Option[string] {
 	options := make([]huh.Option[string], len(targets))