Merge branch 'main' into ale-feat-subdir-flag

Author: srtaalej

.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.25.7
+      - image: cimg/go:1.26.0
     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

.github/workflows/tests.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
         with:
-          go-version: "1.25.7"
+          go-version: "1.26.0"
       - 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@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
         with:
-          go-version: "1.25.7"
+          go-version: "1.26.0"
       - name: Report health score
         uses: slackapi/slack-health-score@d58a419f15cdaff97e9aa7f09f95772830ab66f7 # v0.1.1
         with:

cmd/app/add.go

@@ -127,7 +127,7 @@ func RunAddCommand(ctx context.Context, clients *shared.ClientFactory, selection
 			}
 			clients.Config.Flags.Lookup("environment").Changed = true
 
-			clients.IO.PrintInfo(ctx, false, "\n"+style.Sectionf(style.TextSection{
+			clients.IO.PrintInfo(ctx, false, "\n%s", style.Sectionf(style.TextSection{
 				Emoji: "warning",
 				Text:  "Warning: Default App Environment",
 				Secondary: []string{

cmd/app/app.go

@@ -15,8 +15,6 @@
 package app
 
 import (
-	"fmt"
-
 	"github.com/slackapi/slack-cli/internal/cmdutil"
 	"github.com/slackapi/slack-cli/internal/shared"
 	"github.com/slackapi/slack-cli/internal/style"
@@ -51,13 +49,13 @@ func NewCommand(clients *shared.ClientFactory) *cobra.Command {
 			ctx := cmd.Context()
 			// DEPRECATED(semver:major): remove the "workspace" alias
 			if cmd.CalledAs() == "workspace" {
-				clients.IO.PrintInfo(ctx, false, fmt.Sprintf(
+				clients.IO.PrintInfo(ctx, false,
 					"\n%s It looks like you used %s. This command will be deprecated in an upcoming release.\n    You can now use %s instead of %s.\n ",
 					style.Emoji("bulb"),
 					style.Commandf("workspace", true),
 					style.Commandf("app", true),
 					style.Commandf("workspace", true),
-				))
+				)
 			}
 			return nil
 		},

cmd/app/link.go

@@ -214,7 +214,7 @@ func LinkExistingApp(ctx context.Context, clients *shared.ClientFactory, app *ty
 					fmt.Sprintf(`manifest.source: "%s"`, config.ManifestSourceRemote),
 				).
 				WithRootCause(err)
-			clients.IO.PrintError(ctx, slackErr.Error())
+			clients.IO.PrintError(ctx, "%s", slackErr.Error())
 		}
 	}
 

cmd/auth/login.go

@@ -18,6 +18,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/slackapi/slack-cli/internal/config"
+	"github.com/slackapi/slack-cli/internal/experiment"
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	authpkg "github.com/slackapi/slack-cli/internal/pkg/auth"
 	"github.com/slackapi/slack-cli/internal/shared"
@@ -109,7 +111,7 @@ func RunLoginCommand(clients *shared.ClientFactory, cmd *cobra.Command) (types.S
 			return types.SlackAuth{}, err
 		}
 		if selectedAuth.Token != "" {
-			printAuthSuccess(cmd, clients.IO, credentialsPath, selectedAuth.Token)
+			printAuthSuccess(cmd, clients.Config, clients.IO, credentialsPath, selectedAuth.Token)
 			printAuthNextSteps(ctx, clients)
 		}
 		return selectedAuth, err
@@ -119,14 +121,14 @@ func RunLoginCommand(clients *shared.ClientFactory, cmd *cobra.Command) (types.S
 	if err != nil {
 		return types.SlackAuth{}, err
 	} else {
-		printAuthSuccess(cmd, clients.IO, credentialsPath, selectedAuth.Token)
+		printAuthSuccess(cmd, clients.Config, clients.IO, credentialsPath, selectedAuth.Token)
 		printAuthNextSteps(ctx, clients)
 	}
 
 	return selectedAuth, nil
 }
 
-func printAuthSuccess(cmd *cobra.Command, IO iostreams.IOStreamer, credentialsPath string, token string) {
+func printAuthSuccess(cmd *cobra.Command, config *config.Config, IO iostreams.IOStreamer, credentialsPath string, token string) {
 	ctx := cmd.Context()
 
 	var secondaryLog string
@@ -136,7 +138,13 @@ func printAuthSuccess(cmd *cobra.Command, IO iostreams.IOStreamer, credentialsPa
 		secondaryLog = fmt.Sprintf("Service token:\n\n  %s\n\nMake sure to copy the token now and save it safely.", token)
 	}
 
-	IO.PrintInfo(ctx, false, "\n%s", style.Sectionf(style.TextSection{
+	// The legacy prompt leaves no blank line before the success message, so
+	// print one here. The Charm-based prompt already handles spacing.
+	if !config.WithExperimentOn(experiment.Charm) {
+		IO.PrintInfo(ctx, false, "")
+	}
+
+	IO.PrintInfo(ctx, false, "%s", style.Sectionf(style.TextSection{
 		Emoji:     "key",
 		Text:      "You've successfully authenticated!",
 		Secondary: []string{secondaryLog},
@@ -148,15 +156,15 @@ func printAuthSuccess(cmd *cobra.Command, IO iostreams.IOStreamer, credentialsPa
 func printAuthNextSteps(ctx context.Context, clients *shared.ClientFactory) {
 	project, _ := clients.SDKConfig.Exists()
 	if !project {
-		clients.IO.PrintInfo(ctx, false, style.Sectionf(style.TextSection{
+		clients.IO.PrintInfo(ctx, false, "%s", style.Sectionf(style.TextSection{
 			Emoji: "bulb",
 			Text:  fmt.Sprintf("Get started by creating a new app with %s", style.Commandf("create my-app", true)),
 			Secondary: []string{
 				fmt.Sprintf("Explore the details of available commands with %s", style.Commandf("help", false)),
 			},
 		}))
 	} else {
-		clients.IO.PrintInfo(ctx, false, style.Sectionf(style.TextSection{
+		clients.IO.PrintInfo(ctx, false, "%s", style.Sectionf(style.TextSection{
 			Emoji: "bulb",
 			Text:  fmt.Sprintf("Review existing installations of the app with %s", style.Commandf("app list", false)),
 			Secondary: []string{

cmd/auth/logout.go

@@ -212,11 +212,11 @@ func printLogoutSuccess(ctx context.Context, clients *shared.ClientFactory, auth
 	}
 
 	clients.IO.PrintTrace(ctx, slacktrace.AuthLogoutSuccess)
-	clients.IO.PrintInfo(ctx, false, fmt.Sprintf("\n%s", style.Sectionf(style.TextSection{
+	clients.IO.PrintInfo(ctx, false, "\n%s", style.Sectionf(style.TextSection{
 		Emoji:     "wastebasket",
 		Text:      revokedAuthText,
 		Secondary: logoutNextSteps,
-	})))
+	}))
 }
 
 // FormatAuthLabel returns a formatted auth label for user selection during logout

cmd/auth/revoke.go

@@ -72,9 +72,9 @@ func printRevokeSuccess(ctx context.Context, clients *shared.ClientFactory) {
 	}
 
 	clients.IO.PrintTrace(ctx, slacktrace.AuthRevokeSuccess)
-	clients.IO.PrintInfo(ctx, false, fmt.Sprintf("\n%s", style.Sectionf(style.TextSection{
+	clients.IO.PrintInfo(ctx, false, "\n%s", style.Sectionf(style.TextSection{
 		Emoji:     "wastebasket",
 		Text:      revokedAuthText,
 		Secondary: logoutNextSteps,
-	})))
+	}))
 }

cmd/datastore/count.go

@@ -147,7 +147,7 @@ func printCountResult(ctx context.Context, clients *shared.ClientFactory, countR
 	clients.IO.PrintTrace(ctx, slacktrace.DatastoreCountSuccess)
 	clients.IO.PrintTrace(ctx, slacktrace.DatastoreCountTotal, fmt.Sprintf("%d", countResult.Count))
 	clients.IO.PrintTrace(ctx, slacktrace.DatastoreCountDatastore, countResult.Datastore)
-	clients.IO.PrintInfo(ctx, false, style.Sectionf(style.TextSection{
+	clients.IO.PrintInfo(ctx, false, "%s", style.Sectionf(style.TextSection{
 		Emoji: "tada",
 		Text: fmt.Sprintf(
 			"Counted %d matching items from datastore: %s",
@@ -203,7 +203,7 @@ func promptDatastoreCountRequest(
 
 	// Display a hint for writing expressions
 	clients.IO.PrintInfo(ctx, false, "")
-	clients.IO.PrintInfo(ctx, false, style.Sectionf(style.TextSection{
+	clients.IO.PrintInfo(ctx, false, "%s", style.Sectionf(style.TextSection{
 		Emoji: "bulb",
 		Text:  "Expressions should use the following format",
 		Secondary: []string{

cmd/datastore/datastore.go

@@ -162,11 +162,11 @@ func printDatastoreExpressionMarshal(ctx context.Context, clients *shared.Client
 		return err
 	}
 	clients.IO.PrintInfo(ctx, false, "")
-	clients.IO.PrintInfo(ctx, false, style.Sectionf(style.TextSection{
+	clients.IO.PrintInfo(ctx, false, "%s", style.Sectionf(style.TextSection{
 		Emoji: "open_file_folder",
 		Text:  "This expression can be represented by the following JSON:",
 	}))
-	clients.IO.PrintInfo(ctx, false, style.Secondary(expression))
+	clients.IO.PrintInfo(ctx, false, "%s", style.Secondary(expression))
 	return nil
 }