Merge pull request #81 from basecamp/setup-signup-routing

Route new users from setup to signup wizard

Author: robzolkos

internal/commands/format_test.go

@@ -519,15 +519,26 @@ func TestFormatFlagsNewRegistered(t *testing.T) {
 }
 
 func TestSetupBlockedInMachineMode(t *testing.T) {
-	defer ResetTestMode()
-	ResetTestMode()
-	cfgAgent = true
-	err := runSetup(setupCmd, nil)
-	if err == nil {
-		t.Fatal("expected error when running setup with --agent")
-	}
-	if !strings.Contains(err.Error(), "interactive terminal") {
-		t.Errorf("unexpected error: %v", err)
+	for _, tc := range []struct {
+		name string
+		set  func()
+	}{
+		{"agent", func() { cfgAgent = true }},
+		{"json", func() { cfgJSON = true }},
+		{"quiet", func() { cfgQuiet = true }},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			defer ResetTestMode()
+			ResetTestMode()
+			tc.set()
+			err := runSetup(setupCmd, nil)
+			if err == nil {
+				t.Fatal("expected error when running setup in machine mode")
+			}
+			if !strings.Contains(err.Error(), "interactive terminal") {
+				t.Errorf("unexpected error: %v", err)
+			}
+		})
 	}
 }
 

internal/commands/setup.go

@@ -28,7 +28,7 @@ type Board struct {
 var setupCmd = &cobra.Command{
 	Use:   "setup",
 	Short: "Interactive setup wizard",
-	Long:  "Configure Fizzy CLI with your API token, account, and default board.",
+	Long:  "Configure Fizzy CLI with your API token, account, and default board.\nNew users without an account will be guided through signup.",
 	RunE:  runSetup,
 }
 
@@ -46,6 +46,26 @@ func runSetup(cmd *cobra.Command, args []string) error {
 	fmt.Println("Welcome to Fizzy CLI setup!")
 	fmt.Println()
 
+	// Ask if user has an account before checking existing config
+	var hasAccount string
+	err := huh.NewSelect[string]().
+		Title("Do you have a Fizzy account?").
+		Options(
+			huh.NewOption("Yes, I have an account", "yes"),
+			huh.NewOption("No, I'd like to sign up", "no"),
+		).
+		Value(&hasAccount).
+		Run()
+
+	if err != nil {
+		fmt.Println("Setup cancelled.")
+		return nil //nolint:nilerr // user cancelled prompt
+	}
+
+	if hasAccount == "no" {
+		return signupWizard()
+	}
+
 	// Check for existing config
 	globalExists := config.Exists()
 	localPath := config.LocalConfigPath()
@@ -57,7 +77,7 @@ func runSetup(cmd *cobra.Command, args []string) error {
 			configLocation = "local config (" + localPath + ")"
 		}
 
-		err := huh.NewConfirm().
+		err = huh.NewConfirm().
 			Title(fmt.Sprintf("Existing %s found. Reconfigure?", configLocation)).
 			Value(&reconfigure).
 			Run()
@@ -75,7 +95,7 @@ func runSetup(cmd *cobra.Command, args []string) error {
 
 	// Ask hosted vs self-hosted
 	var hostingType string
-	err := huh.NewSelect[string]().
+	err = huh.NewSelect[string]().
 		Title("Are you using the hosted or self-hosted version?").
 		Options(
 			huh.NewOption("Hosted (app.fizzy.do)", "hosted"),

internal/commands/setup_test.go

@@ -3,12 +3,21 @@ package commands
 import (
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/basecamp/fizzy-cli/internal/config"
 	"gopkg.in/yaml.v3"
 )
 
+func TestSetupCommandDescription(t *testing.T) {
+	t.Run("long description mentions signup for new users", func(t *testing.T) {
+		if !strings.Contains(setupCmd.Long, "signup") {
+			t.Error("expected setup command long description to mention signup")
+		}
+	})
+}
+
 func TestParseAccounts(t *testing.T) {
 	t.Run("parses accounts from identity response", func(t *testing.T) {
 		data := map[string]any{

internal/commands/signup.go

@@ -112,6 +112,12 @@ func runSignup(cmd *cobra.Command, args []string) error {
 	fmt.Println("Welcome to Fizzy CLI signup!")
 	fmt.Println()
 
+	return signupWizard()
+}
+
+// signupWizard contains the core interactive signup flow (steps 1-9).
+// Called by both runSignup and runSetup to avoid duplicate preamble.
+func signupWizard() error {
 	// Step 1: Hosting type
 	var hostingType string
 	err := huh.NewSelect[string]().