@nextclaw/openclaw-compat 0.1.6 → 0.1.7

package/dist/index.d.ts

@@ -520,6 +520,43 @@ declare function createPluginRuntime(params: {
     config?: Config;
 }): PluginRuntime;
 
+type PluginRegisterRuntime = {
+    config: Config;
+    workspaceDir: string;
+    logger: PluginLogger;
+    registry: PluginRegistry;
+    toolNameOwners: Map<string, string>;
+    channelIdOwners: Map<string, string>;
+    providerIdOwners: Map<string, string>;
+    resolvedToolNames: Set<string>;
+    reservedToolNames: Set<string>;
+    reservedChannelIds: Set<string>;
+    reservedProviderIds: Set<string>;
+};
+declare function createPluginRegisterRuntime(params: {
+    config: Config;
+    workspaceDir: string;
+    logger: PluginLogger;
+    registry: PluginRegistry;
+    reservedToolNames: Set<string>;
+    reservedChannelIds: Set<string>;
+    reservedProviderIds: Set<string>;
+}): PluginRegisterRuntime;
+declare function registerPluginWithApi(params: {
+    runtime: PluginRegisterRuntime;
+    record: PluginRecord;
+    pluginId: string;
+    source: string;
+    rootDir: string;
+    register: (api: OpenClawPluginApi) => void | Promise<void>;
+    pluginConfig?: Record<string, unknown>;
+}): {
+    ok: true;
+} | {
+    ok: false;
+    error: string;
+};
+
 declare function validateJsonSchemaValue(params: {
     schema: Record<string, unknown>;
     cacheKey: string;
@@ -578,4 +615,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 PluginRegistry, type PluginReplyDispatchParams, type PluginRuntime, type PluginRuntimeBridge, type PluginStatusReport, type PluginToolRegistration, type PluginUiMetadata, type UninstallActions, type UninstallPluginResult, type _CompatOnly, __nextclawPluginSdkCompat, addPluginLoadPath, buildChannelConfigSchema, buildOauthProviderAuthResult, buildPluginStatusReport, createPluginRuntime, disablePluginInConfig, discoverOpenClawPlugins, emptyPluginConfigSchema, enablePluginInConfig, getPackageManifestMetadata, getPluginChannelBindings, getPluginUiMetadataFromRegistry, installPluginFromArchive, installPluginFromDir, installPluginFromFile, installPluginFromNpmSpec, installPluginFromPath, loadOpenClawPlugins, loadPluginManifest, loadPluginManifestRegistry, loadPluginUiMetadata, normalizeAccountId, normalizePluginHttpPath, normalizePluginsConfig, recordPluginInstall, 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, 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

@@ -1057,11 +1057,10 @@ async function installPluginFromPath(params) {
 
 // src/plugins/loader.ts
 import fs5 from "fs";
-import path4 from "path";
+import path5 from "path";
 import { fileURLToPath } from "url";
 import createJitiImport from "jiti";
 import { getWorkspacePathFromConfig } from "@nextclaw/core";
-import { expandHome as expandHome2 } from "@nextclaw/core";
 
 // src/plugins/manifest-registry.ts
 import fs4 from "fs";
@@ -1208,58 +1207,6 @@ function loadPluginUiMetadata(params) {
   return toPluginUiMetadata(registry.plugins);
 }
 
-// src/plugins/runtime.ts
-import { getPackageVersion } from "@nextclaw/core";
-import { MemoryGetTool, MemorySearchTool } from "@nextclaw/core";
-var bridge = {};
-function setPluginRuntimeBridge(next) {
-  bridge = next ?? {};
-}
-function toPluginTool(tool) {
-  return {
-    name: tool.name,
-    description: tool.description,
-    parameters: tool.parameters,
-    execute: (params) => tool.execute(params)
-  };
-}
-function loadConfigWithFallback(config) {
-  if (bridge.loadConfig) {
-    return bridge.loadConfig();
-  }
-  return config ?? {};
-}
-async function writeConfigWithFallback(next) {
-  if (!bridge.writeConfigFile) {
-    throw new Error("plugin runtime config.writeConfigFile is unavailable outside gateway runtime");
-  }
-  await bridge.writeConfigFile(next);
-}
-async function dispatchReplyWithFallback(params) {
-  if (!bridge.dispatchReplyWithBufferedBlockDispatcher) {
-    throw new Error("plugin runtime channel.reply dispatcher is unavailable outside gateway runtime");
-  }
-  await bridge.dispatchReplyWithBufferedBlockDispatcher(params);
-}
-function createPluginRuntime(params) {
-  return {
-    version: getPackageVersion(),
-    config: {
-      loadConfig: () => loadConfigWithFallback(params.config),
-      writeConfigFile: async (next) => writeConfigWithFallback(next)
-    },
-    tools: {
-      createMemorySearchTool: () => toPluginTool(new MemorySearchTool(params.workspace)),
-      createMemoryGetTool: () => toPluginTool(new MemoryGetTool(params.workspace))
-    },
-    channel: {
-      reply: {
-        dispatchReplyWithBufferedBlockDispatcher: async (dispatchParams) => dispatchReplyWithFallback(dispatchParams)
-      }
-    }
-  };
-}
-
 // src/plugins/schema-validator.ts
 import AjvPkg from "ajv";
 var AjvCtor = AjvPkg;
@@ -1274,9 +1221,9 @@ function formatAjvErrors(errors) {
     return ["invalid config"];
   }
   return errors.map((error) => {
-    const path6 = error.instancePath?.replace(/^\//, "").replace(/\//g, ".") || "<root>";
+    const path7 = error.instancePath?.replace(/^\//, "").replace(/\//g, ".") || "<root>";
     const message = error.message ?? "invalid";
-    return `${path6}: ${message}`;
+    return `${path7}: ${message}`;
   });
 }
 function validateJsonSchemaValue(params) {
@@ -1419,6 +1366,395 @@ function listBundledChannelPluginDefinitions() {
 }
 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";
+
+// src/plugins/runtime.ts
+import { getPackageVersion } from "@nextclaw/core";
+import { MemoryGetTool, MemorySearchTool } from "@nextclaw/core";
+var bridge = {};
+function setPluginRuntimeBridge(next) {
+  bridge = next ?? {};
+}
+function toPluginTool(tool) {
+  return {
+    name: tool.name,
+    description: tool.description,
+    parameters: tool.parameters,
+    execute: (params) => tool.execute(params)
+  };
+}
+function loadConfigWithFallback(config) {
+  if (bridge.loadConfig) {
+    return bridge.loadConfig();
+  }
+  return config ?? {};
+}
+async function writeConfigWithFallback(next) {
+  if (!bridge.writeConfigFile) {
+    throw new Error("plugin runtime config.writeConfigFile is unavailable outside gateway runtime");
+  }
+  await bridge.writeConfigFile(next);
+}
+async function dispatchReplyWithFallback(params) {
+  if (!bridge.dispatchReplyWithBufferedBlockDispatcher) {
+    throw new Error("plugin runtime channel.reply dispatcher is unavailable outside gateway runtime");
+  }
+  await bridge.dispatchReplyWithBufferedBlockDispatcher(params);
+}
+function createPluginRuntime(params) {
+  return {
+    version: getPackageVersion(),
+    config: {
+      loadConfig: () => loadConfigWithFallback(params.config),
+      writeConfigFile: async (next) => writeConfigWithFallback(next)
+    },
+    tools: {
+      createMemorySearchTool: () => toPluginTool(new MemorySearchTool(params.workspace)),
+      createMemoryGetTool: () => toPluginTool(new MemoryGetTool(params.workspace))
+    },
+    channel: {
+      reply: {
+        dispatchReplyWithBufferedBlockDispatcher: async (dispatchParams) => dispatchReplyWithFallback(dispatchParams)
+      }
+    }
+  };
+}
+
+// src/plugins/registry.ts
+function buildPluginLogger(base, pluginId) {
+  const withPrefix = (message) => `[plugins:${pluginId}] ${message}`;
+  return {
+    info: (message) => base.info(withPrefix(message)),
+    warn: (message) => base.warn(withPrefix(message)),
+    error: (message) => base.error(withPrefix(message)),
+    debug: base.debug ? (message) => base.debug?.(withPrefix(message)) : void 0
+  };
+}
+function ensureUniqueNames(params) {
+  const accepted = [];
+  for (const rawName of params.names) {
+    const name = rawName.trim();
+    if (!name) {
+      continue;
+    }
+    if (params.reserved.has(name)) {
+      params.diagnostics.push({
+        level: "error",
+        pluginId: params.pluginId,
+        source: params.source,
+        message: `${params.kind} already registered by core: ${name}`
+      });
+      continue;
+    }
+    const owner = params.owners.get(name);
+    if (owner && owner !== params.pluginId) {
+      params.diagnostics.push({
+        level: "error",
+        pluginId: params.pluginId,
+        source: params.source,
+        message: `${params.kind} already registered: ${name} (${owner})`
+      });
+      continue;
+    }
+    params.owners.set(name, params.pluginId);
+    accepted.push(name);
+  }
+  return accepted;
+}
+function normalizeToolList(value) {
+  if (!value) {
+    return [];
+  }
+  const list = Array.isArray(value) ? value : [value];
+  return list.filter((entry) => {
+    if (!entry || typeof entry !== "object") {
+      return false;
+    }
+    const candidate = entry;
+    return typeof candidate.name === "string" && candidate.name.trim().length > 0 && candidate.parameters !== void 0 && typeof candidate.execute === "function";
+  });
+}
+function createPluginRegisterRuntime(params) {
+  return {
+    config: params.config,
+    workspaceDir: params.workspaceDir,
+    logger: params.logger,
+    registry: params.registry,
+    toolNameOwners: /* @__PURE__ */ new Map(),
+    channelIdOwners: /* @__PURE__ */ new Map(),
+    providerIdOwners: /* @__PURE__ */ new Map(),
+    resolvedToolNames: /* @__PURE__ */ new Set(),
+    reservedToolNames: params.reservedToolNames,
+    reservedChannelIds: params.reservedChannelIds,
+    reservedProviderIds: params.reservedProviderIds
+  };
+}
+function registerPluginTool(params) {
+  const toolInput = params.tool;
+  const normalizedNames = [];
+  if (Array.isArray(params.opts?.names)) {
+    for (const name of params.opts?.names ?? []) {
+      const trimmed = String(name).trim();
+      if (trimmed) {
+        normalizedNames.push(trimmed);
+      }
+    }
+  } else if (params.opts?.name && String(params.opts.name).trim()) {
+    normalizedNames.push(String(params.opts.name).trim());
+  }
+  if (typeof toolInput !== "function") {
+    const intrinsic = toolInput.name.trim();
+    if (intrinsic) {
+      normalizedNames.push(intrinsic);
+    }
+  }
+  const acceptedNames = ensureUniqueNames({
+    names: normalizedNames,
+    pluginId: params.pluginId,
+    diagnostics: params.runtime.registry.diagnostics,
+    source: params.source,
+    owners: params.runtime.toolNameOwners,
+    reserved: params.runtime.reservedToolNames,
+    kind: "tool"
+  });
+  if (acceptedNames.length === 0) {
+    return;
+  }
+  const factory = typeof toolInput === "function" ? toolInput : () => toolInput;
+  const registration = {
+    pluginId: params.pluginId,
+    factory,
+    names: acceptedNames,
+    optional: params.opts?.optional === true,
+    source: params.source
+  };
+  params.runtime.registry.tools.push(registration);
+  params.record.toolNames.push(...acceptedNames);
+  if (typeof toolInput === "function") {
+    return;
+  }
+  if (!params.runtime.resolvedToolNames.has(toolInput.name)) {
+    params.runtime.resolvedToolNames.add(toolInput.name);
+    params.runtime.registry.resolvedTools.push(toolInput);
+  }
+}
+function registerPluginChannel(params) {
+  const normalizedChannel = params.registration && typeof params.registration === "object" && "plugin" in params.registration ? params.registration.plugin : params.registration;
+  if (!normalizedChannel || typeof normalizedChannel !== "object") {
+    params.runtime.registry.diagnostics.push({
+      level: "error",
+      pluginId: params.pluginId,
+      source: params.source,
+      message: "channel registration missing plugin object"
+    });
+    return;
+  }
+  const channelObj = normalizedChannel;
+  const rawId = typeof channelObj.id === "string" ? channelObj.id : String(channelObj.id ?? "");
+  const accepted = ensureUniqueNames({
+    names: [rawId],
+    pluginId: params.pluginId,
+    diagnostics: params.runtime.registry.diagnostics,
+    source: params.source,
+    owners: params.runtime.channelIdOwners,
+    reserved: params.runtime.reservedChannelIds,
+    kind: "channel"
+  });
+  if (accepted.length === 0) {
+    return;
+  }
+  const channelPlugin = normalizedChannel;
+  params.runtime.registry.channels.push({
+    pluginId: params.pluginId,
+    channel: channelPlugin,
+    source: params.source
+  });
+  const channelId = accepted[0];
+  params.record.channelIds.push(channelId);
+  const configSchema = channelPlugin.configSchema;
+  if (configSchema && typeof configSchema === "object") {
+    const schema = configSchema.schema;
+    if (schema && typeof schema === "object" && !Array.isArray(schema)) {
+      params.record.configJsonSchema = schema;
+      params.record.configSchema = true;
+    }
+    const uiHints = configSchema.uiHints;
+    if (uiHints && typeof uiHints === "object" && !Array.isArray(uiHints)) {
+      params.record.configUiHints = {
+        ...params.record.configUiHints ?? {},
+        ...uiHints
+      };
+    }
+  }
+  const pushChannelTools = (value, optional, sourceLabel, resolveValue) => {
+    const previewTools = normalizeToolList(value);
+    if (previewTools.length === 0) {
+      return;
+    }
+    const declaredNames = previewTools.map((tool) => tool.name);
+    const acceptedNames = ensureUniqueNames({
+      names: declaredNames,
+      pluginId: params.pluginId,
+      diagnostics: params.runtime.registry.diagnostics,
+      source: params.source,
+      owners: params.runtime.toolNameOwners,
+      reserved: params.runtime.reservedToolNames,
+      kind: "tool"
+    });
+    if (acceptedNames.length === 0) {
+      return;
+    }
+    const factory = (ctx) => {
+      const tools = normalizeToolList(resolveValue(ctx));
+      if (tools.length === 0) {
+        return [];
+      }
+      const byName = new Map(tools.map((tool) => [tool.name, tool]));
+      return acceptedNames.map((name) => byName.get(name)).filter(Boolean);
+    };
+    params.runtime.registry.tools.push({
+      pluginId: params.pluginId,
+      factory,
+      names: acceptedNames,
+      optional,
+      source: params.source
+    });
+    params.record.toolNames.push(...acceptedNames);
+    const previewByName = new Map(previewTools.map((tool) => [tool.name, tool]));
+    for (const name of acceptedNames) {
+      const resolvedTool = previewByName.get(name);
+      if (!resolvedTool || params.runtime.resolvedToolNames.has(resolvedTool.name)) {
+        continue;
+      }
+      params.runtime.resolvedToolNames.add(resolvedTool.name);
+      params.runtime.registry.resolvedTools.push(resolvedTool);
+    }
+    params.runtime.registry.diagnostics.push({
+      level: "warn",
+      pluginId: params.pluginId,
+      source: params.source,
+      message: `${sourceLabel} registered channel-owned tools: ${acceptedNames.join(", ")}`
+    });
+  };
+  const agentTools = channelPlugin.agentTools;
+  if (typeof agentTools === "function") {
+    pushChannelTools(
+      normalizeToolList(agentTools()),
+      false,
+      `channel "${channelId}"`,
+      () => agentTools()
+    );
+  } else if (agentTools) {
+    pushChannelTools(normalizeToolList(agentTools), false, `channel "${channelId}"`, () => agentTools);
+  }
+}
+function registerPluginProvider(params) {
+  const accepted = ensureUniqueNames({
+    names: [params.provider.id],
+    pluginId: params.pluginId,
+    diagnostics: params.runtime.registry.diagnostics,
+    source: params.source,
+    owners: params.runtime.providerIdOwners,
+    reserved: params.runtime.reservedProviderIds,
+    kind: "provider"
+  });
+  if (accepted.length === 0) {
+    return;
+  }
+  params.runtime.registry.providers.push({
+    pluginId: params.pluginId,
+    provider: params.provider,
+    source: params.source
+  });
+  params.record.providerIds.push(accepted[0]);
+}
+function registerPluginWithApi(params) {
+  const pluginRuntime = createPluginRuntime({ workspace: params.runtime.workspaceDir, config: params.runtime.config });
+  const pluginLogger = buildPluginLogger(params.runtime.logger, params.pluginId);
+  const pushUnsupported = (capability) => {
+    params.runtime.registry.diagnostics.push({
+      level: "warn",
+      pluginId: params.pluginId,
+      source: params.source,
+      message: `${capability} is not supported by nextclaw compat layer yet`
+    });
+    pluginLogger.warn(`${capability} is ignored (not supported yet)`);
+  };
+  const api = {
+    id: params.pluginId,
+    name: params.record.name,
+    version: params.record.version,
+    description: params.record.description,
+    source: params.source,
+    config: params.runtime.config,
+    pluginConfig: params.pluginConfig,
+    runtime: pluginRuntime,
+    logger: pluginLogger,
+    registerTool: (tool, opts) => {
+      registerPluginTool({
+        runtime: params.runtime,
+        record: params.record,
+        pluginId: params.pluginId,
+        source: params.source,
+        tool,
+        opts
+      });
+    },
+    registerChannel: (registration) => {
+      registerPluginChannel({
+        runtime: params.runtime,
+        record: params.record,
+        pluginId: params.pluginId,
+        source: params.source,
+        registration
+      });
+    },
+    registerProvider: (provider) => {
+      registerPluginProvider({
+        runtime: params.runtime,
+        record: params.record,
+        pluginId: params.pluginId,
+        source: params.source,
+        provider
+      });
+    },
+    registerHook: () => pushUnsupported("registerHook"),
+    registerGatewayMethod: () => pushUnsupported("registerGatewayMethod"),
+    registerCli: () => pushUnsupported("registerCli"),
+    registerService: () => pushUnsupported("registerService"),
+    registerCommand: () => pushUnsupported("registerCommand"),
+    registerHttpHandler: () => pushUnsupported("registerHttpHandler"),
+    registerHttpRoute: () => pushUnsupported("registerHttpRoute"),
+    resolvePath: (input) => {
+      const trimmed = input.trim();
+      if (!trimmed) {
+        return params.rootDir;
+      }
+      if (path4.isAbsolute(trimmed)) {
+        return path4.resolve(expandHome2(trimmed));
+      }
+      return path4.resolve(params.rootDir, trimmed);
+    }
+  };
+  try {
+    const result = params.register(api);
+    if (result && typeof result === "object" && "then" in result) {
+      params.runtime.registry.diagnostics.push({
+        level: "warn",
+        pluginId: params.pluginId,
+        source: params.source,
+        message: "plugin register returned a promise; async registration is ignored"
+      });
+    }
+    return { ok: true };
+  } catch (err) {
+    const error = `plugin failed during register: ${String(err)}`;
+    return { ok: false, error };
+  }
+}
+
 // src/plugins/loader.ts
 var createJiti = createJitiImport;
 var defaultLogger2 = {
@@ -1431,17 +1767,17 @@ function resolvePluginSdkAliasFile(params) {
   try {
     const modulePath = fileURLToPath(import.meta.url);
     const isProduction = process.env.NODE_ENV === "production";
-    let cursor = path4.dirname(modulePath);
+    let cursor = path5.dirname(modulePath);
     for (let i = 0; i < 6; i += 1) {
-      const srcCandidate = path4.join(cursor, "src", "plugin-sdk", params.srcFile);
-      const distCandidate = path4.join(cursor, "dist", "plugin-sdk", params.distFile);
+      const srcCandidate = path5.join(cursor, "src", "plugin-sdk", params.srcFile);
+      const distCandidate = path5.join(cursor, "dist", "plugin-sdk", params.distFile);
       const candidates = isProduction ? [distCandidate, srcCandidate] : [srcCandidate, distCandidate];
       for (const candidate of candidates) {
         if (fs5.existsSync(candidate)) {
           return candidate;
         }
       }
-      const parent = path4.dirname(cursor);
+      const parent = path5.dirname(cursor);
       if (parent === cursor) {
         break;
       }
@@ -1471,19 +1807,6 @@ function resolvePluginModuleExport(moduleExport) {
   }
   return {};
 }
-function normalizeToolList(value) {
-  if (!value) {
-    return [];
-  }
-  const list = Array.isArray(value) ? value : [value];
-  return list.filter((entry) => {
-    if (!entry || typeof entry !== "object") {
-      return false;
-    }
-    const candidate = entry;
-    return typeof candidate.name === "string" && candidate.name.trim().length > 0 && candidate.parameters !== void 0 && typeof candidate.execute === "function";
-  });
-}
 function createPluginRecord(params) {
   return {
     id: params.id,
@@ -1504,46 +1827,6 @@ function createPluginRecord(params) {
     configJsonSchema: params.configJsonSchema
   };
 }
-function buildPluginLogger(base, pluginId) {
-  const withPrefix = (message) => `[plugins:${pluginId}] ${message}`;
-  return {
-    info: (message) => base.info(withPrefix(message)),
-    warn: (message) => base.warn(withPrefix(message)),
-    error: (message) => base.error(withPrefix(message)),
-    debug: base.debug ? (message) => base.debug?.(withPrefix(message)) : void 0
-  };
-}
-function ensureUniqueNames(params) {
-  const accepted = [];
-  for (const rawName of params.names) {
-    const name = rawName.trim();
-    if (!name) {
-      continue;
-    }
-    if (params.reserved.has(name)) {
-      params.diagnostics.push({
-        level: "error",
-        pluginId: params.pluginId,
-        source: params.source,
-        message: `${params.kind} already registered by core: ${name}`
-      });
-      continue;
-    }
-    const owner = params.owners.get(name);
-    if (owner && owner !== params.pluginId) {
-      params.diagnostics.push({
-        level: "error",
-        pluginId: params.pluginId,
-        source: params.source,
-        message: `${params.kind} already registered: ${name} (${owner})`
-      });
-      continue;
-    }
-    params.owners.set(name, params.pluginId);
-    accepted.push(name);
-  }
-  return accepted;
-}
 function isPlaceholderConfigSchema(schema) {
   if (!schema || typeof schema !== "object") {
     return false;
@@ -1592,7 +1875,7 @@ function appendBundledChannelPlugins(params) {
       kind: definition.kind,
       source,
       origin: "bundled",
-      workspaceDir: params.workspaceDir,
+      workspaceDir: params.runtime.workspaceDir,
       enabled: true,
       configSchema: Boolean(definition.configSchema),
       configJsonSchema: definition.configSchema
@@ -1610,203 +1893,26 @@ function appendBundledChannelPlugins(params) {
       });
       continue;
     }
-    const pluginRuntime = createPluginRuntime({ workspace: params.workspaceDir, config: params.config });
-    const pluginLogger = buildPluginLogger(params.logger, pluginId);
-    const pushUnsupported = (capability) => {
-      params.registry.diagnostics.push({
-        level: "warn",
-        pluginId,
-        source,
-        message: `${capability} is not supported by nextclaw compat layer yet`
-      });
-      pluginLogger.warn(`${capability} is ignored (not supported yet)`);
-    };
-    const api = {
-      id: pluginId,
-      name: record.name,
-      version: record.version,
-      description: record.description,
+    const result = registerPluginWithApi({
+      runtime: params.runtime,
+      record,
+      pluginId,
       source,
-      config: params.config,
-      pluginConfig: void 0,
-      runtime: pluginRuntime,
-      logger: pluginLogger,
-      registerTool: () => pushUnsupported("registerTool"),
-      registerChannel: (registration) => {
-        const normalizedChannel = registration && typeof registration === "object" && "plugin" in registration ? registration.plugin : registration;
-        if (!normalizedChannel || typeof normalizedChannel !== "object") {
-          params.registry.diagnostics.push({
-            level: "error",
-            pluginId,
-            source,
-            message: "channel registration missing plugin object"
-          });
-          return;
-        }
-        const channelObj = normalizedChannel;
-        const rawId = typeof channelObj.id === "string" ? channelObj.id : String(channelObj.id ?? "");
-        const accepted = ensureUniqueNames({
-          names: [rawId],
-          pluginId,
-          diagnostics: params.registry.diagnostics,
-          source,
-          owners: params.channelIdOwners,
-          reserved: params.reservedChannelIds,
-          kind: "channel"
-        });
-        if (accepted.length === 0) {
-          return;
-        }
-        const channelPlugin = normalizedChannel;
-        params.registry.channels.push({
-          pluginId,
-          channel: channelPlugin,
-          source
-        });
-        const channelId = accepted[0];
-        record.channelIds.push(channelId);
-        const configSchema = channelPlugin.configSchema;
-        if (configSchema && typeof configSchema === "object") {
-          const schema = configSchema.schema;
-          if (schema && typeof schema === "object" && !Array.isArray(schema)) {
-            record.configJsonSchema = schema;
-            record.configSchema = true;
-          }
-          const uiHints = configSchema.uiHints;
-          if (uiHints && typeof uiHints === "object" && !Array.isArray(uiHints)) {
-            record.configUiHints = {
-              ...record.configUiHints ?? {},
-              ...uiHints
-            };
-          }
-        }
-        const pushChannelTools = (value, optional, sourceLabel, resolveValue) => {
-          const previewTools = normalizeToolList(value);
-          if (previewTools.length === 0) {
-            return;
-          }
-          const declaredNames = previewTools.map((tool) => tool.name);
-          const acceptedNames = ensureUniqueNames({
-            names: declaredNames,
-            pluginId,
-            diagnostics: params.registry.diagnostics,
-            source,
-            owners: params.toolNameOwners,
-            reserved: params.reservedToolNames,
-            kind: "tool"
-          });
-          if (acceptedNames.length === 0) {
-            return;
-          }
-          const factory = (ctx) => {
-            const tools = normalizeToolList(resolveValue(ctx));
-            if (tools.length === 0) {
-              return [];
-            }
-            const byName = new Map(tools.map((tool) => [tool.name, tool]));
-            return acceptedNames.map((name) => byName.get(name)).filter(Boolean);
-          };
-          params.registry.tools.push({
-            pluginId,
-            factory,
-            names: acceptedNames,
-            optional,
-            source
-          });
-          record.toolNames.push(...acceptedNames);
-          const previewByName = new Map(previewTools.map((tool) => [tool.name, tool]));
-          for (const name of acceptedNames) {
-            const resolvedTool = previewByName.get(name);
-            if (!resolvedTool || params.resolvedToolNames.has(resolvedTool.name)) {
-              continue;
-            }
-            params.resolvedToolNames.add(resolvedTool.name);
-            params.registry.resolvedTools.push(resolvedTool);
-          }
-          params.registry.diagnostics.push({
-            level: "warn",
-            pluginId,
-            source,
-            message: `${sourceLabel} registered channel-owned tools: ${acceptedNames.join(", ")}`
-          });
-        };
-        const agentTools = channelPlugin.agentTools;
-        if (typeof agentTools === "function") {
-          pushChannelTools(
-            normalizeToolList(agentTools()),
-            false,
-            `channel "${channelId}"`,
-            () => agentTools()
-          );
-        } else if (agentTools) {
-          pushChannelTools(
-            normalizeToolList(agentTools),
-            false,
-            `channel "${channelId}"`,
-            () => agentTools
-          );
-        }
-      },
-      registerProvider: (provider) => {
-        const accepted = ensureUniqueNames({
-          names: [provider.id],
-          pluginId,
-          diagnostics: params.registry.diagnostics,
-          source,
-          owners: params.providerIdOwners,
-          reserved: params.reservedProviderIds,
-          kind: "provider"
-        });
-        if (accepted.length === 0) {
-          return;
-        }
-        params.registry.providers.push({
-          pluginId,
-          provider,
-          source
-        });
-        record.providerIds.push(accepted[0]);
-      },
-      registerHook: () => pushUnsupported("registerHook"),
-      registerGatewayMethod: () => pushUnsupported("registerGatewayMethod"),
-      registerCli: () => pushUnsupported("registerCli"),
-      registerService: () => pushUnsupported("registerService"),
-      registerCommand: () => pushUnsupported("registerCommand"),
-      registerHttpHandler: () => pushUnsupported("registerHttpHandler"),
-      registerHttpRoute: () => pushUnsupported("registerHttpRoute"),
-      resolvePath: (input) => {
-        const trimmed = input.trim();
-        if (!trimmed) {
-          return params.workspaceDir;
-        }
-        if (path4.isAbsolute(trimmed)) {
-          return path4.resolve(expandHome2(trimmed));
-        }
-        return path4.resolve(params.workspaceDir, trimmed);
-      }
-    };
-    try {
-      const result = register(api);
-      if (result && typeof result === "object" && "then" in result) {
-        params.registry.diagnostics.push({
-          level: "warn",
-          pluginId,
-          source,
-          message: "plugin register returned a promise; async registration is ignored"
-        });
-      }
-      params.registry.plugins.push(record);
-    } catch (err) {
+      rootDir: params.runtime.workspaceDir,
+      register,
+      pluginConfig: void 0
+    });
+    if (!result.ok) {
       record.status = "error";
-      record.error = `plugin failed during register: ${String(err)}`;
-      params.registry.plugins.push(record);
+      record.error = result.error;
       params.registry.diagnostics.push({
         level: "error",
         pluginId,
         source,
-        message: record.error
+        message: result.error
       });
     }
+    params.registry.plugins.push(record);
   }
 }
 function loadOpenClawPlugins(options) {
@@ -1823,26 +1929,22 @@ function loadOpenClawPlugins(options) {
     diagnostics: [],
     resolvedTools: []
   };
-  const toolNameOwners = /* @__PURE__ */ new Map();
-  const channelIdOwners = /* @__PURE__ */ new Map();
-  const providerIdOwners = /* @__PURE__ */ new Map();
-  const resolvedToolNames = /* @__PURE__ */ new Set();
   const reservedToolNames = new Set(options.reservedToolNames ?? []);
   const reservedChannelIds = new Set(options.reservedChannelIds ?? []);
   const reservedProviderIds = new Set(options.reservedProviderIds ?? []);
-  appendBundledChannelPlugins({
-    registry,
+  const registerRuntime = createPluginRegisterRuntime({
     config: options.config,
-    logger,
     workspaceDir,
-    toolNameOwners,
-    channelIdOwners,
-    providerIdOwners,
-    resolvedToolNames,
+    logger,
+    registry,
     reservedToolNames,
     reservedChannelIds,
     reservedProviderIds
   });
+  appendBundledChannelPlugins({
+    registry,
+    runtime: registerRuntime
+  });
   if (!loadExternalPlugins) {
     return registry;
   }
@@ -2000,264 +2102,30 @@ function loadOpenClawPlugins(options) {
       });
       continue;
     }
-    const pluginRuntime = createPluginRuntime({ workspace: workspaceDir, config: options.config });
-    const pluginLogger = buildPluginLogger(logger, pluginId);
-    const pushUnsupported = (capability) => {
-      registry.diagnostics.push({
-        level: "warn",
-        pluginId,
-        source: candidate.source,
-        message: `${capability} is not supported by nextclaw compat layer yet`
-      });
-      pluginLogger.warn(`${capability} is ignored (not supported yet)`);
-    };
-    const api = {
-      id: pluginId,
-      name: record.name,
-      version: record.version,
-      description: record.description,
+    const registerResult = registerPluginWithApi({
+      runtime: registerRuntime,
+      record,
+      pluginId,
       source: candidate.source,
-      config: options.config,
-      pluginConfig: validatedConfig.value,
-      runtime: pluginRuntime,
-      logger: pluginLogger,
-      registerTool: (tool, opts) => {
-        const declaredNames = opts && Array.isArray(opts.names) ? opts.names : [];
-        const names = [...declaredNames, ...opts && opts.name ? [opts.name] : []];
-        if (typeof tool !== "function" && typeof tool.name === "string") {
-          names.push(tool.name);
-        }
-        const uniqueNames = Array.from(new Set(names.map((name) => name.trim()).filter(Boolean)));
-        const acceptedNames = ensureUniqueNames({
-          names: uniqueNames,
-          pluginId,
-          diagnostics: registry.diagnostics,
-          source: candidate.source,
-          owners: toolNameOwners,
-          reserved: reservedToolNames,
-          kind: "tool"
-        });
-        if (acceptedNames.length === 0) {
-          registry.diagnostics.push({
-            level: "warn",
-            pluginId,
-            source: candidate.source,
-            message: "tool registration skipped: no available tool names"
-          });
-          return;
-        }
-        const factory = typeof tool === "function" ? tool : (_ctx) => tool;
-        registry.tools.push({
-          pluginId,
-          factory,
-          names: acceptedNames,
-          optional: opts?.optional === true,
-          source: candidate.source
-        });
-        record.toolNames.push(...acceptedNames);
-        try {
-          const previewTools = normalizeToolList(
-            factory({
-              config: options.config,
-              workspaceDir,
-              sandboxed: false
-            })
-          );
-          const byName = new Map(previewTools.map((entry2) => [entry2.name, entry2]));
-          for (const name of acceptedNames) {
-            const resolvedTool = byName.get(name);
-            if (!resolvedTool || resolvedToolNames.has(resolvedTool.name)) {
-              continue;
-            }
-            resolvedToolNames.add(resolvedTool.name);
-            registry.resolvedTools.push(resolvedTool);
-          }
-        } catch (err) {
-          registry.diagnostics.push({
-            level: "warn",
-            pluginId,
-            source: candidate.source,
-            message: `tool preview failed: ${String(err)}`
-          });
-        }
-      },
-      registerChannel: (registration) => {
-        const normalizedChannel = registration && typeof registration === "object" && "plugin" in registration ? registration.plugin : registration;
-        if (!normalizedChannel || typeof normalizedChannel !== "object") {
-          registry.diagnostics.push({
-            level: "error",
-            pluginId,
-            source: candidate.source,
-            message: "channel registration missing plugin object"
-          });
-          return;
-        }
-        const channelObj = normalizedChannel;
-        const rawId = typeof channelObj.id === "string" ? channelObj.id : String(channelObj.id ?? "");
-        const accepted = ensureUniqueNames({
-          names: [rawId],
-          pluginId,
-          diagnostics: registry.diagnostics,
-          source: candidate.source,
-          owners: channelIdOwners,
-          reserved: reservedChannelIds,
-          kind: "channel"
-        });
-        if (accepted.length === 0) {
-          return;
-        }
-        const channelPlugin = normalizedChannel;
-        registry.channels.push({
-          pluginId,
-          channel: channelPlugin,
-          source: candidate.source
-        });
-        const channelId = accepted[0];
-        record.channelIds.push(channelId);
-        const configSchema = channelPlugin.configSchema;
-        if (configSchema && typeof configSchema === "object") {
-          const schema = configSchema.schema;
-          if (schema && typeof schema === "object" && !Array.isArray(schema)) {
-            record.configJsonSchema = schema;
-            record.configSchema = true;
-          }
-          const uiHints = configSchema.uiHints;
-          if (uiHints && typeof uiHints === "object" && !Array.isArray(uiHints)) {
-            record.configUiHints = {
-              ...record.configUiHints ?? {},
-              ...uiHints
-            };
-          }
-        }
-        const pushChannelTools = (value, optional, sourceLabel, resolveValue) => {
-          const previewTools = normalizeToolList(value);
-          if (previewTools.length === 0) {
-            return;
-          }
-          const declaredNames = previewTools.map((tool) => tool.name);
-          const acceptedNames = ensureUniqueNames({
-            names: declaredNames,
-            pluginId,
-            diagnostics: registry.diagnostics,
-            source: candidate.source,
-            owners: toolNameOwners,
-            reserved: reservedToolNames,
-            kind: "tool"
-          });
-          if (acceptedNames.length === 0) {
-            return;
-          }
-          const factory = (ctx) => {
-            const tools = normalizeToolList(resolveValue(ctx));
-            if (tools.length === 0) {
-              return [];
-            }
-            const byName = new Map(tools.map((tool) => [tool.name, tool]));
-            return acceptedNames.map((name) => byName.get(name)).filter(Boolean);
-          };
-          registry.tools.push({
-            pluginId,
-            factory,
-            names: acceptedNames,
-            optional,
-            source: candidate.source
-          });
-          record.toolNames.push(...acceptedNames);
-          const previewByName = new Map(previewTools.map((tool) => [tool.name, tool]));
-          for (const name of acceptedNames) {
-            const resolvedTool = previewByName.get(name);
-            if (!resolvedTool || resolvedToolNames.has(resolvedTool.name)) {
-              continue;
-            }
-            resolvedToolNames.add(resolvedTool.name);
-            registry.resolvedTools.push(resolvedTool);
-          }
-          registry.diagnostics.push({
-            level: "warn",
-            pluginId,
-            source: candidate.source,
-            message: `${sourceLabel} registered channel-owned tools: ${acceptedNames.join(", ")}`
-          });
-        };
-        const agentTools = channelPlugin.agentTools;
-        if (typeof agentTools === "function") {
-          pushChannelTools(
-            normalizeToolList(agentTools()),
-            false,
-            `channel "${channelId}"`,
-            () => agentTools()
-          );
-        } else if (agentTools) {
-          pushChannelTools(
-            normalizeToolList(agentTools),
-            false,
-            `channel "${channelId}"`,
-            () => agentTools
-          );
-        }
-      },
-      registerProvider: (provider) => {
-        const accepted = ensureUniqueNames({
-          names: [provider.id],
-          pluginId,
-          diagnostics: registry.diagnostics,
-          source: candidate.source,
-          owners: providerIdOwners,
-          reserved: reservedProviderIds,
-          kind: "provider"
-        });
-        if (accepted.length === 0) {
-          return;
-        }
-        registry.providers.push({
-          pluginId,
-          provider,
-          source: candidate.source
-        });
-        record.providerIds.push(accepted[0]);
-      },
-      registerHook: () => pushUnsupported("registerHook"),
-      registerGatewayMethod: () => pushUnsupported("registerGatewayMethod"),
-      registerCli: () => pushUnsupported("registerCli"),
-      registerService: () => pushUnsupported("registerService"),
-      registerCommand: () => pushUnsupported("registerCommand"),
-      registerHttpHandler: () => pushUnsupported("registerHttpHandler"),
-      registerHttpRoute: () => pushUnsupported("registerHttpRoute"),
-      resolvePath: (input) => {
-        const trimmed = input.trim();
-        if (!trimmed) {
-          return candidate.rootDir;
-        }
-        if (path4.isAbsolute(trimmed)) {
-          return path4.resolve(expandHome2(trimmed));
-        }
-        return path4.resolve(candidate.rootDir, trimmed);
-      }
-    };
-    try {
-      const result = register(api);
-      if (result && typeof result === "object" && "then" in result) {
-        registry.diagnostics.push({
-          level: "warn",
-          pluginId,
-          source: candidate.source,
-          message: "plugin register returned a promise; async registration is ignored"
-        });
-      }
-      registry.plugins.push(record);
-      seenIds.set(pluginId, candidate.origin);
-    } catch (err) {
+      rootDir: candidate.rootDir,
+      register,
+      pluginConfig: validatedConfig.value
+    });
+    if (!registerResult.ok) {
       record.status = "error";
-      record.error = `plugin failed during register: ${String(err)}`;
-      registry.plugins.push(record);
-      seenIds.set(pluginId, candidate.origin);
+      record.error = registerResult.error;
       registry.diagnostics.push({
         level: "error",
         pluginId,
         source: candidate.source,
-        message: record.error
+        message: registerResult.error
       });
+      registry.plugins.push(record);
+      seenIds.set(pluginId, candidate.origin);
+      continue;
     }
+    registry.plugins.push(record);
+    seenIds.set(pluginId, candidate.origin);
   }
   return registry;
 }
@@ -2282,7 +2150,7 @@ function buildPluginStatusReport(params) {
 
 // src/plugins/uninstall.ts
 import fs6 from "fs/promises";
-import path5 from "path";
+import path6 from "path";
 function isLinkedPathInstall(record) {
   if (!record || record.source !== "path") {
     return false;
@@ -2290,7 +2158,7 @@ function isLinkedPathInstall(record) {
   if (!record.sourcePath || !record.installPath) {
     return true;
   }
-  return path5.resolve(record.sourcePath) === path5.resolve(record.installPath);
+  return path6.resolve(record.sourcePath) === path6.resolve(record.installPath);
 }
 function resolveUninstallDirectoryTarget(params) {
   if (!params.hasInstall) {
@@ -2309,7 +2177,7 @@ function resolveUninstallDirectoryTarget(params) {
   if (!configuredPath) {
     return defaultPath;
   }
-  if (path5.resolve(configuredPath) === path5.resolve(defaultPath)) {
+  if (path6.resolve(configuredPath) === path6.resolve(defaultPath)) {
     return configuredPath;
   }
   return defaultPath;
@@ -2435,6 +2303,7 @@ export {
   buildChannelConfigSchema,
   buildOauthProviderAuthResult,
   buildPluginStatusReport,
+  createPluginRegisterRuntime,
   createPluginRuntime,
   disablePluginInConfig,
   discoverOpenClawPlugins,
@@ -2456,6 +2325,7 @@ export {
   normalizePluginHttpPath,
   normalizePluginsConfig,
   recordPluginInstall,
+  registerPluginWithApi,
   removePluginFromConfig,
   resolveEnableState,
   resolvePluginChannelMessageToolHints,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/openclaw-compat",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": false,
   "description": "OpenClaw plugin compatibility layer for NextClaw.",
   "type": "module",