Merge branch 'main' into mwbrooks-table-test-consistent-p2-map-pattern-align

mwbrooks · mwbrooks · commit 998080a2606a · 2026-01-29T15:10:14.000-08:00
diff --git a/.claude/settings.json b/.claude/settings.json
@@ -5,7 +5,7 @@
       "Bash(gofmt:*)",
       "Bash(make build:*)",
       "Bash(make build-ci:*)",
-      "Bash(make lint:*)",
+      "Bash(make lint:*)"
     ]
   }
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,6 +15,7 @@
     "deno",
     "iostreams",
     "opentracing",
+    "pyproject",
     "safeexec",
     "slackcontext",
     "slackdeps",
diff --git a/cmd/app/settings.go b/cmd/app/settings.go
@@ -45,7 +45,7 @@ func NewSettingsCommand(clients *shared.ClientFactory) *cobra.Command {
 		}, "\n"),
 		Example: style.ExampleCommandsf([]style.ExampleCommand{
 			{
-				Meaning: "Open app settings for a prompted app",
+				Meaning: "Open app settings dashboard",
 				Command: "app settings",
 			},
 			{
@@ -65,11 +65,12 @@ func NewSettingsCommand(clients *shared.ClientFactory) *cobra.Command {
 }
 
 // appSettingsCommandPreRunE determines if the command can be run in a project
+// or if the command is run outside of a project
 func appSettingsCommandPreRunE(clients *shared.ClientFactory, cmd *cobra.Command, args []string) error {
 	ctx := cmd.Context()
 	err := cmdutil.IsValidProjectDirectory(clients)
 	if err != nil {
-		return err
+		return nil
 	}
 	// Allow the force flag to ignore hosted apps and try to open app settings
 	if clients.Config.ForceFlag {
@@ -98,6 +99,28 @@ func appSettingsCommandRunE(clients *shared.ClientFactory, cmd *cobra.Command, a
 
 	app, err := settingsAppSelectPromptFunc(ctx, clients, prompts.ShowAllEnvironments, prompts.ShowInstalledAndUninstalledApps)
 	if err != nil {
+		// If no apps exist, open the list of all apps known to the developer
+		if slackerror.Is(err, slackerror.ErrInstallationRequired) {
+			host := clients.API().Host()
+			parsed, err := url.Parse(host)
+			if err != nil {
+				return err
+			}
+			parsed.Host = "api." + parsed.Host
+			settingsURL := fmt.Sprintf("%s/apps", parsed.String())
+
+			clients.IO.PrintInfo(ctx, false, "\n%s", style.Sectionf(style.TextSection{
+				Emoji: "house",
+				Text:  "App Settings",
+				Secondary: []string{
+					settingsURL,
+				},
+			}))
+			clients.Browser().OpenURL(settingsURL)
+
+			clients.IO.PrintTrace(ctx, slacktrace.AppSettingsSuccess, settingsURL)
+			return nil
+		}
 		return err
 	}
 	host := clients.API().Host()
diff --git a/cmd/app/settings_test.go b/cmd/app/settings_test.go
@@ -32,8 +32,28 @@ import (
 
 func Test_App_SettingsCommand(t *testing.T) {
 	testutil.TableTestCommand(t, testutil.CommandTests{
-		"requires a valid project directory": {
-			ExpectedError: slackerror.New(slackerror.ErrInvalidAppDirectory),
+		"opens app listing page when not in a project directory": {
+			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
+				appSelectMock := prompts.NewAppSelectMock()
+				appSelectMock.On(
+					"AppSelectPrompt",
+					mock.Anything,
+					mock.Anything,
+					prompts.ShowAllEnvironments,
+					prompts.ShowInstalledAndUninstalledApps,
+				).Return(
+					prompts.SelectedApp{},
+					slackerror.New(slackerror.ErrInstallationRequired),
+				)
+				settingsAppSelectPromptFunc = appSelectMock.AppSelectPrompt
+				cm.API.On("Host").Return("https://slack.com")
+			},
+			ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
+				expectedURL := "https://api.slack.com/apps"
+				cm.Browser.AssertCalled(t, "OpenURL", expectedURL)
+				cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.AppSettingsStart, mock.Anything)
+				cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.AppSettingsSuccess, []string{expectedURL})
+			},
 		},
 		"errors for rosi applications": {
 			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
@@ -113,7 +133,40 @@ func Test_App_SettingsCommand(t *testing.T) {
 				cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.AppSettingsSuccess, []string{expectedURL})
 			},
 		},
-		"requires an existing application": {
+		"opens app listing page when no apps exist": {
+			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
+				cf.SDKConfig.WorkingDirectory = "."
+				projectConfigMock := config.NewProjectConfigMock()
+				projectConfigMock.On(
+					"GetManifestSource",
+					mock.Anything,
+				).Return(
+					config.ManifestSourceRemote,
+					nil,
+				)
+				cm.Config.ProjectConfig = projectConfigMock
+				appSelectMock := prompts.NewAppSelectMock()
+				appSelectMock.On(
+					"AppSelectPrompt",
+					mock.Anything,
+					mock.Anything,
+					prompts.ShowAllEnvironments,
+					prompts.ShowInstalledAndUninstalledApps,
+				).Return(
+					prompts.SelectedApp{},
+					slackerror.New(slackerror.ErrInstallationRequired),
+				)
+				settingsAppSelectPromptFunc = appSelectMock.AppSelectPrompt
+				cm.API.On("Host").Return("https://slack.com")
+			},
+			ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
+				expectedURL := "https://api.slack.com/apps"
+				cm.Browser.AssertCalled(t, "OpenURL", expectedURL)
+				cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.AppSettingsStart, mock.Anything)
+				cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.AppSettingsSuccess, []string{expectedURL})
+			},
+		},
+		"opens app listing page for development environment when no apps exist": {
 			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
 				cf.SDKConfig.WorkingDirectory = "."
 				projectConfigMock := config.NewProjectConfigMock()
@@ -137,8 +190,14 @@ func Test_App_SettingsCommand(t *testing.T) {
 					slackerror.New(slackerror.ErrInstallationRequired),
 				)
 				settingsAppSelectPromptFunc = appSelectMock.AppSelectPrompt
+				cm.API.On("Host").Return("https://dev1234.slack.com")
+			},
+			ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
+				expectedURL := "https://api.dev1234.slack.com/apps"
+				cm.Browser.AssertCalled(t, "OpenURL", expectedURL)
+				cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.AppSettingsStart, mock.Anything)
+				cm.IO.AssertCalled(t, "PrintTrace", mock.Anything, slacktrace.AppSettingsSuccess, []string{expectedURL})
 			},
-			ExpectedError: slackerror.New(slackerror.ErrInstallationRequired),
 		},
 		"opens the url to app settings of an app in production": {
 			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
diff --git a/cmd/project/create_template.go b/cmd/project/create_template.go
@@ -82,12 +82,12 @@ func getSelectionOptionsForCategory(clients *shared.ClientFactory) []promptObjec
 			Repository: "slack-cli#getting-started",
 		},
 		{
-			Title:      fmt.Sprintf("Automation app %s", style.Secondary("Custom steps and workflows")),
-			Repository: "slack-cli#automation-apps",
+			Title:      fmt.Sprintf("AI Agent app %s", style.Secondary("Slack agents and assistants")),
+			Repository: "slack-cli#ai-apps",
 		},
 		{
-			Title:      fmt.Sprintf("AI app %s %s", style.Secondary("Slack agents and assistants"), style.Emoji("sparkles")),
-			Repository: "slack-cli#ai-apps",
+			Title:      fmt.Sprintf("Automation app %s", style.Secondary("Custom steps and workflows")),
+			Repository: "slack-cli#automation-apps",
 		},
 		{
 			Title:      "View more samples",
diff --git a/cmd/project/init.go b/cmd/project/init.go
@@ -47,7 +47,7 @@ func NewInitCommand(clients *shared.ClientFactory) *cobra.Command {
 			"Adds the Slack CLI hooks dependency to your project:",
 			"- Deno:    Unsupported",
 			"- Node.js: Updates package.json",
-			"- Python:  Updates requirements.txt",
+			"- Python:  Updates requirements.txt or pyproject.toml",
 			"",
 			"Installs your project dependencies when supported:",
 			"- Deno:    Supported",
diff --git a/docs/guides/using-environment-variables-with-the-slack-cli.md b/docs/guides/using-environment-variables-with-the-slack-cli.md
@@ -22,7 +22,7 @@ MY_ENV_VAR=asdf1234
 
 Note that changes to your `.env` file will be reflected when you restart your local development server.
 
-While the `.env` file should **never** be committed to source control for security reasons, you can see a sample `.env` file we've included in the [Timesheet approval sample app](https://github.com/slack-samples/deno-timesheet-approval) and the [Incident management sample app](https://github.com/slack-samples/deno-incident-management). 
+While the `.env` file should **never** be committed to source control for security reasons, you can see a sample `.env` file we've included in the [Timesheet approval sample app](https://github.com/slack-samples/deno-timesheet-approval) and the [Incident management sample app](https://github.com/slack-samples/deno-incident-management).
 
 ### Storing deployed environment variables {#deployed-env-vars}
 
@@ -40,7 +40,7 @@ If your token contains non-alphanumeric characters, wrap it in quotes like this:
 slack env add SLACK_API_URL "https://dev<yournumber>.slack.com/api/"
 ```
 
-Your environment variables are always encrypted before being stored on our servers and will be automatically decrypted when you use them&mdash;including when listing environment variables with `slack env list`. 
+Your environment variables are always encrypted before being stored on our servers and will be automatically decrypted when you use them&mdash;including when listing environment variables with `slack env list`.
 
 ### Access variables from within function {#access-function}
 
@@ -108,7 +108,7 @@ export default Manifest({
   outgoingDomains: [
     Deno.env.get("CHATBOT_API_URL")!,
   ],
-  botScopes: ["commands", "chat:write", "chat:write.public"],
+  botScopes: ["commands", "chat:write"],
 });
 ```
 
@@ -134,7 +134,7 @@ With this addition, running `slack deploy` without defining a value for `CHATBOT
 
 ## Enabling debug mode {#debug}
 
-The included environment variable `SLACK_DEBUG` can enable a basic debug mode. Set `SLACK_DEBUG` to `true` to have all function-related payloads logged. 
+The included environment variable `SLACK_DEBUG` can enable a basic debug mode. Set `SLACK_DEBUG` to `true` to have all function-related payloads logged.
 
 For local apps, add the following to your `.env` file:
 
diff --git a/go.mod b/go.mod
@@ -15,6 +15,7 @@ require (
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/oliamb/cutter v0.2.2
 	github.com/opentracing/opentracing-go v1.2.0
+	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/pkg/errors v0.9.1
 	github.com/radovskyb/watcher v1.0.7
diff --git a/go.sum b/go.sum
@@ -114,6 +114,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pjbgf/sha1cd v0.5.0 h1:a+UkboSi1znleCDUNT3M5YxjOnN1fz2FhN48FlwCxs0=
 github.com/pjbgf/sha1cd v0.5.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
diff --git a/internal/goutils/strings_test.go b/internal/goutils/strings_test.go
@@ -326,8 +326,8 @@ func Test_RedactPII(t *testing.T) {
 		},
 		{
 			name:     "Escape sensitive data from mock HTTP response",
-			text:     `{"ok":true,"app_id":"A123","credentials":{"client_id":"123","client_secret":"123","verification_token":"123","signing_secret":"123"},"oauth_authorize_url":"123":\/\/slack.com\/oauth\/v2\/authorize?client_id=123&scope=commands,chat:write,chat:write.public"}`,
-			expected: `{"ok":true,"app_id":"A123","credentials":{"client_id":"...","client_secret":"...","verification_token":"...","signing_secret":"..."},"oauth_authorize_url":"...":\/\/slack.com\/oauth\/v2\/authorize?client_id=...&scope=commands,chat:write,chat:write.public"}`,
+			text:     `{"ok":true,"app_id":"A123","credentials":{"client_id":"123","client_secret":"123","verification_token":"123","signing_secret":"123"},"oauth_authorize_url":"123":\/\/slack.com\/oauth\/v2\/authorize?client_id=123&scope=commands,chat:write"}`,
+			expected: `{"ok":true,"app_id":"A123","credentials":{"client_id":"...","client_secret":"...","verification_token":"...","signing_secret":"..."},"oauth_authorize_url":"...":\/\/slack.com\/oauth\/v2\/authorize?client_id=...&scope=commands,chat:write"}`,
 		},
 		{
 			name:     "Escape from `Command` for external-auth add-secret",
diff --git a/internal/runtime/python/python.go b/internal/runtime/python/python.go
diff --git a/internal/runtime/python/python_test.go b/internal/runtime/python/python_test.go
diff --git a/test/testdata/manifest-sdk-app-name.ts b/test/testdata/manifest-sdk-app-name.ts
diff --git a/test/testdata/manifest-sdk.ts b/test/testdata/manifest-sdk.ts

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"Bash(gofmt:*)",`
`6`	`6`	`"Bash(make build:*)",`
`7`	`7`	`"Bash(make build-ci:*)",`
`8`		`- "Bash(make lint:*)",`
	`8`	`+ "Bash(make lint:*)"`
`9`	`9`	`]`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,12 @@ func getSelectionOptionsForCategory(clients *shared.ClientFactory) []promptObjec`
`82`	`82`	`Repository: "slack-cli#getting-started",`
`83`	`83`	`},`
`84`	`84`	`{`
`85`		`- Title: fmt.Sprintf("Automation app %s", style.Secondary("Custom steps and workflows")),`
`86`		`- Repository: "slack-cli#automation-apps",`
	`85`	`+ Title: fmt.Sprintf("AI Agent app %s", style.Secondary("Slack agents and assistants")),`
	`86`	`+ Repository: "slack-cli#ai-apps",`
`87`	`87`	`},`
`88`	`88`	`{`
`89`		`- Title: fmt.Sprintf("AI app %s %s", style.Secondary("Slack agents and assistants"), style.Emoji("sparkles")),`
`90`		`- Repository: "slack-cli#ai-apps",`
	`89`	`+ Title: fmt.Sprintf("Automation app %s", style.Secondary("Custom steps and workflows")),`
	`90`	`+ Repository: "slack-cli#automation-apps",`
`91`	`91`	`},`
`92`	`92`	`{`
`93`	`93`	`Title: "View more samples",`
Original file line number	Diff line number	Diff line change
`@@ -326,8 +326,8 @@ func Test_RedactPII(t *testing.T) {`
`326`	`326`	`},`
`327`	`327`	`{`
`328`	`328`	`name: "Escape sensitive data from mock HTTP response",`
`329`		- text: `{"ok":true,"app_id":"A123","credentials":{"client_id":"123","client_secret":"123","verification_token":"123","signing_secret":"123"},"oauth_authorize_url":"123":\/\/slack.com\/oauth\/v2\/authorize?client_id=123&scope=commands,chat:write,chat:write.public"}`,
`330`		- expected: `{"ok":true,"app_id":"A123","credentials":{"client_id":"...","client_secret":"...","verification_token":"...","signing_secret":"..."},"oauth_authorize_url":"...":\/\/slack.com\/oauth\/v2\/authorize?client_id=...&scope=commands,chat:write,chat:write.public"}`,
	`329`	+ text: `{"ok":true,"app_id":"A123","credentials":{"client_id":"123","client_secret":"123","verification_token":"123","signing_secret":"123"},"oauth_authorize_url":"123":\/\/slack.com\/oauth\/v2\/authorize?client_id=123&scope=commands,chat:write"}`,
	`330`	+ expected: `{"ok":true,"app_id":"A123","credentials":{"client_id":"...","client_secret":"...","verification_token":"...","signing_secret":"..."},"oauth_authorize_url":"...":\/\/slack.com\/oauth\/v2\/authorize?client_id=...&scope=commands,chat:write"}`,
`331`	`331`	`},`
`332`	`332`	`{`
`333`	`333`	name: "Escape from `Command` for external-auth add-secret",