Merge branch 'main' into zimeg-fix-env-quote

Author: zimeg

.claude/settings.json

@@ -1,7 +1,9 @@
 {
   "permissions": {
     "allow": [
+      "Bash(go build:*)",
       "Bash(go mod tidy:*)",
+      "Bash(go test:*)",
       "Bash(gofmt:*)",
       "Bash(gh issue view:*)",
       "Bash(gh label list:*)",
@@ -28,5 +30,8 @@
       "WebFetch(domain:github.com)",
       "WebFetch(domain:docs.slack.dev)"
     ]
+  },
+  "enabledPlugins": {
+    "gopls-lsp@claude-plugins-official": true
   }
 }

.gitignore

@@ -19,7 +19,10 @@ environments.yaml
 # macOS
 .DS_Store
 
-# For GoLand users
+# Git
+.worktrees/
+
+# Goland project files
 .idea/
 
 # goreleaser

cmd/help/help.go

@@ -35,7 +35,7 @@ func HelpFunc(
 		if help, _ := clients.Config.Flags.GetBool("help"); help {
 			clients.Config.LoadExperiments(ctx, clients.IO.PrintDebug)
 		}
-		style.ToggleCharm(clients.Config.WithExperimentOn(experiment.Charm))
+		style.ToggleLipgloss(clients.Config.WithExperimentOn(experiment.Lipgloss))
 		experiments := []string{}
 		for _, exp := range clients.Config.GetExperiments() {
 			if experiment.Includes(exp) {
@@ -68,7 +68,7 @@ func PrintHelpTemplate(cmd *cobra.Command, data style.TemplateData) {
 	}
 	cmd.Long = cmdLongF.String()
 	tmpl := legacyHelpTemplate
-	if style.IsCharmEnabled() {
+	if style.IsLipglossEnabled() {
 		tmpl = charmHelpTemplate
 	}
 	err = style.PrintTemplate(cmd.OutOrStdout(), tmpl, templateInfo{cmd, data})
@@ -121,7 +121,7 @@ const charmHelpTemplate string = `{{.Long | ToDescription}}
 // ════════════════════════════════════════════════════════════════════════════════
 // DEPRECATED: Legacy help template — aurora styling
 //
-// Delete this entire block when the charm experiment is permanently enabled.
+// Delete this entire block when the lipgloss experiment is permanently enabled.
 // ════════════════════════════════════════════════════════════════════════════════
 
 const legacyHelpTemplate string = `{{.Long}}

cmd/project/create.go

@@ -47,6 +47,7 @@ type promptObject struct {
 	Title       string // "Reverse string"
 	Repository  string // "slack-samples/reverse-string"
 	Description string // "A function that reverses a given string"
+	Subdir      string // "agents/hello-world" - subdirectory within the repository
 }
 
 const viewMoreSamples = "slack-cli#view-more-samples"
@@ -158,11 +159,15 @@ func runCreateCommand(clients *shared.ClientFactory, cmd *cobra.Command, args []
 		}
 	}
 
+	subdir := createSubdirFlag
+	if subdir == "" {
+		subdir = template.GetSubdir()
+	}
 	createArgs := create.CreateArgs{
 		AppName:   appNameArg,
 		Template:  template,
 		GitBranch: createGitBranchFlag,
-		Subdir:    createSubdirFlag,
+		Subdir:    subdir,
 	}
 	clients.EventTracker.SetAppTemplate(template.GetTemplatePath())
 

cmd/project/create_samples.go

@@ -67,7 +67,7 @@ func promptSampleSelection(ctx context.Context, clients *shared.ClientFactory, s
 	sortedRepos := sortRepos(filteredRepos)
 	selectOptions := make([]string, len(sortedRepos))
 	for i, r := range sortedRepos {
-		if !clients.Config.WithExperimentOn(experiment.Charm) {
+		if !clients.Config.WithExperimentOn(experiment.Huh) {
 			selectOptions[i] = fmt.Sprint(i+1, ". ", r.Name)
 		} else {
 			selectOptions[i] = r.Name
@@ -78,7 +78,7 @@ func promptSampleSelection(ctx context.Context, clients *shared.ClientFactory, s
 	selection, err = clients.IO.SelectPrompt(ctx, "Select a sample to build upon:", selectOptions, iostreams.SelectPromptConfig{
 		Description: func(value string, index int) string {
 			desc := sortedRepos[index].Description
-			if !clients.Config.WithExperimentOn(experiment.Charm) {
+			if !clients.Config.WithExperimentOn(experiment.Huh) {
 				desc += "\n  https://github.com/" + sortedRepos[index].FullName
 			}
 			return desc