@nextclaw/openclaw-compat 0.3.21 → 0.3.23

package/dist/index.d.ts

@@ -478,6 +478,7 @@ declare function toPluginConfigView(config: Config, bindings: PluginChannelBindi
 declare function mergePluginConfigView(baseConfig: Config, pluginViewConfig: Record<string, unknown>, bindings: PluginChannelBinding[]): Config;
 declare function startPluginChannelGateways(params: {
     registry: PluginRegistry;
+    config?: Config;
     logger?: PluginLogger;
 }): Promise<{
     handles: PluginChannelGatewayHandle[];

package/dist/index.js

@@ -297,12 +297,16 @@ async function startPluginChannelGateways(params) {
   const logger = params.logger;
   const diagnostics = [];
   const handles = [];
-  for (const binding of getPluginChannelBindings(params.registry)) {
+  const bindings = getPluginChannelBindings(params.registry);
+  const configView = params.config ? toPluginConfigView(params.config, bindings) : void 0;
+  for (const binding of bindings) {
     const gateway = binding.channel.gateway;
     if (!gateway?.startAccount) {
       continue;
     }
-    const accountIdsRaw = binding.channel.config?.listAccountIds?.() ?? [binding.channel.config?.defaultAccountId?.() ?? "default"];
+    const accountIdsRaw = binding.channel.config?.listAccountIds?.(configView) ?? [
+      binding.channel.config?.defaultAccountId?.(configView) ?? "default"
+    ];
     const accountIds = Array.from(
       new Set(accountIdsRaw.map((id) => typeof id === "string" ? id.trim() : "").filter(Boolean))
     );
@@ -1324,23 +1328,6 @@ function loadPluginUiMetadata(params) {
   return toPluginUiMetadata(registry.plugins);
 }
 
-// src/plugins/plugin-loader-jiti.ts
-import createJitiImport from "jiti";
-var createJiti = createJitiImport;
-function createPluginJiti(aliases) {
-  return createJiti(import.meta.url, {
-    interopDefault: true,
-    esmResolve: true,
-    extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
-    alias: aliases,
-    // Plugin install/upgrade is expected to hot-apply at runtime. Disable
-    // Jiti's persistent/native require cache so a reload always sees the
-    // latest plugin code on disk instead of reusing a stale in-memory module.
-    requireCache: false,
-    cache: false
-  });
-}
-
 // src/plugins/plugin-loader-aliases.ts
 import fs5 from "fs";
 import path5 from "path";
@@ -1479,26 +1466,20 @@ function buildPluginLoaderAliases(pluginRoot) {
   return aliases;
 }
 
-// src/plugins/bundled-plugin-loader.ts
-function resolveBundledPluginEntry(require2, packageName, diagnostics, resolvePackageRootFromEntry3) {
-  try {
-    const entryFile = require2.resolve(packageName);
-    return {
-      entryFile,
-      rootDir: resolvePackageRootFromEntry3(entryFile)
-    };
-  } catch (err) {
-    diagnostics.push({
-      level: "error",
-      source: packageName,
-      message: `bundled plugin package not resolvable: ${String(err)}`
-    });
-    return null;
-  }
-}
-function loadBundledPluginModule(entryFile, rootDir) {
-  const pluginJiti = createPluginJiti(buildPluginLoaderAliases(rootDir));
-  return pluginJiti(entryFile);
+// src/plugins/plugin-loader-jiti.ts
+import createJitiImport from "jiti";
+var createJiti = createJitiImport;
+function createPluginJiti(aliases) {
+  return createJiti(import.meta.url, {
+    interopDefault: true,
+    extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
+    alias: aliases,
+    // Plugin install/upgrade is expected to hot-apply at runtime. Disable
+    // Jiti's persistent/native require cache so a reload always sees the
+    // latest plugin code on disk instead of reusing a stale in-memory module.
+    requireCache: false,
+    cache: false
+  });
 }
 
 // src/plugins/schema-validator.ts
@@ -2105,19 +2086,22 @@ function resolvePluginModuleExport(moduleExport) {
 function appendBundledChannelPlugins(params) {
   const require2 = createRequire2(import.meta.url);
   for (const packageName of BUNDLED_CHANNEL_PLUGIN_PACKAGES) {
-    const resolvedEntry = resolveBundledPluginEntry(
-      require2,
-      packageName,
-      params.registry.diagnostics,
-      resolvePackageRootFromEntry
-    );
-    if (!resolvedEntry) {
+    let entryFile = "";
+    let rootDir = "";
+    try {
+      entryFile = require2.resolve(packageName);
+      rootDir = resolvePackageRootFromEntry(entryFile);
+    } catch (err) {
+      params.registry.diagnostics.push({
+        level: "error",
+        source: packageName,
+        message: `bundled plugin package not resolvable: ${String(err)}`
+      });
       continue;
     }
-    const { entryFile, rootDir } = resolvedEntry;
     let moduleExport = null;
     try {
-      moduleExport = loadBundledPluginModule(entryFile, rootDir);
+      moduleExport = params.jiti(entryFile);
     } catch (err) {
       params.registry.diagnostics.push({
         level: "error",
@@ -2231,9 +2215,11 @@ function loadOpenClawPlugins(options) {
     reservedEngineKinds,
     reservedNcpAgentRuntimeKinds
   });
+  const bundledPluginJiti = createPluginJiti(buildPluginLoaderAliases());
   appendBundledChannelPlugins({
     registry,
     runtime: registerRuntime,
+    jiti: bundledPluginJiti,
     normalizedConfig: normalized
   });
   if (!loadExternalPlugins) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/openclaw-compat",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "private": false,
   "description": "OpenClaw plugin compatibility layer for NextClaw.",
   "type": "module",
@@ -19,21 +19,21 @@
     "jiti": "^1.21.7",
     "jszip": "^3.10.1",
     "tar": "^7.4.3",
-    "@nextclaw/channel-plugin-dingtalk": "0.2.13",
-    "@nextclaw/channel-plugin-feishu": "0.2.15",
-    "@nextclaw/channel-plugin-email": "0.2.13",
-    "@nextclaw/channel-plugin-slack": "0.2.13",
-    "@nextclaw/channel-plugin-discord": "0.2.13",
-    "@nextclaw/channel-runtime": "0.3.0",
-    "@nextclaw/channel-plugin-weixin": "0.1.7",
-    "@nextclaw/channel-plugin-mochat": "0.2.13",
+    "@nextclaw/channel-plugin-feishu": "0.2.16",
+    "@nextclaw/channel-plugin-dingtalk": "0.2.12",
+    "@nextclaw/channel-plugin-email": "0.2.12",
+    "@nextclaw/channel-plugin-discord": "0.2.12",
+    "@nextclaw/channel-plugin-mochat": "0.2.12",
+    "@nextclaw/channel-plugin-qq": "0.2.12",
+    "@nextclaw/channel-plugin-wecom": "0.2.12",
+    "@nextclaw/channel-plugin-weixin": "0.1.6",
+    "@nextclaw/channel-runtime": "0.2.12",
+    "@nextclaw/core": "0.9.12",
     "@nextclaw/ncp": "0.3.2",
-    "@nextclaw/channel-plugin-wecom": "0.2.13",
-    "@nextclaw/channel-plugin-qq": "0.2.13",
     "@nextclaw/ncp-toolkit": "0.4.2",
-    "@nextclaw/core": "0.10.0",
-    "@nextclaw/channel-plugin-whatsapp": "0.2.13",
-    "@nextclaw/channel-plugin-telegram": "0.2.13"
+    "@nextclaw/channel-plugin-slack": "0.2.12",
+    "@nextclaw/channel-plugin-telegram": "0.2.12",
+    "@nextclaw/channel-plugin-whatsapp": "0.2.12"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",