@badgerclaw/connect 1.2.2 → 1.2.4

package/SETUP.md

@@ -97,8 +97,9 @@ Use these commands in any BadgerClaw room or DM where your bot is present.
 | Command | Description |
 |---------|-------------|
 | `/bot help` | Show all available commands |
-| `/bot talk on` | **Enable auto-reply** — bot responds to every message without needing an @mention. Great for 1-on-1 rooms. |
-| `/bot talk off` | **Disable auto-reply** — bot only responds when @mentioned. Use in busy group rooms. |
+| `/bot talk on` | **Enable auto-reply** — bot responds to every message without needing an @mention. If multiple bots are in the room, you'll be asked to specify which one. |
+| `/bot talk on @botname` | **Enable auto-reply for a specific bot** — use when multiple bots are in the room. |
+| `/bot talk off` | **Disable auto-reply for ALL bots** — kill switch. All bots in the room go quiet and only respond when @mentioned. |
 | `/bot add <name>` | Invite a bot to the current room (e.g. `/bot add jarvis`) |
 | `/bot list` | List all your bots and their connection status |
 
@@ -106,6 +107,7 @@ Use these commands in any BadgerClaw room or DM where your bot is present.
 
 - **New installs:** Auto-reply is **ON by default** in all rooms
 - **Per-room toggle:** `/bot talk on` and `/bot talk off` override the default for that specific room
+- **Multi-bot rooms:** If multiple bots are present, `/bot talk on` asks which bot to enable. `/bot talk off` silences all bots at once.
 - **@mentions always work:** Even with auto-reply off, the bot responds when @mentioned
 
 ---

package/package.json

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

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

@@ -80,21 +80,21 @@ export async function handleBotCommand(params: {
             "  Works in: Any room or DM",
             "",
             "/bot talk on",
-            "  Enable auto-reply mode. The bot will respond to every",
-            "  message in this room without needing an @mention.",
-            "  Perfect for 1-on-1 rooms with your AI assistant.",
+            "  Enable auto-reply for this bot. It will respond to",
+            "  every message without needing an @mention.",
+            "  If multiple bots are in the room, specify which one:",
+            "  /bot talk on @botname",
             "  Works in: Any room or DM",
             "",
             "/bot talk off",
-            "  Disable auto-reply mode. The bot will only respond",
-            "  when @mentioned. Use this in busy group rooms where",
-            "  you don't want the bot responding to everything.",
+            "  Disable auto-reply for ALL bots in this room.",
+            "  Bots will only respond when @mentioned.",
             "  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"),
         });
@@ -126,20 +125,70 @@ export async function handleBotCommand(params: {
       }
 
       case "talk": {
+        // Resolve bot members in the room
+        const botSuffix = "_bot:badger.signout.io";
+        let roomBots: string[] = [];
+        try {
+          const members = await client.getJoinedRoomMembers(roomId);
+          roomBots = members.filter((m: string) => m.includes(botSuffix) && m !== selfUserId);
+        } catch {
+          // If we can't list members, proceed as single-bot
+        }
+        const multipleBots = roomBots.length > 0; // other bots besides self
+
+        // Check if a specific bot was mentioned: /bot talk on @botname
+        const mentionArg = parts.slice(3).join(" ").trim();
+        const mentionedBot = mentionArg
+          ? mentionArg.startsWith("@") ? mentionArg : `@${mentionArg}`
+          : null;
+
+        // If a bot was mentioned and it's not us, ignore the command (let that bot handle it)
+        if (mentionedBot) {
+          const mentionLower = mentionedBot.toLowerCase();
+          const selfLower = selfUserId.toLowerCase();
+          // Match full userId or just the localpart
+          const selfLocalpart = selfLower.split(":")[0]; // @test_bot
+          if (!selfLower.startsWith(mentionLower) && !mentionLower.startsWith(selfLocalpart)) {
+            // Not addressed to us — ignore silently
+            return false;
+          }
+        }
+
         if (arg === "on") {
+          // Multiple bots + no specific mention → ask which bot
+          if (multipleBots && !mentionedBot) {
+            const allBots = [selfUserId, ...roomBots];
+            const botList = allBots
+              .map((b, i) => `  ${i + 1}. ${b.split(":")[0]}`)
+              .join("\n");
+            await client.sendMessage(roomId, {
+              msgtype: "m.text",
+              body: [
+                "🦡 Multiple bots in this room:",
+                "",
+                botList,
+                "",
+                "Specify which bot: /bot talk on @botname",
+              ].join("\n"),
+            });
+            return true;
+          }
+
           const config = loadRoomConfig();
-          // Store with lowercase key to match OpenClaw's lowercased groupId
           const normalizedRoomId = roomId.toLowerCase();
           config[normalizedRoomId] = { ...config[normalizedRoomId], autoReply: true };
           saveRoomConfig(config);
           setGroupActivation(roomId, "always");
+          const selfName = selfUserId.split(":")[0];
           await client.sendMessage(roomId, {
             msgtype: "m.text",
-            body: "✅ Auto-reply enabled — I'll respond to every message in this room.",
+            body: `✅ Auto-reply enabled for ${selfName} — I'll respond to every message in this room.`,
           });
           return true;
         }
+
         if (arg === "off") {
+          // Off is a kill switch — disable auto-reply regardless of how many bots
           const config = loadRoomConfig();
           const normalizedRoomId = roomId.toLowerCase();
           config[normalizedRoomId] = { ...config[normalizedRoomId], autoReply: false };
@@ -147,43 +196,88 @@ export async function handleBotCommand(params: {
           setGroupActivation(roomId, "mention");
           await client.sendMessage(roomId, {
             msgtype: "m.text",
-            body: "✅ Auto-reply disabled — I'll only respond when @mentioned.",
+            body: "✅ Auto-reply disabled for all bots — bots will only respond when @mentioned.",
           });
           return true;
         }
+
         await client.sendMessage(roomId, {
           msgtype: "m.text",
-          body: "Usage: /bot talk on  or  /bot talk off",
+          body: "Usage: /bot talk on [@botname]  or  /bot talk off",
         });
         return true;
       }
 
       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, {