@badgerclaw/connect 1.4.5 → 1.4.7

package/package.json

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

package/scripts/postinstall.cjs

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
-const CANDIDATES = [
-  '/opt/homebrew/lib/node_modules/openclaw/package.json',
-  '/usr/local/lib/node_modules/openclaw/package.json',
-  path.join(process.env.HOME || '', '.npm-global/lib/node_modules/openclaw/package.json'),
+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 MISSING_EXPORTS = {
@@ -14,16 +15,65 @@ const MISSING_EXPORTS = {
   './plugin-sdk/config-runtime': { types: './dist/plugin-sdk/config-runtime.d.ts', default: './dist/plugin-sdk/config-runtime.js' },
 };
 
-const pkgPath = CANDIDATES.find(p => fs.existsSync(p));
-if (!pkgPath) { console.log('[badgerclaw] postinstall: openclaw not found, skipping'); process.exit(0); }
+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
 try {
+  const pkgPath = path.join(openclawDir, 'package.json');
   const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
   pkg.exports = pkg.exports || {};
   let patched = false;
   for (const [key, entry] of Object.entries(MISSING_EXPORTS)) {
-    if (!pkg.exports[key]) { pkg.exports[key] = entry; console.log(`[badgerclaw] patched: ${key}`); patched = true; }
+    if (!pkg.exports[key]) { pkg.exports[key] = entry; console.log(`[badgerclaw] patched exports: ${key}`); patched = true; }
   }
   if (patched) fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-  else console.log('[badgerclaw] openclaw exports map already up to date');
-} catch (e) { console.log('[badgerclaw] postinstall warning:', e.message); }
+  else console.log('[badgerclaw] exports map already up to date');
+} catch (e) { console.log('[badgerclaw] exports patch warning:', e.message); }
+
+// 2. Symlink openclaw into plugin node_modules so imports resolve
+try {
+  const pluginDir = path.join(os.homedir(), '.openclaw', 'extensions', 'badgerclaw');
+  const pluginNodeModules = path.join(pluginDir, 'node_modules');
+  const symlink = path.join(pluginNodeModules, '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');
+  }
+} catch (e) { console.log('[badgerclaw] symlink warning:', e.message); }
+
+// 3. Config stash/restore for reinstalls
+const configPath = path.join(os.homedir(), '.openclaw', 'openclaw.json');
+const stashPath = configPath + '.badgerclaw-stash';
+
+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); }
+
+  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'));
+      cur.channels = cur.channels || {};
+      cur.channels.badgerclaw = JSON.parse(fs.readFileSync(stashPath, 'utf-8'));
+      fs.writeFileSync(configPath, JSON.stringify(cur, null, 2));
+      fs.unlinkSync(stashPath);
+      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); }

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,