@badgerclaw/connect 1.4.6 → 1.4.8

package/index.ts

@@ -4,6 +4,91 @@ import { matrixPlugin } from "./src/channel.js";
 import { ensureMatrixCryptoRuntime } from "./src/matrix/deps.js";
 import { setMatrixRuntime } from "./src/runtime.js";
 
+async function startPairWatcher(logger: { info?: (msg: string) => void; warn?: (msg: string) => void }): Promise<void> {
+  const log = logger.info ?? console.log;
+  const warn = logger.warn ?? console.warn;
+
+  // Load JWT from ~/.badgerclaw/auth.json — written by `badgerclaw login`
+  let token: string | null = null;
+  try {
+    const fs = await import("fs");
+    const path = await import("path");
+    const os = await import("os");
+    const authPath = path.join(os.homedir(), ".badgerclaw", "auth.json");
+    if (fs.existsSync(authPath)) {
+      const auth = JSON.parse(fs.readFileSync(authPath, "utf-8"));
+      token = auth.access_token ?? null;
+    }
+  } catch {}
+
+  if (!token) {
+    log("badgerclaw: no CLI auth found — run `badgerclaw login` to enable auto-pair");
+    return;
+  }
+
+  const API_BASE = "https://api.badgerclaw.ai";
+  log("badgerclaw: pair-watcher started — listening for pair events from iOS app");
+
+  const connect = () => {
+    const EventSource = require("/opt/homebrew/lib/node_modules/badgerclaw/node_modules/eventsource");
+    const es = new EventSource(`${API_BASE}/api/v1/openclaw/events`, {
+      headers: { Authorization: `Bearer ${token}` },
+    });
+
+    es.onmessage = async (event: any) => {
+      try {
+        const data = JSON.parse(event.data);
+        if (data.type !== "pair") return;
+
+        log(`badgerclaw: pair event received for ${data.bot_user_id}`);
+
+        // Redeem the code
+        const redeemResp = await fetch(`${API_BASE}/api/v1/pairing/redeem`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ code: data.pair_code }),
+        });
+
+        if (!redeemResp.ok) {
+          warn(`badgerclaw: pair redeem failed: ${redeemResp.status}`);
+          return;
+        }
+
+        const bot = await redeemResp.json() as {
+          homeserver: string; access_token: string; user_id: string; bot_name: string; device_id: string;
+        };
+
+        // Write to config via openclaw config set — triggers hot-reload, bot starts immediately
+        const { execSync } = await import("child_process");
+        const localpart = bot.user_id.split(":")[0].replace("@", "").replace(/_bot$/, "");
+        const base = `channels.badgerclaw.accounts.${localpart}`;
+        const opts = { encoding: "utf-8" as const, timeout: 10000, stdio: "pipe" as const };
+        execSync(`openclaw config set ${base}.userId "${bot.user_id}"`, opts);
+        execSync(`openclaw config set ${base}.accessToken "${bot.access_token}"`, opts);
+        execSync(`openclaw config set ${base}.homeserver "${bot.homeserver}"`, opts);
+        execSync(`openclaw config set ${base}.encryption true`, opts);
+        if (bot.device_id) execSync(`openclaw config set ${base}.deviceId "${bot.device_id}"`, opts);
+
+        // Mark claimed
+        await fetch(`${API_BASE}/api/v1/openclaw/pending-pairs/${data.pair_code}/claim`, {
+          method: "POST",
+          headers: { Authorization: `Bearer ${token}` },
+        }).catch(() => {});
+
+        log(`badgerclaw: ✅ ${bot.bot_name} (${bot.user_id}) auto-paired and live`);
+      } catch (e) {
+        warn(`badgerclaw: pair event error: ${String(e)}`);
+      }
+    };
+
+    es.onerror = () => {
+      // EventSource auto-reconnects — silent
+    };
+  };
+
+  connect();
+}
+
 async function checkPluginUpdate(log: (msg: string) => void): Promise<void> {
   try {
     const CURRENT = "1.4.4";
@@ -33,6 +118,8 @@ const plugin = {
   register(api: OpenClawPluginApi) {
     setMatrixRuntime(api.runtime);
     void checkPluginUpdate(api.logger.info ?? console.log);
+    // Start SSE pair-watcher — no external process needed, runs inside OpenClaw gateway
+    void startPairWatcher(api.logger).catch(() => {});
     void ensureMatrixCryptoRuntime({ log: api.logger.info }).catch((err) => {
       const message = err instanceof Error ? err.message : String(err);
       api.logger.warn?.(`badgerclaw: crypto runtime bootstrap failed: ${message}`);

package/package.json

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

package/src/matrix/monitor/handler.ts

@@ -1,7 +1,7 @@
 import type { LocationMessageEventContent, MatrixClient } from "@vector-im/matrix-bot-sdk";
 import {
   DEFAULT_ACCOUNT_ID,
-  createScopedPairingAccess,
+  createChannelPairingController,
   createReplyPrefixOptions,
   createTypingCallbacks,
   dispatchReplyFromConfigWithSettledDispatcher,
@@ -154,7 +154,7 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
     accountId,
   } = params;
   const resolvedAccountId = accountId?.trim() || DEFAULT_ACCOUNT_ID;
-  const pairing = createScopedPairingAccess({
+  const pairing = createChannelPairingController({
     core,
     channel: "badgerclaw",
     accountId: resolvedAccountId,