@badgerclaw/connect 1.2.1 → 1.3.1

package/SETUP.md

@@ -6,6 +6,7 @@ Connect your OpenClaw AI agent to BadgerClaw encrypted chat rooms.
 
 - **BadgerClaw iOS app** installed and logged in
 - **OpenClaw** installed on your machine (`npm install -g openclaw`)
+- Both on the same network (not required, just for initial setup)
 
 ---
 
@@ -13,24 +14,28 @@ Connect your OpenClaw AI agent to BadgerClaw encrypted chat rooms.
 
 Open the BadgerClaw app on your phone.
 
-1. Open any room or DM with BotBadger
-2. Type: `/bot new`
-3. Follow the guided flow to set a bot name and username
-4. BotBadger responds with a pairing code:
+1. Open any room or DM
+2. Type: `/bot create <name>`
+   - Example: `/bot create jarvis`
+3. BotBadger responds with:
 
 ```
 🦡 Bot created!
 
 Name: jarvis
+ID: @abc123_jarvis_bot:badger.signout.io
+
 Connect to OpenClaw:
+  openclaw plugins install @badgerclaw/connect
   openclaw badgerclaw connect BCK-A8F3-X9K2
 
 Code expires in 24 hours.
+Run /bot pair jarvis to generate a new code.
 ```
 
-5. **Copy the pairing code** (BCK-XXXX-XXXX)
+4. **Copy the pairing code** (BCK-XXXX-XXXX)
 
-> **Need a new code?** Type `/bot pair <name>` to regenerate.
+> **Need a new code?** Type `/bot pair jarvis` to regenerate.
 
 ---
 
@@ -39,42 +44,38 @@ Code expires in 24 hours.
 On your machine (Mac, PC, Linux, Pi), run:
 
 ```bash
-openclaw plugins install @badgerclaw/connect
-```
-
-Or install from source:
-
-```bash
+# From GitHub (current method)
 git clone https://github.com/darkstaar4/badgerclaw-plugin.git
 openclaw plugins install ./badgerclaw-plugin
+
+# From npm (coming soon)
+# openclaw plugins install @badgerclaw/connect
 ```
 
 ---
 
 ## Step 3: Connect with Pairing Code
 
-```bash
-openclaw badgerclaw connect BCK-XXXX-XXXX
-```
-
-Or run the full configure wizard:
+Run the OpenClaw configure wizard:
 
 ```bash
 openclaw configure
 ```
 
-The plugin automatically:
-- Validates the code with BadgerClaw servers
-- Retrieves your bot's credentials
-- Enables end-to-end encryption
-- Configures auto-join for room invites
-- Sets up auto-reply in group chats
+1. Select **BadgerClaw** as your channel
+2. Enter your pairing code: `BCK-XXXX-XXXX`
+3. The plugin automatically:
+   - Validates the code with BadgerClaw servers
+   - Retrieves your bot's credentials
+   - Enables end-to-end encryption
+   - Configures auto-join for room invites
+4. Done! Your agent is connected.
 
 ---
 
 ## Step 4: Start Chatting
 
-Restart the OpenClaw gateway:
+Restart the OpenClaw gateway to apply the new config:
 
 ```bash
 openclaw gateway restart
@@ -82,154 +83,31 @@ openclaw gateway restart
 
 Now in the BadgerClaw app:
 
-1. **DM your bot** — find it in your contacts and send a message
-2. **Add to a room** — type `/bot add <name>` in any room
+1. **DM your bot** — find it in your contacts (`@xxx_jarvis_bot:badger.signout.io`) and send a message
+2. **Add to a room** — type `/bot add @jarvis` in any room
 3. **Add to a Space** — add the bot to any room inside a Space
 
-Your OpenClaw agent will receive messages and respond — fully end-to-end encrypted.
-
----
-
-## Bot Commands
-
-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 add <name>` | Invite a bot to the current room (e.g. `/bot add jarvis`) |
-| `/bot list` | List all your bots and their connection status |
-
-### How Auto-Reply Works
-
-- **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
-- **@mentions always work:** Even with auto-reply off, the bot responds when @mentioned
+Your OpenClaw agent will receive messages and respond through BadgerClaw — fully end-to-end encrypted.
 
 ---
 
-## Group Chat Configuration
-
-### Default Behavior
-
-When you install BadgerClaw with a fresh pairing code, the plugin automatically configures:
-
-```json
-{
-  "groupPolicy": "open",
-  "groups": {
-    "*": {
-      "autoReply": true,
-      "enabled": true,
-      "systemPrompt": "You are a helpful AI assistant..."
-    }
-  }
-}
-```
-
-This means:
-- Bot joins any room it's invited to
-- Bot responds to all messages (no @mention required)
-- Bot uses a helpful assistant personality in groups
-
-### Custom Group Personality
-
-By default, the bot uses a generic helpful assistant prompt in groups — **not** your OpenClaw workspace personality (SOUL.md, IDENTITY.md). This prevents workspace personas from causing the bot to stay silent in groups.
-
-To customize the group personality, edit your OpenClaw config:
-
-```bash
-openclaw configure
-```
-
-Or manually edit `~/.openclaw/openclaw.json`:
-
-```json
-{
-  "channels": {
-    "badgerclaw": {
-      "groups": {
-        "*": {
-          "autoReply": true,
-          "systemPrompt": "You are Captain Bot, a pirate AI. Answer in pirate speak."
-        }
-      }
-    }
-  }
-}
-```
-
-### Per-Room Configuration
-
-You can configure specific rooms differently:
-
-```json
-{
-  "channels": {
-    "badgerclaw": {
-      "groups": {
-        "*": { "autoReply": true },
-        "!specificRoomId:server": {
-          "autoReply": false,
-          "systemPrompt": "Custom prompt for this room only"
-        }
-      }
-    }
-  }
-}
-```
-
----
-
-## FAQ
-
-### Bot doesn't respond in group chats
-
-1. Send `/bot talk on` in the room to enable auto-reply
-2. Make sure the bot is a member of the room (`/bot add <name>`)
-3. Check OpenClaw is running: `openclaw status`
-
-### Bot shows typing indicator but never replies
-
-This usually means the bot's system prompt is telling it to stay silent. Check:
-
-1. Your `groups` config has `autoReply: true`
-2. The `systemPrompt` in groups config tells the agent to respond (not stay silent)
-3. If you have a SOUL.md with "stay silent in groups" — the groups `systemPrompt` overrides this, but only if it's set
-
-Fix: Run `openclaw configure` and reconfigure BadgerClaw, or manually add the groups config shown above.
-
-### `/bot talk on` doesn't work
-
-After changing bot commands, you may need to restart the gateway:
-
-```bash
-openclaw gateway restart
-```
-
-### Bot responds with wrong personality
-
-The bot uses your **OpenClaw workspace personality** for DMs (SOUL.md, IDENTITY.md) but uses the **groups systemPrompt** for group chats. To change the group personality, edit `channels.badgerclaw.groups.*.systemPrompt` in your config.
-
-### Bot keeps saying "NO_REPLY" or stays silent
-
-Your workspace files (SOUL.md) may instruct the agent to stay silent in groups. The groups `systemPrompt` should override this. If it doesn't:
-
-1. Make sure `groups.*.systemPrompt` is set in your config
-2. The prompt should explicitly say to respond to messages
-3. Restart the gateway after config changes
+## Troubleshooting
 
 ### "Invalid pairing code"
+- Code may have expired (24h limit). Run `/bot pair <name>` in the app to get a new one.
+- Make sure you're entering the code exactly as shown (BCK-XXXX-XXXX).
 
-- Code expires after 24 hours. Run `/bot pair <name>` in the app for a new one.
-- Enter the code exactly as shown (BCK-XXXX-XXXX).
+### Bot doesn't respond
+1. Check OpenClaw is running: `openclaw status`
+2. Check gateway logs: `openclaw logs --follow`
+3. Verify the BadgerClaw channel is configured: `openclaw channels status`
 
 ### "Pairing code already redeemed"
-
 Each code is one-time use. Run `/bot pair <name>` to generate a fresh one.
 
+### Need to reconnect
+Run `openclaw configure` again and enter a new pairing code.
+
 ---
 
 ## Architecture
@@ -237,9 +115,9 @@ Each code is one-time use. Run `/bot pair <name>` to generate a fresh one.
 ```
 Your Phone (BadgerClaw App)
      │
-     │ E2EE Messages (Megolm/Olm)
+     │ E2EE Messages
      ▼
-BadgerClaw Server (Matrix homeserver)
+BadgerClaw Server (badger.signout.io)
      │
      │ E2EE Messages
      ▼

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@badgerclaw/connect",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "BadgerClaw channel plugin for OpenClaw",
   "type": "module",
   "dependencies": {
@@ -31,4 +31,4 @@
       "defaultChoice": "npm"
     }
   }
-}
+}

package/room-config.json

@@ -0,0 +1,8 @@
+{
+  "!oVrHNyMFgnOCfmjlLU:badger.signout.io": {
+    "autoReply": true
+  },
+  "!hcLBnfZOzoIHENRxuU:badger.signout.io": {
+    "autoReply": true
+  }
+}

package/src/group-mentions.ts

@@ -47,26 +47,17 @@ export function resolveMatrixGroupRequireMention(params: ChannelGroupContext): b
       rawGroupId.replace(/^channel:/, ""),
       rawGroupId.replace(/^room:/, ""),
     ];
-    // Case-insensitive lookup: OpenClaw may lowercase the groupId while
-    // room-config.json stores original-cased Matrix room IDs
-    const configKeys = Object.keys(roomConfig);
     for (const variant of variants) {
-      if (!variant) continue;
-      const matchedKey = configKeys.find(
-        (k) => k.toLowerCase() === variant.toLowerCase()
-      );
-      if (matchedKey) {
-        if (roomConfig[matchedKey]?.autoReply === true) {
-          console.log(`[badgerclaw] room-config autoReply=true for ${matchedKey} (lookup=${variant})`);
-          return false;
-        }
-        if (roomConfig[matchedKey]?.autoReply === false) {
-          console.log(`[badgerclaw] room-config autoReply=false for ${matchedKey} (lookup=${variant})`);
-          return true;
-        }
+      if (variant && roomConfig[variant]?.autoReply === true) {
+        console.log(`[badgerclaw] room-config autoReply=true for ${variant}`);
+        return false;
+      }
+      if (variant && roomConfig[variant]?.autoReply === false) {
+        console.log(`[badgerclaw] room-config autoReply=false for ${variant}`);
+        return true;
       }
     }
-    console.log(`[badgerclaw] room-config: no match for groupId="${rawGroupId}", keys=${configKeys.join(",")}`);
+    console.log(`[badgerclaw] room-config: no match for groupId="${rawGroupId}", keys=${Object.keys(roomConfig).join(",")}`);
   } catch (err) {
     console.log(`[badgerclaw] room-config error: ${err}`);
   }

package/src/matrix/monitor/auto-join.ts

@@ -34,39 +34,47 @@ export function registerMatrixAutoJoin(params: {
   }
   autoJoinRegistered.add(client);
 
-  // After joining a room, send a notice in encrypted rooms to force Megolm session rotation.
-  // When the bot joins, other clients may use a cached outbound Megolm session that doesn't
-  // include the bot. Sending a message causes compliant clients to detect the new member and
-  // rotate their session so subsequent messages are decryptable by the bot.
-  async function postJoinEncryptionHandshake(roomId: string) {
-    try {
-      const encryptionState = await client
-        .getRoomStateEvent(roomId, "m.room.encryption", "")
-        .catch(() => null);
-
-      if (!encryptionState) {
-        logVerbose(`badgerclaw: room ${roomId} is not encrypted, skipping handshake`);
-        return;
-      }
-
-      logVerbose(`badgerclaw: room ${roomId} is encrypted, sending notice to trigger key rotation`);
-      await client.sendNotice(roomId, "🔐 Encryption active — session keys exchanged.");
-      logVerbose(`badgerclaw: sent encryption handshake notice in room ${roomId}`);
-    } catch (err) {
-      runtime.log?.(`badgerclaw: encryption handshake failed for room ${roomId}: ${String(err)}`);
-    }
-  }
-
   if (autoJoin === "always") {
     // Use the built-in autojoin mixin for "always" mode
     const { AutojoinRoomsMixin } = loadMatrixSdk();
     AutojoinRoomsMixin.setupOnClient(client);
     logVerbose("badgerclaw: auto-join enabled for all invites");
 
-    // AutojoinRoomsMixin handles the join, so listen for room.join to run post-join logic
-    client.on("room.join", async (roomId: string, _joinEvent: unknown) => {
-      logVerbose(`badgerclaw: bot joined room ${roomId} (always mode), running post-join handshake`);
-      await postJoinEncryptionHandshake(roomId);
+    // Also join any rooms with pending invites from before startup
+    (async () => {
+      try {
+        const syncData = await client.doRequest("GET", "/_matrix/client/v3/sync", { timeout: "0" });
+        const invitedRooms = Object.keys(syncData?.rooms?.invite ?? {});
+        for (const roomId of invitedRooms) {
+          try {
+            await client.joinRoom(roomId);
+            logVerbose(`badgerclaw: joined pending invite room ${roomId}`);
+          } catch (err) {
+            logVerbose(`badgerclaw: failed to join pending invite ${roomId}: ${err}`);
+          }
+        }
+      } catch {
+        // Ignore sync errors
+      }
+    })();
+
+    // When bot joins a new room, send a presence message to force Megolm session rotation
+    // This ensures all clients create a new session that includes the bot's device
+    client.on("room.join", async (roomId: string) => {
+      logVerbose(`badgerclaw: bot joined room ${roomId}, requesting key share`);
+      try {
+        // Send a dummy state event to signal our device presence
+        // This forces clients to include our device in the next Megolm session
+        await client.sendStateEvent(roomId, "m.room.member", await client.getUserId(), {
+          membership: "join",
+          displayname: "testbot",
+        }).catch(() => {});
+
+        // Also send a notice message to trigger session rotation
+        await client.sendNotice(roomId, "🦡 Bot connected to this room.").catch(() => {});
+      } catch (err) {
+        logVerbose(`badgerclaw: failed to send join notice in ${roomId}: ${err}`);
+      }
     });
     return;
   }
@@ -104,7 +112,6 @@ export function registerMatrixAutoJoin(params: {
     try {
       await client.joinRoom(roomId);
       logVerbose(`badgerclaw: joined room ${roomId}`);
-      await postJoinEncryptionHandshake(roomId);
     } catch (err) {
       runtime.error?.(`badgerclaw: failed to join room ${roomId}: ${String(err)}`);
     }

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

@@ -128,9 +128,7 @@ export async function handleBotCommand(params: {
       case "talk": {
         if (arg === "on") {
           const config = loadRoomConfig();
-          // Store with lowercase key to match OpenClaw's lowercased groupId
-          const normalizedRoomId = roomId.toLowerCase();
-          config[normalizedRoomId] = { ...config[normalizedRoomId], autoReply: true };
+          config[roomId] = { ...config[roomId], autoReply: true };
           saveRoomConfig(config);
           setGroupActivation(roomId, "always");
           await client.sendMessage(roomId, {
@@ -141,8 +139,7 @@ export async function handleBotCommand(params: {
         }
         if (arg === "off") {
           const config = loadRoomConfig();
-          const normalizedRoomId = roomId.toLowerCase();
-          config[normalizedRoomId] = { ...config[normalizedRoomId], autoReply: false };
+          config[roomId] = { ...config[roomId], autoReply: false };
           saveRoomConfig(config);
           setGroupActivation(roomId, "mention");
           await client.sendMessage(roomId, {

package/src/matrix/monitor/handler.ts

@@ -472,39 +472,14 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
         });
         return;
       }
-      // Check room-config.json first (set by /bot talk on|off) — it takes priority
-      // over the OpenClaw config wildcard entry.
-      const roomConfigJsonAutoReply = (() => {
-        try {
-          const fs = require("fs");
-          const path = require("path");
-          const configPath = path.join(
-            process.env.HOME || "/tmp",
-            ".openclaw/extensions/badgerclaw/room-config.json"
-          );
-          const raw = fs.readFileSync(configPath, "utf-8");
-          const roomCfg = JSON.parse(raw) as Record<string, { autoReply?: boolean }>;
-          const normalizedRoomId = roomId.toLowerCase();
-          const keys = Object.keys(roomCfg);
-          const matchedKey = keys.find((k) => k.toLowerCase() === normalizedRoomId);
-          if (matchedKey && typeof roomCfg[matchedKey]?.autoReply === "boolean") {
-            return roomCfg[matchedKey].autoReply;
-          }
-        } catch { /* ignore */ }
-        return undefined;
-      })();
       const shouldRequireMention = isRoom
-        ? roomConfigJsonAutoReply === true
+        ? roomConfig?.autoReply === true
           ? false
-          : roomConfigJsonAutoReply === false
+          : roomConfig?.autoReply === false
             ? true
-            : roomConfig?.autoReply === true
-              ? false
-              : roomConfig?.autoReply === false
-                ? true
-                : typeof roomConfig?.requireMention === "boolean"
-                  ? roomConfig?.requireMention
-                  : true
+            : typeof roomConfig?.requireMention === "boolean"
+              ? roomConfig?.requireMention
+              : true
         : false;
       const shouldBypassMention =
         allowTextCommands &&

package/src/onboarding.ts

@@ -245,17 +245,6 @@ export const badgerclawOnboardingAdapter: ChannelOnboardingAdapter = {
             autoJoin: "always",
             // Open policy: bot responds in any room it's invited to
             groupPolicy: "open",
-            // Default group config: auto-reply in all rooms with a helpful assistant prompt.
-            // This prevents the bot from inheriting workspace personas (SOUL.md) that may
-            // tell it to stay silent in groups or reply with NO_REPLY.
-            groups: {
-              "*": {
-                autoReply: true,
-                enabled: true,
-                systemPrompt:
-                  "You are a helpful AI assistant in a BadgerClaw encrypted chat room. Respond to messages directly and helpfully. Be concise and friendly.",
-              },
-            },
             dm: {
               ...next.channels?.badgerclaw?.dm,
               policy: "open",