@badgerclaw/connect 1.2.3 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@badgerclaw/connect",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "BadgerClaw channel plugin for OpenClaw",
   "type": "module",
   "dependencies": {

package/src/matrix/monitor/bot-commands.ts

@@ -92,9 +92,9 @@ export async function handleBotCommand(params: {
             "  Works in: Any room or DM",
             "",
             "/bot add <botname>",
-            "  Invite a bot to the current room. The bot username",
-            "  will be @<botname>_bot on this server.",
+            "  Invite a bot to the current room.",
             "  Example: /bot add jarvis → invites @jarvis_bot",
+            "  Also accepts: /bot add @jarvis_bot",
             "  Works in: Any room",
             "",
             "━━━ BotBadger DM Only ━━━",
@@ -116,9 +116,8 @@ export async function handleBotCommand(params: {
             "  Works in: Direct message with BotBadger only",
             "",
             "/bot list",
-            "  List all your bots and their connection status.",
-            "  🟢 Connected — bot is online and responding",
-            "  🔴 Not connected — bot needs pairing",
+            "  List all bots in this room.",
+            "  🟢 = this bot  🤖 = other bots",
             "  Works in: Any room or DM",
           ].join("\n"),
         });
@@ -158,7 +157,8 @@ export async function handleBotCommand(params: {
         if (arg === "on") {
           // Multiple bots + no specific mention → ask which bot
           if (multipleBots && !mentionedBot) {
-            const botList = [selfUserId, ...roomBots]
+            const allBots = [selfUserId, ...roomBots];
+            const botList = allBots
               .map((b, i) => `  ${i + 1}. ${b.split(":")[0]}`)
               .join("\n");
             await client.sendMessage(roomId, {
@@ -209,31 +209,75 @@ export async function handleBotCommand(params: {
       }
 
       case "add": {
-        const botName = arg;
-        if (!botName) {
+        let rawName = parts.slice(2).join(" ").trim();
+        if (!rawName) {
           await client.sendMessage(roomId, {
             msgtype: "m.text",
-            body: "Usage: /bot add <botname>",
+            body: "Usage: /bot add <botname>\nExample: /bot add jarvis  or  /bot add @jarvis_bot",
           });
           return true;
         }
-        const botUserId = `@${botName}_bot:badger.signout.io`;
+        // Normalize: strip @, strip _bot suffix, strip :server
+        rawName = rawName.replace(/^@/, "").split(":")[0].replace(/_bot$/i, "").toLowerCase();
+        const addBotUserId = `@${rawName}_bot:badger.signout.io`;
+        const addBotDisplay = `@${rawName}_bot`;
         try {
-          await client.inviteUser(botUserId, roomId);
+          await client.inviteUser(addBotUserId, roomId);
           await client.sendMessage(roomId, {
             msgtype: "m.text",
-            body: `✅ Invited ${botUserId} to this room.`,
+            body: `✅ Invited ${addBotDisplay} to this room.`,
           });
         } catch (err) {
           const msg = err instanceof Error ? err.message : String(err);
+          // Strip homeserver from error messages too
+          const cleanMsg = msg.replace(/:badger\.signout\.io/g, "");
           await client.sendMessage(roomId, {
             msgtype: "m.text",
-            body: `❌ Failed to invite ${botUserId}: ${msg}`,
+            body: `❌ Failed to invite ${addBotDisplay}: ${cleanMsg}`,
           });
         }
         return true;
       }
 
+      case "list": {
+        const botSuffix2 = "_bot:badger.signout.io";
+        let botsInRoom: string[] = [];
+        try {
+          const members = await client.getJoinedRoomMembers(roomId);
+          botsInRoom = members.filter((m: string) => m.includes(botSuffix2));
+        } catch {
+          botsInRoom = [selfUserId]; // At minimum, we know we're here
+        }
+
+        if (botsInRoom.length === 0) {
+          await client.sendMessage(roomId, {
+            msgtype: "m.text",
+            body: "No bots in this room.",
+          });
+          return true;
+        }
+
+        const botList = botsInRoom
+          .map((b) => {
+            const displayName = b.split(":")[0];
+            const isMe = b === selfUserId;
+            return `  ${isMe ? "🟢" : "🤖"} ${displayName}${isMe ? " (me)" : ""}`;
+          })
+          .join("\n");
+
+        await client.sendMessage(roomId, {
+          msgtype: "m.text",
+          body: [
+            "🦡 Bots in this room:",
+            "",
+            botList,
+            "",
+            `${botsInRoom.length} bot${botsInRoom.length === 1 ? "" : "s"} total`,
+          ].join("\n"),
+        });
+        return true;
+      }
+
       default: {
         // Unknown /bot command — show help hint
         await client.sendMessage(roomId, {