@xmoxmo/bncr 0.0.9 → 0.1.1

package/README.md

@@ -34,6 +34,14 @@ openclaw plugins update bncr
 openclaw gateway restart
 ```
 
+> 兼容范围：`openclaw >= 2026.3.22`
+>
+> 如果你是从精确版本升级，或本地安装记录仍钉在旧版本，也可以显式执行：
+>
+> ```bash
+> openclaw plugins install @xmoxmo/bncr@0.1.1
+> openclaw gateway restart
+> ```
 
 ### Bncr / 无界侧
 
@@ -137,7 +145,35 @@ openclaw health --json
 
 ---
 
-## 8. 自检与测试
+## 8. 常见安装/加载问题
+
+### 报错：`Cannot find module 'openclaw/plugin-sdk/core'`
+
+这通常不是 bncr 没装上，而是：
+
+- bncr 已经安装到 `~/.openclaw/extensions/bncr`
+- 但插件目录当前解析不到宿主 `openclaw` 包
+- 因而在加载 `openclaw/plugin-sdk/core` 时失败
+
+bncr 0.1.1 会先尝试自动修复插件目录下的 `node_modules/openclaw` 解析链；如果仍失败，可手动执行：
+
+```bash
+mkdir -p ~/.openclaw/extensions/bncr/node_modules
+ln -s "$(npm root -g)/openclaw" ~/.openclaw/extensions/bncr/node_modules/openclaw
+openclaw gateway restart
+openclaw plugins inspect bncr
+```
+
+如果 `npm root -g` 指向的不是实际宿主位置，请先检查：
+
+```bash
+which openclaw
+npm root -g
+```
+
+然后把 `openclaw` 的真实安装目录软链接到 `~/.openclaw/extensions/bncr/node_modules/openclaw`。
+
+## 9. 自检与测试
 
 ```bash
 cd plugins/bncr
@@ -164,7 +200,7 @@ npm pack
 - 测试通过
 - 自检通过
 - 可以正常打包
-- 本地版本号与 npm / 发布目标一致
+- 本地版本号与 npm / 发布目标一致（版本号修改应优先在工作仓完成，再同步到发布仓）
 - 运行态 `linked / pending / deadLetter` 正常
 
 ---

package/index.ts

@@ -1,25 +1,207 @@
-import type {
-  OpenClawPluginApi,
-  GatewayRequestHandlerOptions,
-} from "openclaw/plugin-sdk/core";
-import { BncrConfigSchema } from "./src/core/config-schema.ts";
-import { createBncrBridge, createBncrChannelPlugin } from "./src/channel.ts";
+import fs from 'node:fs';
+import path from 'node:path';
+import { execFileSync } from 'node:child_process';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { BncrConfigSchema } from './src/core/config-schema.ts';
 
-type BridgeSingleton = ReturnType<typeof createBncrBridge>;
+const pluginFile = fileURLToPath(import.meta.url);
+const pluginDir = path.dirname(pluginFile);
+const pluginRequire = createRequire(import.meta.url);
+const sdkCoreSpecifier = 'openclaw/plugin-sdk/core';
+const linkType = process.platform === 'win32' ? 'junction' : 'dir';
+
+type ChannelModule = typeof import('./src/channel.ts');
+type OpenClawPluginApi = Parameters<ChannelModule['createBncrBridge']>[0];
+type BridgeSingleton = ReturnType<ChannelModule['createBncrBridge']>;
+
+type LoadedRuntime = {
+  createBncrBridge: ChannelModule['createBncrBridge'];
+  createBncrChannelPlugin: ChannelModule['createBncrChannelPlugin'];
+};
+
+let runtime: LoadedRuntime | null = null;
+
+const tryExec = (command: string, args: string[]) => {
+  try {
+    return execFileSync(command, args, {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+  } catch {
+    return '';
+  }
+};
+
+const readOpenClawPackageName = (pkgPath: string) => {
+  try {
+    const raw = fs.readFileSync(pkgPath, 'utf8');
+    const parsed = JSON.parse(raw);
+    return typeof parsed?.name === 'string' ? parsed.name : '';
+  } catch {
+    return '';
+  }
+};
+
+const findOpenClawPackageRoot = (startPath: string) => {
+  let current = startPath;
+  try {
+    current = fs.realpathSync(startPath);
+  } catch {
+    // keep original path when realpath fails
+  }
+
+  let cursor = current;
+  while (true) {
+    const statPath = fs.existsSync(cursor) ? cursor : path.dirname(cursor);
+    const pkgPath = path.join(statPath, 'package.json');
+    if (fs.existsSync(pkgPath) && readOpenClawPackageName(pkgPath) === 'openclaw') {
+      return statPath;
+    }
+    const parent = path.dirname(statPath);
+    if (parent === statPath) break;
+    cursor = parent;
+  }
+  return '';
+};
+
+const unique = (items: string[]) => {
+  const seen = new Set<string>();
+  const out: string[] = [];
+  for (const item of items) {
+    if (!item) continue;
+    const normalized = path.normalize(item);
+    if (seen.has(normalized)) continue;
+    seen.add(normalized);
+    out.push(normalized);
+  }
+  return out;
+};
+
+const collectOpenClawCandidates = () => {
+  const directCandidates = [
+    path.join(pluginDir, 'node_modules', 'openclaw'),
+    path.join('/usr/lib/node_modules', 'openclaw'),
+    path.join('/usr/local/lib/node_modules', 'openclaw'),
+    path.join('/opt/homebrew/lib/node_modules', 'openclaw'),
+    path.join(process.env.HOME || '', '.npm-global/lib/node_modules', 'openclaw'),
+  ];
+
+  const npmRoot = tryExec('npm', ['root', '-g']);
+  if (npmRoot) directCandidates.push(path.join(npmRoot, 'openclaw'));
+
+  const nodePathEntries = (process.env.NODE_PATH || '')
+    .split(path.delimiter)
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+  for (const entry of nodePathEntries) {
+    directCandidates.push(path.join(entry, 'openclaw'));
+  }
+
+  const openclawBin = tryExec('which', ['openclaw']);
+  if (openclawBin) {
+    directCandidates.push(openclawBin);
+    directCandidates.push(path.dirname(openclawBin));
+  }
+
+  const packageRoots = unique(
+    directCandidates
+      .map((candidate) => findOpenClawPackageRoot(candidate))
+      .filter(Boolean),
+  );
+
+  return packageRoots.filter((candidate) => {
+    const pkgJson = path.join(candidate, 'package.json');
+    return fs.existsSync(pkgJson) && readOpenClawPackageName(pkgJson) === 'openclaw';
+  });
+};
+
+const canResolveSdkCore = () => {
+  try {
+    pluginRequire.resolve(sdkCoreSpecifier);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const ensurePluginNodeModulesLink = (targetRoot: string) => {
+  const nodeModulesDir = path.join(pluginDir, 'node_modules');
+  const linkPath = path.join(nodeModulesDir, 'openclaw');
+  fs.mkdirSync(nodeModulesDir, { recursive: true });
+
+  try {
+    const stat = fs.lstatSync(linkPath);
+    if (stat.isSymbolicLink()) {
+      const existingTarget = fs.realpathSync(linkPath);
+      const normalizedExisting = path.normalize(existingTarget);
+      const normalizedTarget = path.normalize(fs.realpathSync(targetRoot));
+      if (normalizedExisting === normalizedTarget) return;
+      fs.unlinkSync(linkPath);
+    } else {
+      return;
+    }
+  } catch {
+    // missing link is fine
+  }
+
+  fs.symlinkSync(targetRoot, linkPath, linkType as fs.symlink.Type);
+};
+
+const ensureOpenClawSdkResolution = () => {
+  if (canResolveSdkCore()) return;
+
+  let lastError = '';
+  const candidates = collectOpenClawCandidates();
+  for (const candidate of candidates) {
+    try {
+      ensurePluginNodeModulesLink(candidate);
+      if (canResolveSdkCore()) return;
+    } catch (error) {
+      lastError = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
+    }
+  }
+
+  const suffix = candidates.length
+    ? ` Tried candidates: ${candidates.join(', ')}.`
+    : ' No openclaw package root candidates were found from npm root, NODE_PATH, common global paths, or the openclaw binary path.';
+  const extra = lastError ? ` Last repair error: ${lastError}.` : '';
+  throw new Error(
+    `bncr failed to resolve ${sdkCoreSpecifier} from ${pluginDir}.${suffix}${extra} ` +
+      `You can repair manually with: mkdir -p ${path.join(pluginDir, 'node_modules')} && ln -s "$(npm root -g)/openclaw" ${path.join(pluginDir, 'node_modules', 'openclaw')}`,
+  );
+};
+
+const loadRuntimeSync = (): LoadedRuntime => {
+  if (runtime) return runtime;
+  ensureOpenClawSdkResolution();
+  try {
+    const mod = pluginRequire('./src/channel.ts') as ChannelModule;
+    runtime = {
+      createBncrBridge: mod.createBncrBridge,
+      createBncrChannelPlugin: mod.createBncrChannelPlugin,
+    };
+    return runtime;
+  } catch (error) {
+    const detail = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
+    throw new Error(`bncr failed to load channel runtime after dependency bootstrap: ${detail}`);
+  }
+};
 
 const getBridgeSingleton = (api: OpenClawPluginApi) => {
+  const loaded = loadRuntimeSync();
   const g = globalThis as typeof globalThis & { __bncrBridge?: BridgeSingleton };
-  if (!g.__bncrBridge) g.__bncrBridge = createBncrBridge(api);
-  return g.__bncrBridge;
+  if (!g.__bncrBridge) g.__bncrBridge = loaded.createBncrBridge(api);
+  return { bridge: g.__bncrBridge, runtime: loaded };
 };
 
 const plugin = {
-  id: "bncr",
-  name: "Bncr",
-  description: "Bncr channel plugin",
+  id: 'bncr',
+  name: 'Bncr',
+  description: 'Bncr channel plugin',
   configSchema: BncrConfigSchema,
   register(api: OpenClawPluginApi) {
-    const bridge = getBridgeSingleton(api);
+    const { bridge, runtime } = getBridgeSingleton(api);
     const debugLog = (...args: any[]) => {
       if (!bridge.isDebugEnabled?.()) return;
       api.logger.info?.(...args);
@@ -37,7 +219,7 @@ const plugin = {
     };
 
     api.registerService({
-      id: "bncr-bridge-service",
+      id: 'bncr-bridge-service',
       start: async (ctx) => {
         const debug = await resolveDebug();
         await bridge.startService(ctx, debug);
@@ -45,48 +227,18 @@ const plugin = {
       stop: bridge.stopService,
     });
 
-    api.registerChannel({ plugin: createBncrChannelPlugin(bridge) });
-
-    api.registerGatewayMethod(
-      "bncr.connect",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleConnect(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.inbound",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleInbound(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.activity",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleActivity(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.ack",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleAck(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.diagnostics",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleDiagnostics(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.file.init",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleFileInit(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.file.chunk",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleFileChunk(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.file.complete",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleFileComplete(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.file.abort",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleFileAbort(opts),
-    );
-    api.registerGatewayMethod(
-      "bncr.file.ack",
-      (opts: GatewayRequestHandlerOptions) => bridge.handleFileAck(opts),
-    );
+    api.registerChannel({ plugin: runtime.createBncrChannelPlugin(bridge) });
+
+    api.registerGatewayMethod('bncr.connect', (opts) => bridge.handleConnect(opts));
+    api.registerGatewayMethod('bncr.inbound', (opts) => bridge.handleInbound(opts));
+    api.registerGatewayMethod('bncr.activity', (opts) => bridge.handleActivity(opts));
+    api.registerGatewayMethod('bncr.ack', (opts) => bridge.handleAck(opts));
+    api.registerGatewayMethod('bncr.diagnostics', (opts) => bridge.handleDiagnostics(opts));
+    api.registerGatewayMethod('bncr.file.init', (opts) => bridge.handleFileInit(opts));
+    api.registerGatewayMethod('bncr.file.chunk', (opts) => bridge.handleFileChunk(opts));
+    api.registerGatewayMethod('bncr.file.complete', (opts) => bridge.handleFileComplete(opts));
+    api.registerGatewayMethod('bncr.file.abort', (opts) => bridge.handleFileAbort(opts));
+    api.registerGatewayMethod('bncr.file.ack', (opts) => bridge.handleFileAck(opts));
   },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmoxmo/bncr",
-  "version": "0.0.9",
+  "version": "0.1.1",
   "private": false,
   "type": "module",
   "license": "MIT",

package/src/channel.ts

@@ -1606,7 +1606,7 @@ class BncrBridgeRuntime {
     accountId: string;
     sessionKey: string;
     route: BncrRoute;
-    payload: { text?: string; mediaUrl?: string; mediaUrls?: string[]; asVoice?: boolean; audioAsVoice?: boolean };
+    payload: { text?: string; mediaUrl?: string; mediaUrls?: string[]; asVoice?: boolean; audioAsVoice?: boolean; kind?: 'block' | 'final' };
     mediaLocalRoots?: readonly string[];
   }) {
     const { accountId, sessionKey, route, payload, mediaLocalRoots } = params;
@@ -1643,6 +1643,7 @@ class BncrBridgeRuntime {
             mimeType: media.mimeType,
           }),
           hintedType: wantsVoice ? 'voice' : undefined,
+          kind: payload.kind,
           now: now(),
         });
 
@@ -1675,6 +1676,7 @@ class BncrBridgeRuntime {
         groupId: route.groupId,
         userId: route.userId,
         type: 'text',
+        kind: payload.kind,
         msg: text,
         path: '',
         base64: '',

package/src/messaging/inbound/commands.ts

@@ -114,7 +114,8 @@ export async function handleBncrNativeCommand(params: {
     },
     dispatcherOptions: {
       deliver: async (payload: { text?: string; mediaUrl?: string; mediaUrls?: string[]; audioAsVoice?: boolean }, info?: { kind?: 'tool' | 'block' | 'final' }) => {
-        if (info?.kind && info.kind !== 'final') return;
+        const kind = info?.kind;
+        if (kind && kind !== 'final') return;
         const hasPayload = Boolean(payload?.text || payload?.mediaUrl || (Array.isArray(payload?.mediaUrls) && payload.mediaUrls.length > 0));
         if (!hasPayload) return;
         responded = true;
@@ -122,7 +123,10 @@ export async function handleBncrNativeCommand(params: {
           accountId,
           sessionKey,
           route,
-          payload,
+          payload: {
+            ...payload,
+            kind: kind as 'block' | 'final' | undefined,
+          },
         });
       },
     },

package/src/messaging/inbound/dispatch.ts

@@ -154,13 +154,17 @@ export async function dispatchBncrInbound(params: {
         payload: { text?: string; mediaUrl?: string; mediaUrls?: string[]; audioAsVoice?: boolean },
         info?: { kind?: 'tool' | 'block' | 'final' },
       ) => {
-        if (info?.kind && info.kind !== 'final') return;
+        const kind = info?.kind;
+        if (kind && kind !== 'final') return;
 
         await enqueueFromReply({
           accountId,
           sessionKey,
           route,
-          payload,
+          payload: {
+            ...payload,
+            kind: kind as 'block' | 'final' | undefined,
+          },
         });
       },
       onError: (err: unknown) => {

package/src/messaging/outbound/media.ts

@@ -36,6 +36,7 @@ export function buildBncrMediaOutboundFrame(params: {
   mediaMsg: string;
   fileName: string;
   hintedType?: string;
+  kind?: 'block' | 'final';
   now: number;
 }) {
   return {
@@ -53,6 +54,7 @@ export function buildBncrMediaOutboundFrame(params: {
         hasPayload: !!(params.media.path || params.media.mediaBase64),
         hintedType: params.hintedType,
       }),
+      kind: params.kind,
       mimeType: params.media.mimeType || '',
       msg: params.mediaMsg,
       path: params.media.path || params.mediaUrl,