Merge branch 'main' into charm-tests

Author: srtaalej

.github/workflows/dependencies.yml

@@ -56,7 +56,7 @@ jobs:
           ref: main
           token: ${{ steps.credentials.outputs.token }}
       - name: Install Golang
-        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: "stable"
       - name: Get the latest version

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Set up Go
-        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: "1.26.0"
       - name: Lint
@@ -55,7 +55,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Set up Go
-        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: "1.26.0"
       - name: Report health score

cmd/project/create.go

@@ -17,12 +17,16 @@ package project
 import (
 	"context"
 	"fmt"
+	"math/rand"
 	"path/filepath"
 	"strings"
+	"time"
 
+	"github.com/slackapi/slack-cli/internal/iostreams"
 	"github.com/slackapi/slack-cli/internal/logger"
 	"github.com/slackapi/slack-cli/internal/pkg/create"
 	"github.com/slackapi/slack-cli/internal/shared"
+	"github.com/slackapi/slack-cli/internal/slackerror"
 	"github.com/slackapi/slack-cli/internal/slacktrace"
 	"github.com/slackapi/slack-cli/internal/style"
 	"github.com/spf13/cobra"
@@ -33,6 +37,7 @@ var createTemplateURLFlag string
 var createGitBranchFlag string
 var createAppNameFlag string
 var createListFlag bool
+var createSubdirFlag string
 
 // Handle to client's create function used for testing
 // TODO - Find best practice, such as using an Interface and Struct to create a client
@@ -66,6 +71,7 @@ name your app 'agent' (not create an AI Agent), use the --name flag instead.`,
 			{Command: "create agent my-agent-app", Meaning: "Create a new AI Agent app"},
 			{Command: "create my-project -t slack-samples/deno-hello-world", Meaning: "Start a new project from a specific template"},
 			{Command: "create --name my-project", Meaning: "Create a project named 'my-project'"},
+			{Command: "create my-project -t org/monorepo --subdir apps/my-app", Meaning: "Create from a subdirectory of a template"},
 		}),
 		Args: cobra.MaximumNArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -79,6 +85,7 @@ name your app 'agent' (not create an AI Agent), use the --name flag instead.`,
 	cmd.Flags().StringVarP(&createGitBranchFlag, "branch", "b", "", "name of git branch to checkout")
 	cmd.Flags().StringVarP(&createAppNameFlag, "name", "n", "", "name for your app (overrides the name argument)")
 	cmd.Flags().BoolVar(&createListFlag, "list", false, "list available app templates")
+	cmd.Flags().StringVar(&createSubdirFlag, "subdir", "", "subdirectory in the template to use as project")
 
 	return cmd
 }
@@ -128,19 +135,45 @@ func runCreateCommand(clients *shared.ClientFactory, cmd *cobra.Command, args []
 		return listTemplates(ctx, clients, categoryShortcut)
 	}
 
+	// --subdir requires --template
+	if cmd.Flags().Changed("subdir") && !templateFlagProvided {
+		return slackerror.New(slackerror.ErrMismatchedFlags).
+			WithMessage("The --subdir flag requires the --template flag")
+	}
+
 	// Collect the template URL or select a starting template
 	template, err := promptTemplateSelection(cmd, clients, categoryShortcut)
 	if err != nil {
 		return err
 	}
 
+	// Prompt for app name if not provided via flag or argument
+	if appNameArg == "" {
+		if clients.IO.IsTTY() {
+			defaultName := generateRandomAppName()
+			cmd.Print(style.Secondary(fmt.Sprintf("  Press Enter to use the generated name: %s", defaultName)), "\n")
+			name, err := clients.IO.InputPrompt(ctx, "Name your app:", iostreams.InputPromptConfig{})
+			if err != nil {
+				return err
+			}
+			if name != "" {
+				appNameArg = name
+			} else {
+				appNameArg = defaultName
+			}
+		} else {
+			appNameArg = generateRandomAppName()
+		}
+	}
+
 	// Set up spinners
 	appCreateSpinner = style.NewSpinner(cmd.OutOrStdout())
 
 	createArgs := create.CreateArgs{
 		AppName:   appNameArg,
 		Template:  template,
 		GitBranch: createGitBranchFlag,
+		Subdir:    createSubdirFlag,
 	}
 	clients.EventTracker.SetAppTemplate(template.GetTemplatePath())
 
@@ -277,6 +310,15 @@ func printCreateSuccess(ctx context.Context, clients *shared.ClientFactory, appP
 	clients.IO.PrintTrace(ctx, slacktrace.CreateSuccess)
 }
 
+// generateRandomAppName will create a random app name based on two words and a number
+func generateRandomAppName() string {
+	rand.New(rand.NewSource(time.Now().UnixNano()))
+	var firstRandomNum = rand.Intn(len(create.Adjectives))
+	var secondRandomNum = rand.Intn(len(create.Animals))
+	var randomName = fmt.Sprintf("%s-%s-%d", create.Adjectives[firstRandomNum], create.Animals[secondRandomNum], rand.Intn(1000))
+	return randomName
+}
+
 // printAppCreateError stops the creation spinners and displays the returned error message
 func printAppCreateError(clients *shared.ClientFactory, cmd *cobra.Command, err error) {
 	ctx := cmd.Context()