[REL-13574] feedback

Author: dakotasanchez

cmd/setup/wizard.go

@@ -28,6 +28,7 @@ const (
 	stepSelectProject wizardStep = iota
 	stepSelectEnvironment
 	stepDetect
+	stepSelectSDK
 	stepInstall
 	stepCreateFlag
 	stepInit
@@ -59,6 +60,7 @@ type wizardModel struct {
 	environments []envItem
 	projectList  list.Model
 	envList      list.Model
+	sdkList      list.Model
 
 	selectedProject string
 	selectedEnv     string
@@ -75,6 +77,16 @@ type wizardModel struct {
 	quitting bool
 }
 
+type sdkItem struct {
+	id       string
+	language string
+	name     string
+}
+
+func (s sdkItem) Title() string       { return s.name }
+func (s sdkItem) Description() string { return s.language }
+func (s sdkItem) FilterValue() string { return s.name }
+
 type projectItem struct {
 	key  string
 	name string
@@ -102,6 +114,7 @@ type envDetailsFetchedMsg struct {
 	mobileKey    string
 }
 type detectDoneMsg struct{ result *setup.DetectResult }
+type detectFailedMsg struct{}
 type installDoneMsg struct{ result *setup.InstallResult }
 type flagCreatedMsg struct{ key string }
 type initDoneMsg struct{ result *setup.InitResult }
@@ -186,6 +199,18 @@ func (m wizardModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.step = stepDetect
 		return m, m.runDetect()
 
+	case detectFailedMsg:
+		items := make([]list.Item, len(setup.KnownSDKs))
+		for i, sdk := range setup.KnownSDKs {
+			items[i] = sdkItem{id: sdk.ID, language: sdk.Language, name: sdk.Name}
+		}
+		delegate := list.NewDefaultDelegate()
+		m.sdkList = list.New(items, delegate, m.width, m.height-4)
+		m.sdkList.Title = "Select your SDK:"
+		m.sdkList.SetShowStatusBar(false)
+		m.step = stepSelectSDK
+		return m, nil
+
 	case detectDoneMsg:
 		m.detectResult = msg.result
 		m.step = stepInstall
@@ -232,6 +257,8 @@ func (m wizardModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.projectList, cmd = m.projectList.Update(msg)
 	case stepSelectEnvironment:
 		m.envList, cmd = m.envList.Update(msg)
+	case stepSelectSDK:
+		m.sdkList, cmd = m.sdkList.Update(msg)
 	}
 	return m, cmd
 }
@@ -261,6 +288,18 @@ func (m wizardModel) handleEnter() (tea.Model, tea.Cmd) {
 		m.selectedEnv = selected.key
 		return m, m.fetchEnvDetails()
 
+	case stepSelectSDK:
+		selected, ok := m.sdkList.SelectedItem().(sdkItem)
+		if !ok {
+			return m, nil
+		}
+		m.detectResult = &setup.DetectResult{
+			SDKID:    selected.id,
+			Language: selected.language,
+		}
+		m.step = stepInstall
+		return m, m.runInstall()
+
 	case stepWaitForApp:
 		m.step = stepVerify
 		return m, m.runVerify()
@@ -295,6 +334,9 @@ func (m wizardModel) View() string {
 	case stepDetect:
 		return m.spinner.View() + " Detecting project type..."
 
+	case stepSelectSDK:
+		return m.sdkList.View()
+
 	case stepInstall:
 		return m.spinner.View() + " Installing SDK..."
 
@@ -440,7 +482,7 @@ func (m wizardModel) runDetect() tea.Cmd {
 		}
 		result, err := m.detector.Detect(dir)
 		if err != nil {
-			return wizardErrMsg{err: err}
+			return detectFailedMsg{}
 		}
 		return detectDoneMsg{result: result}
 	}

cmd/setup/wizard_test.go

@@ -0,0 +1,68 @@
+package setup
+
+import (
+	"testing"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/launchdarkly/ldcli/internal/setup"
+)
+
+func TestWizard_DetectFailed_TransitionsToSDKSelection(t *testing.T) {
+	m := wizardModel{step: stepDetect}
+
+	next, _ := m.Update(detectFailedMsg{})
+	updated := next.(wizardModel)
+
+	assert.Equal(t, stepSelectSDK, updated.step)
+	assert.Equal(t, len(setup.KnownSDKs), len(updated.sdkList.Items()))
+}
+
+func TestWizard_DetectFailed_SDKListTitles(t *testing.T) {
+	m := wizardModel{step: stepDetect}
+
+	next, _ := m.Update(detectFailedMsg{})
+	updated := next.(wizardModel)
+
+	// Verify the list items match KnownSDKs in order
+	for i, item := range updated.sdkList.Items() {
+		sdk := item.(sdkItem)
+		assert.Equal(t, setup.KnownSDKs[i].ID, sdk.id)
+		assert.Equal(t, setup.KnownSDKs[i].Name, sdk.name)
+		assert.Equal(t, setup.KnownSDKs[i].Language, sdk.language)
+	}
+}
+
+func TestWizard_SelectSDK_SetsDetectResultAndProceedsToInstall(t *testing.T) {
+	m := wizardModel{step: stepDetect}
+
+	// Transition to stepSelectSDK
+	next, _ := m.Update(detectFailedMsg{})
+	updated := next.(wizardModel)
+	require.Equal(t, stepSelectSDK, updated.step)
+
+	// Press enter — selects the first SDK in the list
+	next, cmd := updated.Update(tea.KeyMsg{Type: tea.KeyEnter})
+	selected := next.(wizardModel)
+
+	assert.Equal(t, stepInstall, selected.step)
+	require.NotNil(t, selected.detectResult)
+	assert.Equal(t, setup.KnownSDKs[0].ID, selected.detectResult.SDKID)
+	assert.Equal(t, setup.KnownSDKs[0].Language, selected.detectResult.Language)
+	// cmd is the runInstall tea.Cmd — should be non-nil
+	assert.NotNil(t, cmd)
+}
+
+func TestWizard_SelectSDK_EmptyList_DoesNotPanic(t *testing.T) {
+	m := wizardModel{step: stepSelectSDK}
+	// sdkList not initialized — SelectedItem returns nil
+
+	next, _ := m.Update(tea.KeyMsg{Type: tea.KeyEnter})
+	updated := next.(wizardModel)
+
+	// Should stay on stepSelectSDK without panicking
+	assert.Equal(t, stepSelectSDK, updated.step)
+	assert.Nil(t, updated.detectResult)
+}

internal/setup/detector.go

@@ -52,6 +52,12 @@ func (FileDetector) Detect(dir string) (*DetectResult, error) {
 	if result := detectJava(dir); result != nil {
 		return result, nil
 	}
+	if result := detectSwift(dir); result != nil {
+		return result, nil
+	}
+	if result := detectDotnet(dir); result != nil {
+		return result, nil
+	}
 	return nil, errors.New("could not detect project language from directory; try specifying --sdk-id manually")
 }
 
@@ -93,54 +99,55 @@ func detectNode(dir string) *DetectResult {
 		}
 	}
 
-	if _, ok := allDeps["react"]; ok {
+	if _, ok := allDeps["react-native"]; ok {
 		return &DetectResult{
 			Language:       "JavaScript",
-			Framework:      "React",
+			Framework:      "React Native",
 			PackageManager: pm,
-			SDKID:          "react-client-sdk",
+			SDKID:          "react-native",
 			EntryPoint: filepath.Join(dir, firstExistingIn(dir, []string{
 				"src/App.tsx", "src/App.jsx", "src/App.js",
 				"src/index.tsx", "src/index.jsx", "src/index.js",
 				"index.js",
 			})),
 		}
 	}
-	if _, ok := allDeps["react-native"]; ok {
+	if _, ok := allDeps["react"]; ok {
 		return &DetectResult{
 			Language:       "JavaScript",
-			Framework:      "React Native",
+			Framework:      "React",
 			PackageManager: pm,
-			SDKID:          "react-native-client-sdk",
+			SDKID:          "react-client-sdk",
 			EntryPoint: filepath.Join(dir, firstExistingIn(dir, []string{
 				"src/App.tsx", "src/App.jsx", "src/App.js",
 				"src/index.tsx", "src/index.jsx", "src/index.js",
 				"index.js",
 			})),
 		}
 	}
-	jsClientFrameworks := map[string]string{
-	    "backbone":      "Backbone",
-	    "svelte":        "Svelte",
-	    "vue":           "Vue",
-	    "@angular/core": "Angular",
-	    "ember-source":  "Ember",
-    }
-    for dep, framework := range jsClientFrameworks {
-	    if _, ok := allDeps[dep]; ok {
-		    return &DetectResult{
-			    Language:       "JavaScript",
-			    Framework:      framework,
-			    PackageManager: pm,
-			    SDKID:          "js-client-sdk",
-			    EntryPoint: filepath.Join(dir, firstExistingIn(dir, []string{
-				    "src/App.tsx", "src/App.jsx", "src/App.js",
-				    "src/index.tsx", "src/index.jsx", "src/index.js",
-				    "src/main.ts", "src/main.js","index.js",
-			    })),
-		    }
-	    }
-    }
+	jsClientFrameworks := []struct{ dep, framework string }{
+		{"backbone", "Backbone"},
+		{"svelte", "Svelte"},
+		{"vue", "Vue"},
+		{"@angular/core", "Angular"},
+		{"ember-source", "Ember"},
+		{"preact", "Preact"},
+	}
+	for _, fw := range jsClientFrameworks {
+		if _, ok := allDeps[fw.dep]; ok {
+			return &DetectResult{
+				Language:       "JavaScript",
+				Framework:      fw.framework,
+				PackageManager: pm,
+				SDKID:          "js-client-sdk",
+				EntryPoint: filepath.Join(dir, firstExistingIn(dir, []string{
+					"src/App.tsx", "src/App.jsx", "src/App.js",
+					"src/index.tsx", "src/index.jsx", "src/index.js",
+					"src/main.ts", "src/main.js", "index.js",
+				})),
+			}
+		}
+	}
 
 
 	return &DetectResult{
@@ -177,7 +184,7 @@ func detectGo(dir string) *DetectResult {
 		Language:       "Go",
 		PackageManager: "go",
 		SDKID:          "go-server-sdk",
-		EntryPoint:     filepath.Join(dir, firstExistingIn(dir, []string{"main.go", "cmd/main.go"})),
+		EntryPoint:     filepath.Join(dir, firstExistingIn(dir, []string{"cmd/main.go", "main.go"})),
 	}
 }
 
@@ -189,7 +196,7 @@ func detectPython(dir string) *DetectResult {
 				PackageManager: "pip",
 				SDKID:          "python-server-sdk",
 				EntryPoint: filepath.Join(dir, firstExistingIn(dir, []string{
-					"main.py", "app.py", "manage.py", "src/main.py",
+					"src/main.py", "manage.py", "app.py", "main.py",
 				})),
 			}
 		}
@@ -204,6 +211,20 @@ func detectJava(dir string) *DetectResult {
 			if indicator == "pom.xml" {
 				pm = "mvn"
 			}
+			// Android projects use Gradle but are distinguished by AndroidManifest.xml.
+			for _, manifest := range []string{
+				"app/src/main/AndroidManifest.xml",
+				"src/main/AndroidManifest.xml",
+			} {
+				if _, err := os.Stat(filepath.Join(dir, manifest)); err == nil {
+					return &DetectResult{
+						Language:       "Java",
+						PackageManager: "gradle",
+						SDKID:          "android-client-sdk",
+						EntryPoint:     filepath.Join(dir, "app/src/main/java/MainActivity.java"),
+					}
+				}
+			}
 			return &DetectResult{
 				Language:       "Java",
 				PackageManager: pm,
@@ -215,6 +236,78 @@ func detectJava(dir string) *DetectResult {
 	return nil
 }
 
+func detectSwift(dir string) *DetectResult {
+	pm := "spm"
+	if _, err := os.Stat(filepath.Join(dir, "Podfile")); err == nil {
+		pm = "cocoapods"
+	}
+	indicators := []string{"Package.swift", "Podfile"}
+	for _, f := range indicators {
+		if _, err := os.Stat(filepath.Join(dir, f)); err == nil {
+			return &DetectResult{
+				Language:       "Swift",
+				PackageManager: pm,
+				SDKID:          "swift-client-sdk",
+				EntryPoint: filepath.Join(dir, firstExistingIn(dir, []string{
+					"Sources/main.swift", "App.swift", "ContentView.swift", "AppDelegate.swift",
+				})),
+			}
+		}
+	}
+	matches, _ := filepath.Glob(filepath.Join(dir, "*.xcodeproj"))
+	if len(matches) > 0 {
+		return &DetectResult{
+			Language:       "Swift",
+			PackageManager: pm,
+			SDKID:          "swift-client-sdk",
+			EntryPoint: filepath.Join(dir, firstExistingIn(dir, []string{
+				"Sources/main.swift", "App.swift", "ContentView.swift", "AppDelegate.swift",
+			})),
+		}
+	}
+	return nil
+}
+
+func detectDotnet(dir string) *DetectResult {
+	for _, pattern := range []string{"*.csproj", "*.sln"} {
+		matches, _ := filepath.Glob(filepath.Join(dir, pattern))
+		if len(matches) > 0 {
+			return &DetectResult{
+				Language:       "C#",
+				PackageManager: "dotnet",
+				SDKID:          "dotnet-server-sdk",
+				EntryPoint: filepath.Join(dir, firstExistingIn(dir, []string{
+					"Program.cs", "Startup.cs", "src/Program.cs",
+				})),
+			}
+		}
+	}
+	return nil
+}
+
+// SDKOption describes a LaunchDarkly SDK available for use with ldcli setup.
+type SDKOption struct {
+	ID       string
+	Language string
+	Name     string
+}
+
+// KnownSDKs is the ordered list of SDKs available for manual selection when
+// auto-detection fails or the user wants to override the detected SDK.
+var KnownSDKs = []SDKOption{
+	{ID: "node-server", Language: "JavaScript", Name: "Node.js"},
+	{ID: "react-client-sdk", Language: "JavaScript", Name: "React"},
+	{ID: "react-native", Language: "JavaScript", Name: "React Native"},
+	{ID: "js-client-sdk", Language: "JavaScript", Name: "JavaScript (Browser)"},
+	{ID: "python-server-sdk", Language: "Python", Name: "Python"},
+	{ID: "go-server-sdk", Language: "Go", Name: "Go"},
+	{ID: "java-server-sdk", Language: "Java", Name: "Java"},
+	{ID: "android-client-sdk", Language: "Java", Name: "Android"},
+	{ID: "dotnet-server-sdk", Language: "C#", Name: ".NET"},
+	{ID: "swift-client-sdk", Language: "Swift", Name: "iOS/Swift"},
+	{ID: "ruby-server-sdk", Language: "Ruby", Name: "Ruby"},
+}
+
 // firstExistingIn returns the first candidate that exists as a file in dir,
 // or the last candidate if none exist (as a suggested path).
 // Returns an empty string if candidates is empty.