From 328bc80beb979c92347f69916f6923cf8a1316e2 Mon Sep 17 00:00:00 2001
From: rektdeckard <friedtm@gmail.com>
Date: Tue, 24 Sep 2024 14:29:21 -0600
Subject: [PATCH 1/2] chore(sbx): propmpt for template before name

---
 cmd/lk/app.go | 60 ++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/cmd/lk/app.go b/cmd/lk/app.go
index 1806ca47..6078defe 100644
--- a/cmd/lk/app.go
+++ b/cmd/lk/app.go
@@ -173,14 +173,16 @@ func setupTemplate(ctx context.Context, cmd *cli.Command) error {
 		if err != nil {
 			return err
 		}
-		details, err := bootstrap.FetchSandboxDetails(ctx, sandboxID, token, serverURL)
-		if err != nil {
-			return err
-		}
-		if len(details.ChildTemplates) == 0 {
-			return errors.New("no child templates found for sandbox")
+		if templateURL == "" {
+			details, err := bootstrap.FetchSandboxDetails(ctx, sandboxID, token, serverURL)
+			if err != nil {
+				return err
+			}
+			if len(details.ChildTemplates) == 0 {
+				return errors.New("no child templates found for sandbox")
+			}
+			templateOptions = details.ChildTemplates
 		}
-		templateOptions = details.ChildTemplates
 	} else {
 		var err error
 		templateOptions, err = bootstrap.FetchTemplates(ctx)
@@ -189,28 +191,6 @@ func setupTemplate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	appName = cmd.Args().First()
-	if appName == "" {
-		appName = sandboxID
-		preinstallPrompts = append(preinstallPrompts, huh.NewInput().
-			Title("Application Name").
-			Placeholder("my-app").
-			Value(&appName).
-			Validate(func(s string) error {
-				if len(s) < 3 {
-					return errors.New("name is too short")
-				}
-				if !appNameRegex.MatchString(s) {
-					return errors.New("try a simpler name")
-				}
-				if s, _ := os.Stat(s); s != nil {
-					return errors.New("that name is in use")
-				}
-				return nil
-			}).
-			WithTheme(theme))
-	}
-
 	// if no template name or URL is specified, prompt user to choose from available templates
 	if templateName == "" && templateURL == "" {
 		templateSelect := huh.NewSelect[string]().
@@ -237,6 +217,28 @@ func setupTemplate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
+	appName = cmd.Args().First()
+	if appName == "" {
+		appName = sandboxID
+		preinstallPrompts = append(preinstallPrompts, huh.NewInput().
+			Title("Application Name").
+			Placeholder("my-app").
+			Value(&appName).
+			Validate(func(s string) error {
+				if len(s) < 3 {
+					return errors.New("name is too short")
+				}
+				if !appNameRegex.MatchString(s) {
+					return errors.New("try a simpler name")
+				}
+				if s, _ := os.Stat(s); s != nil {
+					return errors.New("that name is in use")
+				}
+				return nil
+			}).
+			WithTheme(theme))
+	}
+
 	if len(preinstallPrompts) > 0 {
 		group := huh.NewGroup(preinstallPrompts...)
 		if err := huh.NewForm(group).

From ccccf63d445db25e15473d9e055747d297bba77f Mon Sep 17 00:00:00 2001
From: rektdeckard <friedtm@gmail.com>
Date: Tue, 24 Sep 2024 14:29:42 -0600
Subject: [PATCH 2/2] chore(cmd): bump version

---
 version.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.go b/version.go
index e65897d1..39388c68 100644
--- a/version.go
+++ b/version.go
@@ -15,5 +15,5 @@
 package livekitcli
 
 const (
-	Version = "2.1.4"
+	Version = "2.1.5"
 )