fix(telegram): grouped help output, reorder command menu

Author: nnemirovsky

internal/telegram/approval.go

@@ -207,12 +207,12 @@ func (tc *TelegramChannel) Notify(_ context.Context, text string) error {
 // registerCommands sets the bot's command menu via Telegram's setMyCommands API.
 func (tc *TelegramChannel) registerCommands() {
 	cmds := []tgbotapi.BotCommand{
-		{Command: "start", Description: "Show welcome message"},
-		{Command: "help", Description: "Show available commands"},
 		{Command: "status", Description: "Show proxy status"},
 		{Command: "policy", Description: "Manage policy rules"},
 		{Command: "cred", Description: "Manage credentials"},
 		{Command: "audit", Description: "Show audit log entries"},
+		{Command: "start", Description: "Show welcome message"},
+		{Command: "help", Description: "Show available commands"},
 	}
 	cfg := tgbotapi.NewSetMyCommands(cmds...)
 	if _, err := tc.api.Request(cfg); err != nil {

internal/telegram/approval_test.go

@@ -549,7 +549,7 @@ func TestStartStop(t *testing.T) {
 		// Look for the help response (sent after getMe during init).
 		helpFound := false
 		for _, m := range msgs {
-			if strings.Contains(m.Text, "Available commands") {
+			if strings.Contains(m.Text, "Policy") {
 				helpFound = true
 				break
 			}

internal/telegram/commands.go

@@ -665,24 +665,24 @@ func (h *CommandHandler) handleStart() string {
 }
 
 func (h *CommandHandler) handleHelp() string {
-	help := `Available commands:
+	help := `Policy
+/policy show | /policy allow <dest> | /policy deny <dest> | /policy remove <id>
 
-/policy show - List current rules
-/policy allow <dest> - Add allow rule
-/policy deny <dest> - Add deny rule
-/policy remove <id> - Remove rule by ID
-/status - Show proxy status
-/audit recent [N] - Show last N audit entries
-/help - Show this message`
+Monitoring
+/status - Proxy status
+/audit recent [N] - Last N audit entries`
 
 	if h.vault != nil {
 		help += `
 
-/cred list - List stored credentials
-/cred add <name> <value> [--env-var VAR] - Add credential
-/cred rotate <name> <value> - Rotate credential
-/cred remove <name> - Remove credential`
+Credentials
+/cred list | /cred add <name> <value> [--env-var VAR]
+/cred rotate <name> <value> | /cred remove <name>`
 	}
+
+	help += `
+
+More: /start for welcome, /help for this message`
 	return help
 }