nextclaw 0.4.10 → 0.4.12

package/dist/cli/index.js

@@ -42,7 +42,12 @@ import {
   installPluginFromNpmSpec,
   uninstallPlugin,
   resolveUninstallDirectoryTarget,
-  loadPluginUiMetadata
+  setPluginRuntimeBridge,
+  getPluginChannelBindings,
+  getPluginUiMetadataFromRegistry,
+  resolvePluginChannelMessageToolHints,
+  startPluginChannelGateways,
+  stopPluginChannelGateways
 } from "@nextclaw/openclaw-compat";
 import { startUiServer } from "@nextclaw/server";
 import {
@@ -78,7 +83,7 @@ import { join, resolve } from "path";
 import { spawn } from "child_process";
 import { createServer } from "net";
 import { fileURLToPath } from "url";
-import { getDataDir, getPackageVersion } from "@nextclaw/core";
+import { getDataDir, getPackageVersion as getCorePackageVersion } from "@nextclaw/core";
 function resolveUiConfig(config, overrides) {
   const base = config.ui ?? { enabled: false, host: "127.0.0.1", port: 18791, open: false };
   return { ...base, ...overrides ?? {} };
@@ -229,6 +234,34 @@ function which(binary) {
   }
   return false;
 }
+function resolveVersionFromPackageTree(startDir, expectedName) {
+  let current = resolve(startDir);
+  while (current.length > 0) {
+    const pkgPath = join(current, "package.json");
+    if (existsSync(pkgPath)) {
+      try {
+        const raw = readFileSync(pkgPath, "utf-8");
+        const parsed = JSON.parse(raw);
+        if (typeof parsed.version === "string") {
+          if (!expectedName || parsed.name === expectedName) {
+            return parsed.version;
+          }
+        }
+      } catch {
+      }
+    }
+    const parent = resolve(current, "..");
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return null;
+}
+function getPackageVersion() {
+  const cliDir = resolve(fileURLToPath(new URL(".", import.meta.url)));
+  return resolveVersionFromPackageTree(cliDir, "nextclaw") ?? resolveVersionFromPackageTree(cliDir) ?? getCorePackageVersion();
+}
 function startUiFrontend(options) {
   const uiDir = options.dir ?? resolveUiFrontendDir();
   if (!uiDir) {
@@ -888,7 +921,13 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       restrictToWorkspace: config.tools.restrictToWorkspace,
       contextConfig: config.agents.context,
       config,
-      extensionRegistry
+      extensionRegistry,
+      resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
+        registry: pluginRegistry,
+        channel,
+        cfg: loadConfig(),
+        accountId
+      })
     });
     if (opts.message) {
       const response = await agentLoop.processDirect({
@@ -1347,6 +1386,21 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     console.log(`Telegram: ${config.channels.telegram.enabled ? "\u2713" : "\u2717"}`);
     console.log(`Slack: ${config.channels.slack.enabled ? "\u2713" : "\u2717"}`);
     console.log(`QQ: ${config.channels.qq.enabled ? "\u2713" : "\u2717"}`);
+    const workspaceDir = getWorkspacePath(config.agents.defaults.workspace);
+    const report = buildPluginStatusReport({
+      config,
+      workspaceDir,
+      reservedChannelIds: Object.keys(config.channels),
+      reservedProviderIds: PROVIDERS.map((provider) => provider.name)
+    });
+    const pluginChannels = report.plugins.filter((plugin) => plugin.status === "loaded" && plugin.channelIds.length > 0);
+    if (pluginChannels.length > 0) {
+      console.log("Plugin Channels:");
+      for (const plugin of pluginChannels) {
+        const channels2 = plugin.channelIds.join(", ");
+        console.log(`- ${channels2} (plugin: ${plugin.id})`);
+      }
+    }
   }
   channelsLogin() {
     const bridgeDir = this.getBridgeDir();
@@ -1357,6 +1411,95 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       console.error(`Bridge failed: ${result.status ?? 1}`);
     }
   }
+  channelsAdd(opts) {
+    const channelId = opts.channel?.trim();
+    if (!channelId) {
+      console.error("--channel is required");
+      process.exit(1);
+    }
+    const config = loadConfig();
+    const workspaceDir = getWorkspacePath(config.agents.defaults.workspace);
+    const pluginRegistry = this.loadPluginRegistry(config, workspaceDir);
+    const bindings = getPluginChannelBindings(pluginRegistry);
+    const binding = bindings.find((entry) => entry.channelId === channelId || entry.pluginId === channelId);
+    if (!binding) {
+      console.error(`No plugin channel found for: ${channelId}`);
+      process.exit(1);
+    }
+    const setup = binding.channel.setup;
+    if (!setup?.applyAccountConfig) {
+      console.error(`Channel "${binding.channelId}" does not support setup.`);
+      process.exit(1);
+    }
+    const input = {
+      name: opts.name,
+      token: opts.token,
+      code: opts.code,
+      url: opts.url,
+      httpUrl: opts.httpUrl
+    };
+    const currentView = this.toPluginConfigView(config, bindings);
+    const accountId = binding.channel.config?.defaultAccountId?.(currentView) ?? "default";
+    const validateError = setup.validateInput?.({
+      cfg: currentView,
+      input,
+      accountId
+    });
+    if (validateError) {
+      console.error(`Channel setup validation failed: ${validateError}`);
+      process.exit(1);
+    }
+    const nextView = setup.applyAccountConfig({
+      cfg: currentView,
+      input,
+      accountId
+    });
+    if (!nextView || typeof nextView !== "object" || Array.isArray(nextView)) {
+      console.error("Channel setup returned invalid config payload.");
+      process.exit(1);
+    }
+    let next = this.mergePluginConfigView(config, nextView, bindings);
+    next = enablePluginInConfig(next, binding.pluginId);
+    saveConfig(next);
+    console.log(`Configured channel "${binding.channelId}" via plugin "${binding.pluginId}".`);
+    console.log("Restart the gateway to apply changes.");
+  }
+  toPluginConfigView(config, bindings) {
+    const view = JSON.parse(JSON.stringify(config));
+    const channels2 = view.channels && typeof view.channels === "object" && !Array.isArray(view.channels) ? { ...view.channels } : {};
+    for (const binding of bindings) {
+      const pluginConfig = config.plugins.entries?.[binding.pluginId]?.config;
+      if (!pluginConfig || typeof pluginConfig !== "object" || Array.isArray(pluginConfig)) {
+        continue;
+      }
+      channels2[binding.channelId] = JSON.parse(JSON.stringify(pluginConfig));
+    }
+    view.channels = channels2;
+    return view;
+  }
+  mergePluginConfigView(baseConfig, pluginViewConfig, bindings) {
+    const next = JSON.parse(JSON.stringify(baseConfig));
+    const pluginChannels = pluginViewConfig.channels && typeof pluginViewConfig.channels === "object" && !Array.isArray(pluginViewConfig.channels) ? pluginViewConfig.channels : {};
+    const entries = { ...next.plugins.entries ?? {} };
+    for (const binding of bindings) {
+      if (!Object.prototype.hasOwnProperty.call(pluginChannels, binding.channelId)) {
+        continue;
+      }
+      const channelConfig = pluginChannels[binding.channelId];
+      if (!channelConfig || typeof channelConfig !== "object" || Array.isArray(channelConfig)) {
+        continue;
+      }
+      entries[binding.pluginId] = {
+        ...entries[binding.pluginId] ?? {},
+        config: channelConfig
+      };
+    }
+    next.plugins = {
+      ...next.plugins,
+      entries
+    };
+    return next;
+  }
   cronList(opts) {
     const storePath = join3(getDataDir2(), "cron", "jobs.json");
     const service = new CronService(storePath);
@@ -1526,7 +1669,7 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     const sessionManager = new SessionManager(workspace);
     const cronStorePath = join3(getDataDir2(), "cron", "jobs.json");
     const cron2 = new CronService(cronStorePath);
-    const pluginUiMetadata = loadPluginUiMetadata({ config, workspaceDir: workspace });
+    const pluginUiMetadata = getPluginUiMetadataFromRegistry(pluginRegistry);
     const uiConfig = resolveUiConfig(config, options.uiOverrides);
     const uiStaticDir = options.uiStaticDir === void 0 ? resolveUiStaticDir() : options.uiStaticDir;
     if (!provider) {
@@ -1571,7 +1714,52 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
       contextConfig: config.agents.context,
       gatewayController,
       config,
-      extensionRegistry
+      extensionRegistry,
+      resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
+        registry: pluginRegistry,
+        channel,
+        cfg: loadConfig(),
+        accountId
+      })
+    });
+    const pluginChannelBindings = getPluginChannelBindings(pluginRegistry);
+    setPluginRuntimeBridge({
+      loadConfig: () => this.toPluginConfigView(loadConfig(), pluginChannelBindings),
+      writeConfigFile: async (nextConfigView) => {
+        if (!nextConfigView || typeof nextConfigView !== "object" || Array.isArray(nextConfigView)) {
+          throw new Error("plugin runtime writeConfigFile expects an object config");
+        }
+        const current = loadConfig();
+        const next = this.mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
+        saveConfig(next);
+      },
+      dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
+        const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
+        const body = typeof ctx.Body === "string" ? ctx.Body : "";
+        const content = (bodyForAgent || body).trim();
+        if (!content) {
+          return;
+        }
+        const sessionKey = typeof ctx.SessionKey === "string" && ctx.SessionKey.trim().length > 0 ? ctx.SessionKey : `plugin:${typeof ctx.OriginatingChannel === "string" ? ctx.OriginatingChannel : "channel"}:${typeof ctx.SenderId === "string" ? ctx.SenderId : "unknown"}`;
+        const channel = typeof ctx.OriginatingChannel === "string" && ctx.OriginatingChannel.trim().length > 0 ? ctx.OriginatingChannel : "cli";
+        const chatId = typeof ctx.OriginatingTo === "string" && ctx.OriginatingTo.trim().length > 0 ? ctx.OriginatingTo : typeof ctx.SenderId === "string" && ctx.SenderId.trim().length > 0 ? ctx.SenderId : "direct";
+        try {
+          const response = await agent.processDirect({
+            content,
+            sessionKey,
+            channel,
+            chatId,
+            metadata: typeof ctx.AccountId === "string" && ctx.AccountId.trim().length > 0 ? { account_id: ctx.AccountId } : {}
+          });
+          const replyText = typeof response === "string" ? response : String(response ?? "");
+          if (replyText.trim()) {
+            await dispatcherOptions.deliver({ text: replyText }, { kind: "final" });
+          }
+        } catch (error) {
+          dispatcherOptions.onError?.(error);
+          throw error;
+        }
+      }
     });
     cron2.onJob = async (job) => {
       const response = await agent.processDirect({
@@ -1618,7 +1806,32 @@ ${this.logo} ${APP_NAME} is ready! (${source})`);
     watcher.on("unlink", () => reloader.scheduleReload("config unlink"));
     await cron2.start();
     await heartbeat.start();
-    await Promise.allSettled([agent.run(), reloader.getChannels().startAll()]);
+    let pluginGatewayHandles = [];
+    try {
+      const startedPluginGateways = await startPluginChannelGateways({
+        registry: pluginRegistry,
+        logger: {
+          info: (message) => console.log(`[plugins] ${message}`),
+          warn: (message) => console.warn(`[plugins] ${message}`),
+          error: (message) => console.error(`[plugins] ${message}`),
+          debug: (message) => console.debug(`[plugins] ${message}`)
+        }
+      });
+      pluginGatewayHandles = startedPluginGateways.handles;
+      for (const diag of startedPluginGateways.diagnostics) {
+        const prefix = diag.pluginId ? `${diag.pluginId}: ` : "";
+        const text = `${prefix}${diag.message}`;
+        if (diag.level === "error") {
+          console.error(`[plugins] ${text}`);
+        } else {
+          console.warn(`[plugins] ${text}`);
+        }
+      }
+      await Promise.allSettled([agent.run(), reloader.getChannels().startAll()]);
+    } finally {
+      await stopPluginChannelGateways(pluginGatewayHandles);
+      setPluginRuntimeBridge(null);
+    }
   }
   startUiIfEnabled(uiConfig, uiStaticDir) {
     if (!uiConfig.enabled) {
@@ -2019,6 +2232,7 @@ plugins.command("uninstall <id>").description("Uninstall a plugin").option("--ke
 plugins.command("install <path-or-spec>").description("Install a plugin (path, archive, or npm spec)").option("-l, --link", "Link a local path instead of copying", false).action(async (pathOrSpec, opts) => runtime.pluginsInstall(pathOrSpec, opts));
 plugins.command("doctor").description("Report plugin load issues").action(() => runtime.pluginsDoctor());
 var channels = program.command("channels").description("Manage channels");
+channels.command("add").description("Configure a plugin channel (OpenClaw-compatible setup)").requiredOption("--channel <id>", "Plugin channel id").option("--code <code>", "Pairing code").option("--token <token>", "Connector token").option("--name <name>", "Display name").option("--url <url>", "API base URL").option("--http-url <url>", "Alias for --url").action((opts) => runtime.channelsAdd(opts));
 channels.command("status").description("Show channel status").action(() => runtime.channelsStatus());
 channels.command("login").description("Link device via QR code").action(() => runtime.channelsLogin());
 var cron = program.command("cron").description("Manage scheduled tasks");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -38,9 +38,9 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
-    "@nextclaw/core": "^0.4.8",
-    "@nextclaw/server": "^0.3.4",
-    "@nextclaw/openclaw-compat": "^0.1.1"
+    "@nextclaw/core": "^0.4.10",
+    "@nextclaw/server": "^0.3.5",
+    "@nextclaw/openclaw-compat": "^0.1.2"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",