@badgerclaw/connect 1.4.9 → 1.4.11

package/index.ts

@@ -4,11 +4,12 @@ import { matrixPlugin } from "./src/channel.js";
 import { ensureMatrixCryptoRuntime } from "./src/matrix/deps.js";
 import { setMatrixRuntime } from "./src/runtime.js";
 
-let _pairWatcherStarted = false;
+// Use global scope so the flag persists across module reloads (channel restarts)
+const _g = global as any;
 
 async function startPairWatcher(logger: { info?: (msg: string) => void; warn?: (msg: string) => void }): Promise<void> {
-  if (_pairWatcherStarted) return;
-  _pairWatcherStarted = true;
+  if (_g._badgerclawPairWatcherStarted) return;
+  _g._badgerclawPairWatcherStarted = true;
   const log = logger.info ?? console.log;
   const warn = logger.warn ?? console.warn;
 

package/package.json

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

package/scripts/postinstall.cjs

@@ -1,71 +1,57 @@
 #!/usr/bin/env node
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-
-const OPENCLAW_PKG_CANDIDATES = [
-  '/opt/homebrew/lib/node_modules/openclaw',
-  '/usr/local/lib/node_modules/openclaw',
-  path.join(os.homedir(), '.npm-global/lib/node_modules/openclaw'),
+const fs = require('fs'), path = require('path'), os = require('os');
+const CANDIDATES = [
+  '/opt/homebrew/lib/node_modules/openclaw/package.json',
+  '/usr/local/lib/node_modules/openclaw/package.json',
+  path.join(os.homedir(), '.npm-global/lib/node_modules/openclaw/package.json'),
 ];
+const pkgPath = CANDIDATES.find(p => fs.existsSync(p));
+if (!pkgPath) { console.log('[badgerclaw] openclaw not found'); process.exit(0); }
 
-const MISSING_EXPORTS = {
-  './plugin-sdk/compat': { types: './dist/plugin-sdk/compat.d.ts', default: './dist/plugin-sdk/compat.js' },
-  './plugin-sdk/extension-shared': { types: './dist/plugin-sdk/extension-shared.d.ts', default: './dist/plugin-sdk/extension-shared.js' },
-  './plugin-sdk/config-runtime': { types: './dist/plugin-sdk/config-runtime.d.ts', default: './dist/plugin-sdk/config-runtime.js' },
-};
-
-const openclawDir = OPENCLAW_PKG_CANDIDATES.find(p => fs.existsSync(path.join(p, 'package.json')));
-
-if (!openclawDir) {
-  console.log('[badgerclaw] openclaw not found — skipping setup');
-  process.exit(0);
-}
-
-// 1. Patch exports map
+// Patch exports map
 try {
-  const pkgPath = path.join(openclawDir, 'package.json');
   const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
   pkg.exports = pkg.exports || {};
+  const sdkDir = path.join(path.dirname(pkgPath), 'dist', 'plugin-sdk');
+  const needed = ['compat','extension-shared','config-runtime','matrix-runtime-heavy',
+    'account-id','bluebubbles','channel-runtime','googlechat','allow-from','channel-inbound'];
   let patched = false;
-  for (const [key, entry] of Object.entries(MISSING_EXPORTS)) {
-    if (!pkg.exports[key]) { pkg.exports[key] = entry; console.log(`[badgerclaw] patched exports: ${key}`); patched = true; }
+  for (const sub of needed) {
+    const key = `./plugin-sdk/${sub}`;
+    const jsPath = path.join(sdkDir, `${sub}.js`);
+    if (!pkg.exports[key] && fs.existsSync(jsPath)) {
+      pkg.exports[key] = { types: `./dist/plugin-sdk/${sub}.d.ts`, default: `./dist/plugin-sdk/${sub}.js` };
+      console.log(`[badgerclaw] patched: ${key}`);
+      patched = true;
+    }
   }
   if (patched) fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-  else console.log('[badgerclaw] exports map already up to date');
-} catch (e) { console.log('[badgerclaw] exports patch warning:', e.message); }
+  else console.log('[badgerclaw] exports map up to date');
+} catch (e) { console.log('[badgerclaw] patch warning:', e.message); }
 
-// 2. Symlink openclaw into plugin node_modules so imports resolve
+// Symlink openclaw
 try {
-  const pluginDir = path.join(os.homedir(), '.openclaw', 'extensions', 'badgerclaw');
-  const pluginNodeModules = path.join(pluginDir, 'node_modules');
-  const symlink = path.join(pluginNodeModules, 'openclaw');
+  const symlink = path.join(os.homedir(), '.openclaw', 'extensions', 'badgerclaw', 'node_modules', 'openclaw');
   if (!fs.existsSync(symlink)) {
-    fs.mkdirSync(pluginNodeModules, { recursive: true });
-    fs.symlinkSync(openclawDir, symlink);
-    console.log(`[badgerclaw] symlinked openclaw → ${openclawDir}`);
-  } else {
-    console.log('[badgerclaw] openclaw symlink already exists');
+    fs.mkdirSync(path.dirname(symlink), { recursive: true });
+    fs.symlinkSync(path.dirname(pkgPath), symlink);
+    console.log('[badgerclaw] symlinked openclaw');
   }
-} catch (e) { console.log('[badgerclaw] symlink warning:', e.message); }
+} catch (e) { console.log('[badgerclaw] symlink:', e.message); }
 
-// 3. Config stash/restore for reinstalls
+// Config stash/restore
 const configPath = path.join(os.homedir(), '.openclaw', 'openclaw.json');
 const stashPath = configPath + '.badgerclaw-stash';
-
-if (!fs.existsSync(configPath)) { process.exit(0); }
-
+if (!fs.existsSync(configPath)) process.exit(0);
 try {
   const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
   const bcConfig = config.channels?.badgerclaw;
-  if (!bcConfig) { process.exit(0); }
-
+  if (!bcConfig || Object.keys(bcConfig).length === 0) process.exit(0);
   delete config.channels.badgerclaw;
   if (config.plugins?.entries?.badgerclaw) delete config.plugins.entries.badgerclaw;
   fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
   fs.writeFileSync(stashPath, JSON.stringify(bcConfig, null, 2));
   console.log('[badgerclaw] stashed channels.badgerclaw config');
-
   setTimeout(() => {
     try {
       const cur = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
@@ -76,4 +62,4 @@ try {
       console.log('[badgerclaw] restored channels.badgerclaw config');
     } catch (e) { console.log('[badgerclaw] restore warning:', e.message); }
   }, 500);
-} catch (e) { console.log('[badgerclaw] config stash warning:', e.message); }
+} catch (e) { console.log('[badgerclaw] stash warning:', e.message); }

package/src/matrix/monitor/access-policy.ts

@@ -1,10 +1,12 @@
 import {
   formatAllowlistMatchMeta,
   issuePairingChallenge,
-  readStoreAllowFromForDmPolicy,
-  resolveDmGroupAccessWithLists,
   resolveSenderScopedGroupPolicy,
 } from "openclaw/plugin-sdk/matrix";
+import {
+  readStoreAllowFromForDmPolicy,
+  resolveDmGroupAccessWithLists,
+} from "openclaw/plugin-sdk/compat";
 import {
   normalizeMatrixAllowList,
   resolveMatrixAllowListMatch,

package/src/matrix/monitor/handler.ts

@@ -1,20 +1,16 @@
 import type { LocationMessageEventContent, MatrixClient } from "@vector-im/matrix-bot-sdk";
 import {
-  DEFAULT_ACCOUNT_ID,
-  createChannelPairingController,
-  createReplyPrefixOptions,
-  createTypingCallbacks,
-  dispatchReplyFromConfigWithSettledDispatcher,
-  evaluateGroupRouteAccessForPolicy,
-  formatAllowlistMatchMeta,
-  logInboundDrop,
-  logTypingFailure,
-  resolveInboundSessionEnvelopeContext,
-  resolveControlCommandGate,
   type PluginRuntime,
   type RuntimeEnv,
   type RuntimeLogger,
 } from "openclaw/plugin-sdk/matrix";
+import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
+import { createChannelPairingController, logInboundDrop, logTypingFailure, resolveControlCommandGate } from "openclaw/plugin-sdk/bluebubbles";
+import { createReplyPrefixOptions, createTypingCallbacks } from "openclaw/plugin-sdk/channel-runtime";
+import { evaluateGroupRouteAccessForPolicy } from "openclaw/plugin-sdk/googlechat";
+import { formatAllowlistMatchMeta } from "openclaw/plugin-sdk/allow-from";
+import { resolveInboundSessionEnvelopeContext } from "openclaw/plugin-sdk/channel-inbound";
+import { dispatchReplyFromConfigWithSettledDispatcher } from "openclaw/plugin-sdk/matrix-runtime-heavy";
 import type { CoreConfig, MatrixRoomConfig, ReplyToMode } from "../../types.js";
 import { fetchEventSummary } from "../actions/summary.js";
 import {