@nextclaw/openclaw-compat 0.1.7 → 0.1.9

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import * as _nextclaw_core from '@nextclaw/core';
 import { Config, ExtensionChannel } from '@nextclaw/core';
 
 type PluginConfigUiHint = {
@@ -306,6 +307,17 @@ declare function sleep(ms: number): Promise<void>;
 declare function normalizePluginHttpPath(rawPath: string): string;
 declare const DEFAULT_ACCOUNT_ID = "default";
 declare function normalizeAccountId(accountId?: string | null): string;
+declare function createNextclawBuiltinChannelPlugin(channelId: string): {
+    id: string;
+    nextclaw: {
+        isEnabled: (cfg: _nextclaw_core.Config) => boolean;
+        createChannel: (ctx: {
+            config: _nextclaw_core.Config;
+            bus: _nextclaw_core.MessageBus;
+            sessionManager?: _nextclaw_core.SessionManager;
+        }) => unknown;
+    };
+};
 declare const __nextclawPluginSdkCompat = true;
 type _CompatOnly = OpenClawPluginApi;
 
@@ -615,4 +627,4 @@ declare function uninstallPlugin(params: {
     extensionsDir?: string;
 }): Promise<UninstallPluginResult>;
 
-export { DEFAULT_ACCOUNT_ID, type InstallPluginResult, type NormalizedPluginsConfig, type OpenClawChannelAgentPrompt, type OpenClawChannelConfigAdapter, type OpenClawChannelConfigSchema, type OpenClawChannelGateway, type OpenClawChannelGatewayStartContext, type OpenClawChannelPlugin, type OpenClawChannelSetup, type OpenClawPluginApi, type OpenClawPluginChannelRegistration, type OpenClawPluginConfigSchema, type OpenClawPluginDefinition, type OpenClawPluginModule, type OpenClawPluginTool, type OpenClawPluginToolContext, type OpenClawPluginToolFactory, type OpenClawPluginToolOptions, type OpenClawProviderPlugin, PLUGIN_MANIFEST_FILENAME, PLUGIN_MANIFEST_FILENAMES, type PackageManifest, type PluginCandidate, type PluginChannelBinding, type PluginChannelGatewayHandle, type PluginChannelRegistration, type PluginConfigUiHint, type PluginDiagnostic, type PluginDiscoveryResult, type PluginInstallLogger, type PluginInstallSource, type PluginInstallUpdate, type PluginKind, type PluginLoadOptions, type PluginLogger, type PluginManifest, type PluginManifestLoadResult, type PluginManifestRecord, type PluginManifestRegistry, type PluginOrigin, type PluginProviderRegistration, type PluginRecord, type PluginRegisterRuntime, type PluginRegistry, type PluginReplyDispatchParams, type PluginRuntime, type PluginRuntimeBridge, type PluginStatusReport, type PluginToolRegistration, type PluginUiMetadata, type UninstallActions, type UninstallPluginResult, type _CompatOnly, __nextclawPluginSdkCompat, addPluginLoadPath, buildChannelConfigSchema, buildOauthProviderAuthResult, buildPluginStatusReport, createPluginRegisterRuntime, createPluginRuntime, disablePluginInConfig, discoverOpenClawPlugins, emptyPluginConfigSchema, enablePluginInConfig, getPackageManifestMetadata, getPluginChannelBindings, getPluginUiMetadataFromRegistry, installPluginFromArchive, installPluginFromDir, installPluginFromFile, installPluginFromNpmSpec, installPluginFromPath, loadOpenClawPlugins, loadPluginManifest, loadPluginManifestRegistry, loadPluginUiMetadata, normalizeAccountId, normalizePluginHttpPath, normalizePluginsConfig, recordPluginInstall, registerPluginWithApi, removePluginFromConfig, resolveEnableState, resolvePluginChannelMessageToolHints, resolvePluginInstallDir, resolvePluginManifestPath, resolveUninstallDirectoryTarget, setPluginRuntimeBridge, sleep, startPluginChannelGateways, stopPluginChannelGateways, toPluginUiMetadata, uninstallPlugin, validateJsonSchemaValue };
+export { DEFAULT_ACCOUNT_ID, type InstallPluginResult, type NormalizedPluginsConfig, type OpenClawChannelAgentPrompt, type OpenClawChannelConfigAdapter, type OpenClawChannelConfigSchema, type OpenClawChannelGateway, type OpenClawChannelGatewayStartContext, type OpenClawChannelPlugin, type OpenClawChannelSetup, type OpenClawPluginApi, type OpenClawPluginChannelRegistration, type OpenClawPluginConfigSchema, type OpenClawPluginDefinition, type OpenClawPluginModule, type OpenClawPluginTool, type OpenClawPluginToolContext, type OpenClawPluginToolFactory, type OpenClawPluginToolOptions, type OpenClawProviderPlugin, PLUGIN_MANIFEST_FILENAME, PLUGIN_MANIFEST_FILENAMES, type PackageManifest, type PluginCandidate, type PluginChannelBinding, type PluginChannelGatewayHandle, type PluginChannelRegistration, type PluginConfigUiHint, type PluginDiagnostic, type PluginDiscoveryResult, type PluginInstallLogger, type PluginInstallSource, type PluginInstallUpdate, type PluginKind, type PluginLoadOptions, type PluginLogger, type PluginManifest, type PluginManifestLoadResult, type PluginManifestRecord, type PluginManifestRegistry, type PluginOrigin, type PluginProviderRegistration, type PluginRecord, type PluginRegisterRuntime, type PluginRegistry, type PluginReplyDispatchParams, type PluginRuntime, type PluginRuntimeBridge, type PluginStatusReport, type PluginToolRegistration, type PluginUiMetadata, type UninstallActions, type UninstallPluginResult, type _CompatOnly, __nextclawPluginSdkCompat, addPluginLoadPath, buildChannelConfigSchema, buildOauthProviderAuthResult, buildPluginStatusReport, createNextclawBuiltinChannelPlugin, createPluginRegisterRuntime, createPluginRuntime, disablePluginInConfig, discoverOpenClawPlugins, emptyPluginConfigSchema, enablePluginInConfig, getPackageManifestMetadata, getPluginChannelBindings, getPluginUiMetadataFromRegistry, installPluginFromArchive, installPluginFromDir, installPluginFromFile, installPluginFromNpmSpec, installPluginFromPath, loadOpenClawPlugins, loadPluginManifest, loadPluginManifestRegistry, loadPluginUiMetadata, normalizeAccountId, normalizePluginHttpPath, normalizePluginsConfig, recordPluginInstall, registerPluginWithApi, removePluginFromConfig, resolveEnableState, resolvePluginChannelMessageToolHints, resolvePluginInstallDir, resolvePluginManifestPath, resolveUninstallDirectoryTarget, setPluginRuntimeBridge, sleep, startPluginChannelGateways, stopPluginChannelGateways, toPluginUiMetadata, uninstallPlugin, validateJsonSchemaValue };

package/dist/index.js

@@ -1,4 +1,5 @@
 // src/plugin-sdk/index.ts
+import { resolveBuiltinChannelRuntime } from "@nextclaw/channel-runtime";
 function emptyPluginConfigSchema() {
   return {
     type: "object",
@@ -44,6 +45,16 @@ function normalizeAccountId(accountId) {
   const trimmed = accountId?.trim();
   return trimmed || DEFAULT_ACCOUNT_ID;
 }
+function createNextclawBuiltinChannelPlugin(channelId) {
+  const runtime = resolveBuiltinChannelRuntime(channelId);
+  return {
+    id: channelId,
+    nextclaw: {
+      isEnabled: runtime.isEnabled,
+      createChannel: runtime.createChannel
+    }
+  };
+}
 var __nextclawPluginSdkCompat = true;
 
 // src/plugins/config-state.ts
@@ -224,10 +235,10 @@ function resolvePluginChannelMessageToolHints(params) {
   }
 }
 function getPluginUiMetadataFromRegistry(registry) {
-  return registry.plugins.map((plugin10) => ({
-    id: plugin10.id,
-    configSchema: plugin10.configJsonSchema,
-    configUiHints: plugin10.configUiHints
+  return registry.plugins.map((plugin) => ({
+    id: plugin.id,
+    configSchema: plugin.configJsonSchema,
+    configUiHints: plugin.configUiHints
   }));
 }
 async function startPluginChannelGateways(params) {
@@ -1059,6 +1070,7 @@ async function installPluginFromPath(params) {
 import fs5 from "fs";
 import path5 from "path";
 import { fileURLToPath } from "url";
+import { createRequire } from "module";
 import createJitiImport from "jiti";
 import { getWorkspacePathFromConfig } from "@nextclaw/core";
 
@@ -1240,132 +1252,6 @@ function validateJsonSchemaValue(params) {
   return { ok: false, errors: formatAjvErrors(cached.validate.errors) };
 }
 
-// src/plugins/bundled/channels/factory.ts
-import { listBuiltinChannelPlugins } from "@nextclaw/core";
-var EMPTY_PLUGIN_CONFIG_SCHEMA = {
-  type: "object",
-  additionalProperties: false,
-  properties: {}
-};
-function resolveBuiltinChannelPlugin(channelId) {
-  const plugin10 = listBuiltinChannelPlugins().find((entry) => entry.id === channelId);
-  if (!plugin10) {
-    throw new Error(`builtin channel plugin not found: ${channelId}`);
-  }
-  return plugin10;
-}
-function createBundledChannelPlugin(params) {
-  const pluginId = `builtin-channel-${params.channelId}`;
-  const sourceDescription = params.description ?? `Builtin NextClaw channel plugin for ${params.channelId}`;
-  return {
-    id: pluginId,
-    name: params.name,
-    description: sourceDescription,
-    configSchema: EMPTY_PLUGIN_CONFIG_SCHEMA,
-    register(api) {
-      const builtin = resolveBuiltinChannelPlugin(params.channelId);
-      api.registerChannel({
-        plugin: {
-          id: params.channelId,
-          nextclaw: {
-            isEnabled: builtin.isEnabled,
-            createChannel: builtin.create
-          }
-        }
-      });
-    }
-  };
-}
-
-// src/plugins/bundled/channels/telegram.ts
-var plugin = createBundledChannelPlugin({
-  channelId: "telegram",
-  name: "Builtin Telegram Channel",
-  description: "Builtin NextClaw channel plugin for telegram"
-});
-var telegram_default = plugin;
-
-// src/plugins/bundled/channels/whatsapp.ts
-var plugin2 = createBundledChannelPlugin({
-  channelId: "whatsapp",
-  name: "Builtin WhatsApp Channel",
-  description: "Builtin NextClaw channel plugin for whatsapp"
-});
-var whatsapp_default = plugin2;
-
-// src/plugins/bundled/channels/discord.ts
-var plugin3 = createBundledChannelPlugin({
-  channelId: "discord",
-  name: "Builtin Discord Channel",
-  description: "Builtin NextClaw channel plugin for discord"
-});
-var discord_default = plugin3;
-
-// src/plugins/bundled/channels/feishu.ts
-var plugin4 = createBundledChannelPlugin({
-  channelId: "feishu",
-  name: "Builtin Feishu Channel",
-  description: "Builtin NextClaw channel plugin for feishu"
-});
-var feishu_default = plugin4;
-
-// src/plugins/bundled/channels/mochat.ts
-var plugin5 = createBundledChannelPlugin({
-  channelId: "mochat",
-  name: "Builtin Mochat Channel",
-  description: "Builtin NextClaw channel plugin for mochat"
-});
-var mochat_default = plugin5;
-
-// src/plugins/bundled/channels/dingtalk.ts
-var plugin6 = createBundledChannelPlugin({
-  channelId: "dingtalk",
-  name: "Builtin DingTalk Channel",
-  description: "Builtin NextClaw channel plugin for dingtalk"
-});
-var dingtalk_default = plugin6;
-
-// src/plugins/bundled/channels/email.ts
-var plugin7 = createBundledChannelPlugin({
-  channelId: "email",
-  name: "Builtin Email Channel",
-  description: "Builtin NextClaw channel plugin for email"
-});
-var email_default = plugin7;
-
-// src/plugins/bundled/channels/slack.ts
-var plugin8 = createBundledChannelPlugin({
-  channelId: "slack",
-  name: "Builtin Slack Channel",
-  description: "Builtin NextClaw channel plugin for slack"
-});
-var slack_default = plugin8;
-
-// src/plugins/bundled/channels/qq.ts
-var plugin9 = createBundledChannelPlugin({
-  channelId: "qq",
-  name: "Builtin QQ Channel",
-  description: "Builtin NextClaw channel plugin for qq"
-});
-var qq_default = plugin9;
-
-// src/plugins/bundled/channels/index.ts
-var BUNDLED_CHANNEL_PLUGINS = [
-  telegram_default,
-  whatsapp_default,
-  discord_default,
-  feishu_default,
-  mochat_default,
-  dingtalk_default,
-  email_default,
-  slack_default,
-  qq_default
-];
-function listBundledChannelPluginDefinitions() {
-  return [...BUNDLED_CHANNEL_PLUGINS];
-}
-var BUNDLED_CHANNEL_PLUGIN_IDS = BUNDLED_CHANNEL_PLUGINS.map((plugin10) => plugin10.id).filter((id) => typeof id === "string" && id.trim().length > 0);
-
 // src/plugins/registry.ts
 import path4 from "path";
 import { expandHome as expandHome2 } from "@nextclaw/core";
@@ -1763,6 +1649,32 @@ var defaultLogger2 = {
   error: (message) => console.error(message),
   debug: (message) => console.debug(message)
 };
+var BUNDLED_CHANNEL_PLUGIN_PACKAGES = [
+  "@nextclaw/channel-plugin-telegram",
+  "@nextclaw/channel-plugin-whatsapp",
+  "@nextclaw/channel-plugin-discord",
+  "@nextclaw/channel-plugin-feishu",
+  "@nextclaw/channel-plugin-mochat",
+  "@nextclaw/channel-plugin-dingtalk",
+  "@nextclaw/channel-plugin-email",
+  "@nextclaw/channel-plugin-slack",
+  "@nextclaw/channel-plugin-qq"
+];
+function resolvePackageRootFromEntry(entryFile) {
+  let cursor = path5.dirname(entryFile);
+  for (let i = 0; i < 8; i += 1) {
+    const candidate = path5.join(cursor, "package.json");
+    if (fs5.existsSync(candidate)) {
+      return cursor;
+    }
+    const parent = path5.dirname(cursor);
+    if (parent === cursor) {
+      break;
+    }
+    cursor = parent;
+  }
+  return path5.dirname(entryFile);
+}
 function resolvePluginSdkAliasFile(params) {
   try {
     const modulePath = fileURLToPath(import.meta.url);
@@ -1856,9 +1768,37 @@ function validatePluginConfig(params) {
   return { ok: false, errors: result.errors };
 }
 function appendBundledChannelPlugins(params) {
-  for (const definition of listBundledChannelPluginDefinitions()) {
-    const pluginId = typeof definition.id === "string" ? definition.id.trim() : "";
-    const source = `builtin:nextclaw-openclaw-compat/channels/${pluginId || "unknown"}`;
+  const require2 = createRequire(import.meta.url);
+  for (const packageName of BUNDLED_CHANNEL_PLUGIN_PACKAGES) {
+    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;
+    }
+    let moduleExport = null;
+    try {
+      moduleExport = params.jiti(entryFile);
+    } catch (err) {
+      params.registry.diagnostics.push({
+        level: "error",
+        source: entryFile,
+        message: `failed to load bundled plugin: ${String(err)}`
+      });
+      continue;
+    }
+    const resolved = resolvePluginModuleExport(moduleExport);
+    const definition = resolved.definition;
+    const register = resolved.register;
+    const pluginId = typeof definition?.id === "string" ? definition.id.trim() : "";
+    const source = entryFile;
     if (!pluginId) {
       params.registry.diagnostics.push({
         level: "error",
@@ -1869,18 +1809,17 @@ function appendBundledChannelPlugins(params) {
     }
     const record = createPluginRecord({
       id: pluginId,
-      name: definition.name ?? pluginId,
-      description: definition.description,
-      version: definition.version,
-      kind: definition.kind,
+      name: definition?.name ?? pluginId,
+      description: definition?.description,
+      version: definition?.version,
+      kind: definition?.kind,
       source,
       origin: "bundled",
       workspaceDir: params.runtime.workspaceDir,
       enabled: true,
-      configSchema: Boolean(definition.configSchema),
-      configJsonSchema: definition.configSchema
+      configSchema: Boolean(definition?.configSchema),
+      configJsonSchema: definition?.configSchema
     });
-    const register = definition.register ?? definition.activate;
     if (typeof register !== "function") {
       record.status = "error";
       record.error = "plugin export missing register/activate";
@@ -1898,7 +1837,7 @@ function appendBundledChannelPlugins(params) {
       record,
       pluginId,
       source,
-      rootDir: params.runtime.workspaceDir,
+      rootDir,
       register,
       pluginConfig: void 0
     });
@@ -1941,9 +1880,20 @@ function loadOpenClawPlugins(options) {
     reservedChannelIds,
     reservedProviderIds
   });
+  const pluginSdkAlias = resolvePluginSdkAlias();
+  const jiti = createJiti(import.meta.url, {
+    interopDefault: true,
+    extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
+    ...pluginSdkAlias ? {
+      alias: {
+        "openclaw/plugin-sdk": pluginSdkAlias
+      }
+    } : {}
+  });
   appendBundledChannelPlugins({
     registry,
-    runtime: registerRuntime
+    runtime: registerRuntime,
+    jiti
   });
   if (!loadExternalPlugins) {
     return registry;
@@ -1961,17 +1911,9 @@ function loadOpenClawPlugins(options) {
   });
   registry.diagnostics.push(...manifestRegistry.diagnostics);
   const manifestByRoot = new Map(manifestRegistry.plugins.map((entry) => [entry.rootDir, entry]));
-  const seenIds = /* @__PURE__ */ new Map();
-  const pluginSdkAlias = resolvePluginSdkAlias();
-  const jiti = createJiti(import.meta.url, {
-    interopDefault: true,
-    extensions: [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs", ".json"],
-    ...pluginSdkAlias ? {
-      alias: {
-        "openclaw/plugin-sdk": pluginSdkAlias
-      }
-    } : {}
-  });
+  const seenIds = new Map(
+    registry.plugins.map((entry) => [entry.id, entry.origin])
+  );
   for (const candidate of discovery.candidates) {
     const manifest = manifestByRoot.get(candidate.rootDir);
     if (!manifest) {
@@ -2303,6 +2245,7 @@ export {
   buildChannelConfigSchema,
   buildOauthProviderAuthResult,
   buildPluginStatusReport,
+  createNextclawBuiltinChannelPlugin,
   createPluginRegisterRuntime,
   createPluginRuntime,
   disablePluginInConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/openclaw-compat",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "private": false,
   "description": "OpenClaw plugin compatibility layer for NextClaw.",
   "type": "module",
@@ -18,7 +18,17 @@
     "jiti": "^1.21.7",
     "jszip": "^3.10.1",
     "tar": "^7.4.3",
-    "@nextclaw/core": "^0.6.16"
+    "@nextclaw/core": "^0.6.17",
+    "@nextclaw/channel-plugin-telegram": "^0.1.1",
+    "@nextclaw/channel-plugin-whatsapp": "^0.1.1",
+    "@nextclaw/channel-plugin-discord": "^0.1.1",
+    "@nextclaw/channel-plugin-feishu": "^0.1.1",
+    "@nextclaw/channel-plugin-mochat": "^0.1.1",
+    "@nextclaw/channel-plugin-dingtalk": "^0.1.1",
+    "@nextclaw/channel-plugin-email": "^0.1.1",
+    "@nextclaw/channel-plugin-slack": "^0.1.1",
+    "@nextclaw/channel-plugin-qq": "^0.1.1",
+    "@nextclaw/channel-runtime": "^0.1.1"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",