Merge remote-tracking branch 'origin/main' into zimeg-refactor-iostreams-prompts

# Conflicts:
#	internal/iostreams/survey.go

Author: zimeg

.circleci/config.yml

@@ -113,7 +113,7 @@ jobs:
         default: "dev-build"
     docker: # run the steps with Docker
       # CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/
-      - image: cimg/go:1.26.0
+      - image: cimg/go:1.26.1
     steps: # steps that comprise the `build` job
       - checkout # check out source code to working directory
       - restore_cache: # restores saved cache if no changes are detected since last run

.claude/CLAUDE.md

@@ -135,6 +135,19 @@ func NewExampleCommand(clients *shared.ClientFactory) *cobra.Command {
 - Mock the `ClientFactory` and its dependencies for testing
 - Always mock file system operations using `afero.Fs` to enable testability
 
+### Test Naming Conventions
+
+Test function names use the format `Test_StructName_FunctionName` for methods on a struct, or `Test_FunctionName` for package-level functions:
+
+```go
+func Test_Client_GetAppStatus(t *testing.T) { ... }  // struct method
+func Test_getKeyLength(t *testing.T) { ... }         // package-level function
+```
+
+### Test Ordering Conventions
+
+Constructor functions (`NewXYZ`) should always be declared first, at the top of the test file. After constructors, test functions should be ordered alphabetically within each file. When a file has logical sections (separated by comments), tests should be alphabetical within each section. Getter and setter functions are grouped together under the base name — ignore the `Get` or `Set` prefix when determining order (e.g. `Test_AppName` and `Test_SetAppName` both sort under `A`). Exceptions to alphabetical ordering can be made when it doesn't work well for readability or logical grouping.
+
 ### Table-Driven Test Conventions
 
 **Preferred: Map pattern** - uses `tc` for test case variable:

.github/MAINTAINERS_GUIDE.md

@@ -383,6 +383,34 @@ The branch name can also be set by changing
 for the `build-lint-test-e2e-test` workflow in the `.circleci/config.yml` file,
 but take care not to merge this change into `main`!
 
+#### Test naming conventions
+
+Test function names should use the format `Test_StructName_FunctionName` for methods
+on a struct, or `Test_FunctionName` for package-level functions. The underscore after
+`Test` separates the Go test prefix from the identifier being tested:
+
+```go
+// Testing a method on a struct
+func Test_Client_GetAppStatus(t *testing.T) { ... }
+
+// Testing a package-level function
+func Test_getKeyLength(t *testing.T) { ... }
+```
+
+#### Test ordering conventions
+
+Constructor functions (`NewXYZ`) should always be declared first, at the top of the
+test file. After constructors, test functions should be ordered alphabetically. When
+a file has logical sections (separated by comments), tests should be alphabetical
+within each section.
+
+Getter and setter functions should be grouped together under the base name. Ignore
+the `Get` or `Set` prefix when determining alphabetical order. For example,
+`Test_AppName` and `Test_SetAppName` are both sorted under `A` for `AppName`.
+
+Exceptions to alphabetical ordering can be made when it doesn't work well for
+readability or logical grouping.
+
 #### Contributing tests
 
 If you'd like to add tests, please review our

.github/workflows/dependencies.yml

@@ -45,7 +45,7 @@ jobs:
     steps:
       - name: Gather credentials
         id: credentials
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
         with:
           app-id: ${{ secrets.GH_APP_ID_RELEASER }}
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY_RELEASER }}

.github/workflows/tests.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
-          go-version: "1.26.0"
+          go-version: "1.26.1"
       - name: Lint
         uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
@@ -57,7 +57,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
-          go-version: "1.26.0"
+          go-version: "1.26.1"
       - name: Report health score
         uses: slackapi/slack-health-score@d58a419f15cdaff97e9aa7f09f95772830ab66f7 # v0.1.1
         with:

cmd/project/create_samples.go

@@ -21,6 +21,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/slackapi/slack-cli/internal/experiment"
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	"github.com/slackapi/slack-cli/internal/pkg/create"
 	"github.com/slackapi/slack-cli/internal/shared"
@@ -64,14 +65,26 @@ func promptSampleSelection(ctx context.Context, clients *shared.ClientFactory, s
 	}
 
 	sortedRepos := sortRepos(filteredRepos)
-	selectOptions := createSelectOptions(sortedRepos)
+	selectOptions := make([]string, len(sortedRepos))
+	for i, r := range sortedRepos {
+		if !clients.Config.WithExperimentOn(experiment.Charm) {
+			selectOptions[i] = fmt.Sprint(i+1, ". ", r.Name)
+		} else {
+			selectOptions[i] = r.Name
+		}
+	}
 
 	var selectedTemplate string
 	selection, err = clients.IO.SelectPrompt(ctx, "Select a sample to build upon:", selectOptions, iostreams.SelectPromptConfig{
 		Description: func(value string, index int) string {
-			return sortedRepos[index].Description + "\n  https://github.com/" + sortedRepos[index].FullName
+			desc := sortedRepos[index].Description
+			if !clients.Config.WithExperimentOn(experiment.Charm) {
+				desc += "\n  https://github.com/" + sortedRepos[index].FullName
+			}
+			return desc
 		},
 		Flag:     clients.Config.Flags.Lookup("template"),
+		Help:     fmt.Sprintf("Guided tutorials can be found at %s", style.LinkText("https://docs.slack.dev/samples")),
 		PageSize: 4, // Supports standard terminal height (24 rows)
 		Required: true,
 		Template: embedPromptSamplesTmpl,
@@ -127,18 +140,3 @@ func sortRepos(sampleRepos []create.GithubRepo) []create.GithubRepo {
 	})
 	return sortedRepos
 }
-
-// createSelectOptions takes in a list of repositories
-// and returns an array of strings, each value being
-// equal to the repository name (ie, deno-starter-template)
-// and prepended with a number for a prompt visual aid
-func createSelectOptions(filteredRepos []create.GithubRepo) []string {
-	// Create a slice of repository names to use as
-	// the primary item selection in the prompt
-	selectOptions := make([]string, 0)
-	for i, f := range filteredRepos {
-		selectOption := fmt.Sprint(i+1, ". ", f.Name)
-		selectOptions = append(selectOptions, selectOption)
-	}
-	return selectOptions
-}

cmd/project/create_samples_test.go

@@ -174,9 +174,3 @@ func TestSamples_SortRepos(t *testing.T) {
 	assert.Equal(t, sortedRepos[3].StargazersCount, 0, "Expected sortedRepos[3].StargazersCount to equal 0")
 	assert.Equal(t, sortedRepos[3].Description, "This is a new sample")
 }
-
-func TestSamples_CreateSelectOptions(t *testing.T) {
-	selectOptions := createSelectOptions(mockGitHubRepos)
-	assert.Equal(t, len(selectOptions), 4, "Expected selectOptions length to be 4")
-	assert.Contains(t, selectOptions[0], mockGitHubRepos[0].Name, "Expected selectOptions[0] to contain mockGitHubRepos[0].Name")
-}

cmd/project/create_template.go

@@ -21,7 +21,6 @@ import (
 	"time"
 
 	"github.com/slackapi/slack-cli/internal/api"
-	"github.com/slackapi/slack-cli/internal/experiment"
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	"github.com/slackapi/slack-cli/internal/pkg/create"
 	"github.com/slackapi/slack-cli/internal/shared"
@@ -107,16 +106,6 @@ func promptTemplateSelection(cmd *cobra.Command, clients *shared.ClientFactory,
 	// Check if a category shortcut was provided
 	if categoryShortcut == "agent" {
 		categoryID = "slack-cli#ai-apps"
-	} else if clients.Config.WithExperimentOn(experiment.Charm) {
-		result, err := charmPromptTemplateSelection(ctx, clients)
-		if err != nil {
-			return create.Template{}, slackerror.ToSlackError(err)
-		}
-		if result.CategoryID == viewMoreSamples || result.TemplateRepo == viewMoreSamples {
-			selectedTemplate = viewMoreSamples
-		} else {
-			selectedTemplate = result.TemplateRepo
-		}
 	} else {
 		// Prompt for the category
 		promptForCategory := "Select an app:"
@@ -132,9 +121,6 @@ func promptTemplateSelection(cmd *cobra.Command, clients *shared.ClientFactory,
 
 		// Prompt to choose a category
 		selection, err := clients.IO.SelectPrompt(ctx, promptForCategory, titlesForCategory, iostreams.SelectPromptConfig{
-			Description: func(value string, index int) string {
-				return optionsForCategory[index].Description
-			},
 			Flag:     clients.Config.Flags.Lookup("template"),
 			Required: true,
 			Template: templateForCategory,
@@ -168,9 +154,6 @@ func promptTemplateSelection(cmd *cobra.Command, clients *shared.ClientFactory,
 
 		// Prompt to choose a template
 		selection, err := clients.IO.SelectPrompt(ctx, prompt, titles, iostreams.SelectPromptConfig{
-			Description: func(value string, index int) string {
-				return options[index].Description
-			},
 			Flag:     clients.Config.Flags.Lookup("template"),
 			Required: true,
 			Template: template,