From d5f2d952735202042b9f076eaf32dc98c8f2672c Mon Sep 17 00:00:00 2001
From: Joshua Blum <joshua.blum@zoom.us>
Date: Tue, 28 Jul 2026 12:58:39 -0400
Subject: [PATCH 1/2] Fix command advertisements

---
 advertisement.go | 13 +++++++++----
 bot_test.go      | 11 +++++------
 keybot/keybot.go | 19 +++++++++----------
 keybot/winbot.go | 15 +++++++--------
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/advertisement.go b/advertisement.go
index 75b5f45..6fb0023 100644
--- a/advertisement.go
+++ b/advertisement.go
@@ -18,18 +18,16 @@ func (b *Bot) AddAdvertisements(commands ...chat1.UserBotCommandInput) {
 
 func (b *Bot) AdvertisedCommands() []chat1.UserBotCommandInput {
 	commands := []chat1.UserBotCommandInput{{
-		Name:                "help",
+		Name:                b.advertisedCommandName("help"),
 		Description:         "Show available commands",
-		Usage:               fmt.Sprintf("!%s help", b.name),
 		ExtendedDescription: b.helpExtendedDescription(),
 	}}
 
 	for _, trigger := range b.triggers() {
 		command := b.commands[trigger]
 		commands = append(commands, chat1.UserBotCommandInput{
-			Name:        trigger,
+			Name:        b.advertisedCommandName(trigger),
 			Description: command.Description(),
-			Usage:       fmt.Sprintf("!%s %s", b.name, trigger),
 		})
 	}
 
@@ -37,11 +35,18 @@ func (b *Bot) AdvertisedCommands() []chat1.UserBotCommandInput {
 	slices.SortFunc(extras, func(a, b chat1.UserBotCommandInput) int {
 		return strings.Compare(a.Name, b.Name)
 	})
+	for i := range extras {
+		extras[i].Name = b.advertisedCommandName(extras[i].Name)
+	}
 	commands = append(commands, extras...)
 
 	return commands
 }
 
+func (b *Bot) advertisedCommandName(command string) string {
+	return fmt.Sprintf("%s %s", b.name, command)
+}
+
 func (b *Bot) advertiseCommands() error {
 	advertiser, ok := b.backend.(commandAdvertiser)
 	if !ok {
diff --git a/bot_test.go b/bot_test.go
index f2bcfaf..da3c3c2 100644
--- a/bot_test.go
+++ b/bot_test.go
@@ -119,30 +119,29 @@ func TestAdvertisedCommands(t *testing.T) {
 	bot.AddAdvertisements(chat1.UserBotCommandInput{
 		Name:        "build",
 		Description: "Build things",
-		Usage:       "!testbot build <target>",
+		Usage:       "<target>",
 	})
 
 	commands := bot.AdvertisedCommands()
 	if len(commands) != 3 {
 		t.Fatalf("expected 3 advertised commands, got %d", len(commands))
 	}
-	if commands[0].Name != "help" {
+	if commands[0].Name != "testbot help" {
 		t.Fatalf("expected help command first, got %q", commands[0].Name)
 	}
 	if commands[0].ExtendedDescription == nil || commands[0].ExtendedDescription.DesktopBody != "help body" {
 		t.Fatalf("unexpected help extended description: %+v", commands[0].ExtendedDescription)
 	}
 	if commands[1] != (chat1.UserBotCommandInput{
-		Name:        "date",
+		Name:        "testbot date",
 		Description: "Show the current date",
-		Usage:       "!testbot date",
 	}) {
 		t.Fatalf("unexpected builtin command: %+v", commands[1])
 	}
 	if commands[2] != (chat1.UserBotCommandInput{
-		Name:        "build",
+		Name:        "testbot build",
 		Description: "Build things",
-		Usage:       "!testbot build <target>",
+		Usage:       "<target>",
 	}) {
 		t.Fatalf("unexpected extra command: %+v", commands[2])
 	}
diff --git a/keybot/keybot.go b/keybot/keybot.go
index c3bc65d..aff9609 100644
--- a/keybot/keybot.go
+++ b/keybot/keybot.go
@@ -325,16 +325,15 @@ func (k *keybot) Help(bot *slackbot.Bot) string {
 }
 
 func (k *keybot) Advertisements(bot *slackbot.Bot) []chat1.UserBotCommandInput {
-	prefix := "!" + bot.Name()
 	return []chat1.UserBotCommandInput{
-		{Name: "build", Description: "Build darwin, mobile, android, or ios artifacts", Usage: prefix + " build <darwin|mobile|android|ios> [flags]"},
-		{Name: "cancel", Description: "Cancel a launchd job by label", Usage: prefix + " cancel <label>"},
-		{Name: "dumplog", Description: "Show the log file for a launchd job", Usage: prefix + " dumplog <label>"},
-		{Name: "gclean", Description: "Clean the go/go-ios/go-android repos", Usage: prefix + " gclean"},
-		{Name: "gdiff", Description: "Show the git diff for a repo under $GOPATH/src", Usage: prefix + " gdiff <repo>"},
-		{Name: "nodeModuleClean", Description: "Clean the ios/android node_modules", Usage: prefix + " nodeModuleClean"},
-		{Name: "release", Description: "Promote or mark releases as broken", Usage: prefix + " release <promote|broken> ..."},
-		{Name: "smoketest", Description: "Set smoketesting status for a build", Usage: prefix + " smoketest --build-a <id> --platform <name> --enable <bool> --max-testers <n>"},
-		{Name: "upgrade", Description: "Upgrade a package", Usage: prefix + " upgrade <name>"},
+		{Name: "build", Description: "Build darwin, mobile, android, or ios artifacts", Usage: "<darwin|mobile|android|ios> [flags]"},
+		{Name: "cancel", Description: "Cancel a launchd job by label", Usage: "<label>"},
+		{Name: "dumplog", Description: "Show the log file for a launchd job", Usage: "<label>"},
+		{Name: "gclean", Description: "Clean the go/go-ios/go-android repos"},
+		{Name: "gdiff", Description: "Show the git diff for a repo under $GOPATH/src", Usage: "<repo>"},
+		{Name: "nodeModuleClean", Description: "Clean the ios/android node_modules"},
+		{Name: "release", Description: "Promote or mark releases as broken", Usage: "<promote|broken> ..."},
+		{Name: "smoketest", Description: "Set smoketesting status for a build", Usage: "--build-a <id> --platform <name> --enable <bool> --max-testers <n>"},
+		{Name: "upgrade", Description: "Upgrade a package", Usage: "<name>"},
 	}
 }
diff --git a/keybot/winbot.go b/keybot/winbot.go
index 61c1bf8..f9daea0 100644
--- a/keybot/winbot.go
+++ b/keybot/winbot.go
@@ -449,15 +449,14 @@ func (d *winbot) Help(bot *slackbot.Bot) string {
 }
 
 func (d *winbot) Advertisements(bot *slackbot.Bot) []chat1.UserBotCommandInput {
-	prefix := "!" + bot.Name()
 	return []chat1.UserBotCommandInput{
-		{Name: "build", Description: "Start a windows build", Usage: prefix + " build [--test] [--client-commit <sha>] [--kbfs-commit <sha>] [--updater-commit <sha>] [--skip-ci] [--smoke] [--dev-cert]"},
-		{Name: "cancel", Description: "Cancel the current windows build", Usage: prefix + " cancel"},
-		{Name: "dumplog", Description: "Show the last windows build log file", Usage: prefix + " dumplog"},
-		{Name: "gclean", Description: "Clean a repo under $GOPATH/src", Usage: prefix + " gclean <repo>"},
-		{Name: "gdiff", Description: "Show the git diff for a repo under $GOPATH/src", Usage: prefix + " gdiff <repo>"},
-		{Name: "restart", Description: "Quit and let the calling script restart the bot", Usage: prefix + " restart"},
-		{Name: "startAutoTimer", Description: "Start or stop the automatic build timer", Usage: prefix + " startAutoTimer [--interval <hours>] [--startHour <hour>] [--delay <hours>]"},
+		{Name: "build", Description: "Start a windows build", Usage: "[--test] [--client-commit <sha>] [--kbfs-commit <sha>] [--updater-commit <sha>] [--skip-ci] [--smoke] [--dev-cert]"},
+		{Name: "cancel", Description: "Cancel the current windows build"},
+		{Name: "dumplog", Description: "Show the last windows build log file"},
+		{Name: "gclean", Description: "Clean a repo under $GOPATH/src", Usage: "<repo>"},
+		{Name: "gdiff", Description: "Show the git diff for a repo under $GOPATH/src", Usage: "<repo>"},
+		{Name: "restart", Description: "Quit and let the calling script restart the bot"},
+		{Name: "startAutoTimer", Description: "Start or stop the automatic build timer", Usage: "[--interval <hours>] [--startHour <hour>] [--delay <hours>]"},
 	}
 }
 

From 5f8831000ece3490b3c1ad156c9104332ae463b9 Mon Sep 17 00:00:00 2001
From: Joshua Blum <joshua.blum@zoom.us>
Date: Tue, 28 Jul 2026 13:01:00 -0400
Subject: [PATCH 2/2] x

---
 keybot/keybot.go | 2 +-
 keybot/main.go   | 4 ++--
 keybot/winbot.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keybot/keybot.go b/keybot/keybot.go
index aff9609..393ee41 100644
--- a/keybot/keybot.go
+++ b/keybot/keybot.go
@@ -324,7 +324,7 @@ func (k *keybot) Help(bot *slackbot.Bot) string {
 	return out
 }
 
-func (k *keybot) Advertisements(bot *slackbot.Bot) []chat1.UserBotCommandInput {
+func (k *keybot) Advertisements() []chat1.UserBotCommandInput {
 	return []chat1.UserBotCommandInput{
 		{Name: "build", Description: "Build darwin, mobile, android, or ios artifacts", Usage: "<darwin|mobile|android|ios> [flags]"},
 		{Name: "cancel", Description: "Cancel a launchd job by label", Usage: "<label>"},
diff --git a/keybot/main.go b/keybot/main.go
index 006bfc4..3463641 100644
--- a/keybot/main.go
+++ b/keybot/main.go
@@ -66,7 +66,7 @@ func addBasicCommands(bot *slackbot.Bot) {
 type extension interface {
 	Run(b *slackbot.Bot, channel string, args []string) (string, error)
 	Help(bot *slackbot.Bot) string
-	Advertisements(bot *slackbot.Bot) []chat1.UserBotCommandInput
+	Advertisements() []chat1.UserBotCommandInput
 }
 
 func main() {
@@ -99,7 +99,7 @@ func main() {
 	}
 	bot.SetDefault(slackbot.NewFuncCommand(runFn, "Extension", bot.Config()))
 	bot.SetHelp(bot.HelpMessage() + "\n\n" + ext.Help(bot))
-	bot.AddAdvertisements(ext.Advertisements(bot)...)
+	bot.AddAdvertisements(ext.Advertisements()...)
 
 	bot.SendMessage("I'm running.", channel)
 	if err := bot.Listen(); err != nil {
diff --git a/keybot/winbot.go b/keybot/winbot.go
index f9daea0..66e2836 100644
--- a/keybot/winbot.go
+++ b/keybot/winbot.go
@@ -448,7 +448,7 @@ func (d *winbot) Help(bot *slackbot.Bot) string {
 	return out
 }
 
-func (d *winbot) Advertisements(bot *slackbot.Bot) []chat1.UserBotCommandInput {
+func (d *winbot) Advertisements() []chat1.UserBotCommandInput {
 	return []chat1.UserBotCommandInput{
 		{Name: "build", Description: "Start a windows build", Usage: "[--test] [--client-commit <sha>] [--kbfs-commit <sha>] [--updater-commit <sha>] [--skip-ci] [--smoke] [--dev-cert]"},
 		{Name: "cancel", Description: "Cancel the current windows build"},