nextclaw 0.6.33 → 0.6.35

package/dist/cli/index.js

@@ -20,7 +20,11 @@ import {
   DEFAULT_WORKSPACE_DIR,
   DEFAULT_WORKSPACE_PATH
 } from "@nextclaw/core";
-import { resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints2 } from "@nextclaw/openclaw-compat";
+import {
+  getPluginChannelBindings as getPluginChannelBindings3,
+  resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints2,
+  setPluginRuntimeBridge as setPluginRuntimeBridge2
+} from "@nextclaw/openclaw-compat";
 import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
 import { join as join6, resolve as resolve9 } from "path";
 import { createInterface as createInterface2 } from "readline";
@@ -614,8 +618,7 @@ function mergePluginConfigView(baseConfig, pluginViewConfig, bindings) {
   return next;
 }
 var PluginCommands = class {
-  constructor(deps) {
-    this.deps = deps;
+  constructor() {
   }
   pluginsList(opts = {}) {
     const config2 = loadConfig();
@@ -745,19 +748,15 @@ var PluginCommands = class {
     const config2 = loadConfig();
     const next = enablePluginInConfig(config2, id);
     saveConfig(next);
-    await this.deps.requestRestart({
-      reason: `plugin enabled: ${id}`,
-      manualMessage: `Enabled plugin "${id}". Restart the gateway to apply.`
-    });
+    console.log(`Enabled plugin "${id}".`);
+    console.log("If gateway is running, plugin changes are hot-applied automatically.");
   }
   async pluginsDisable(id) {
     const config2 = loadConfig();
     const next = disablePluginInConfig(config2, id);
     saveConfig(next);
-    await this.deps.requestRestart({
-      reason: `plugin disabled: ${id}`,
-      manualMessage: `Disabled plugin "${id}". Restart the gateway to apply.`
-    });
+    console.log(`Disabled plugin "${id}".`);
+    console.log("If gateway is running, plugin changes are hot-applied automatically.");
   }
   async pluginsUninstall(id, opts = {}) {
     const config2 = loadConfig();
@@ -854,10 +853,7 @@ var PluginCommands = class {
       removed.push("directory");
     }
     console.log(`Uninstalled plugin "${pluginId}". Removed: ${removed.length > 0 ? removed.join(", ") : "nothing"}.`);
-    await this.deps.requestRestart({
-      reason: `plugin uninstalled: ${pluginId}`,
-      manualMessage: "Restart the gateway to apply changes."
-    });
+    console.log("If gateway is running, plugin changes are hot-applied automatically.");
   }
   async pluginsInstall(pathOrSpec, opts = {}) {
     const fileSpec = this.resolveFileNpmSpecToLocalPath(pathOrSpec);
@@ -886,10 +882,7 @@ var PluginCommands = class {
         });
         saveConfig(next3);
         console.log(`Linked plugin path: ${resolved}`);
-        await this.deps.requestRestart({
-          reason: `plugin linked: ${probe.pluginId}`,
-          manualMessage: "Restart the gateway to load plugins."
-        });
+        console.log("If gateway is running, plugin changes are hot-applied automatically.");
         return;
       }
       const result2 = await installPluginFromPath({
@@ -913,10 +906,7 @@ var PluginCommands = class {
       });
       saveConfig(next2);
       console.log(`Installed plugin: ${result2.pluginId}`);
-      await this.deps.requestRestart({
-        reason: `plugin installed: ${result2.pluginId}`,
-        manualMessage: "Restart the gateway to load plugins."
-      });
+      console.log("If gateway is running, plugin changes are hot-applied automatically.");
       return;
     }
     if (opts.link) {
@@ -948,10 +938,7 @@ var PluginCommands = class {
     });
     saveConfig(next);
     console.log(`Installed plugin: ${result.pluginId}`);
-    await this.deps.requestRestart({
-      reason: `plugin installed: ${result.pluginId}`,
-      manualMessage: "Restart the gateway to load plugins."
-    });
+    console.log("If gateway is running, plugin changes are hot-applied automatically.");
   }
   pluginsDoctor() {
     const config2 = loadConfig();
@@ -2194,6 +2181,9 @@ var ConfigReloader = class {
   setApplyAgentRuntimeConfig(callback) {
     this.options.applyAgentRuntimeConfig = callback;
   }
+  setReloadPlugins(callback) {
+    this.options.reloadPlugins = callback;
+  }
   async applyReloadPlan(nextConfig) {
     const changedPaths = diffConfigPaths2(this.currentConfig, nextConfig);
     if (!changedPaths.length) {
@@ -2202,6 +2192,10 @@ var ConfigReloader = class {
     this.currentConfig = nextConfig;
     this.options.providerManager?.setConfig(nextConfig);
     const plan = buildReloadPlan2(changedPaths);
+    if (plan.reloadPlugins) {
+      await this.reloadPlugins(nextConfig);
+      console.log("Config reload: plugins reloaded.");
+    }
     if (plan.restartChannels) {
       await this.reloadChannels(nextConfig);
       console.log("Config reload: channels restarted.");
@@ -2297,6 +2291,12 @@ var ConfigReloader = class {
       this.providerReloadTask = null;
     }
   }
+  async reloadPlugins(nextConfig) {
+    if (!this.options.reloadPlugins) {
+      return;
+    }
+    await this.options.reloadPlugins(nextConfig);
+  }
 };
 
 // src/cli/missing-provider.ts
@@ -2381,6 +2381,10 @@ var GatewayAgentRuntimePool = class {
     this.routeResolver.updateConfig(config2);
     this.rebuild(config2);
   }
+  applyExtensionRegistry(extensionRegistry) {
+    this.options.extensionRegistry = extensionRegistry;
+    this.rebuild(this.options.config);
+  }
   async processDirect(params) {
     const message = {
       channel: params.channel ?? "cli",
@@ -2497,8 +2501,8 @@ var ServiceCommands = class {
   async startGateway(options = {}) {
     const config2 = loadConfig5();
     const workspace = getWorkspacePath5(config2.agents.defaults.workspace);
-    const pluginRegistry = loadPluginRegistry(config2, workspace);
-    const extensionRegistry = toExtensionRegistry(pluginRegistry);
+    let pluginRegistry = loadPluginRegistry(config2, workspace);
+    let extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
     const bus = new MessageBus();
     const provider = options.allowMissingProvider === true ? this.makeProvider(config2, { allowMissing: true }) : this.makeProvider(config2);
@@ -2507,6 +2511,24 @@ var ServiceCommands = class {
       config: config2
     });
     const sessionManager = new SessionManager(workspace);
+    let pluginGatewayHandles = [];
+    const pluginGatewayLogger = {
+      info: (message) => console.log(`[plugins] ${message}`),
+      warn: (message) => console.warn(`[plugins] ${message}`),
+      error: (message) => console.error(`[plugins] ${message}`),
+      debug: (message) => console.debug(`[plugins] ${message}`)
+    };
+    const logPluginGatewayDiagnostics = (diagnostics) => {
+      for (const diag of 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}`);
+        }
+      }
+    };
     const cronStorePath = join4(getDataDir5(), "cron", "jobs.json");
     const cron2 = new CronService2(cronStorePath);
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
@@ -2568,7 +2590,26 @@ var ServiceCommands = class {
       })
     });
     reloader.setApplyAgentRuntimeConfig((nextConfig) => runtimePool.applyRuntimeConfig(nextConfig));
-    const pluginChannelBindings = getPluginChannelBindings2(pluginRegistry);
+    reloader.setReloadPlugins(async (nextConfig) => {
+      const nextWorkspace = getWorkspacePath5(nextConfig.agents.defaults.workspace);
+      const nextPluginRegistry = loadPluginRegistry(nextConfig, nextWorkspace);
+      const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
+      logPluginDiagnostics(nextPluginRegistry);
+      await stopPluginChannelGateways(pluginGatewayHandles);
+      const startedPluginGateways = await startPluginChannelGateways({
+        registry: nextPluginRegistry,
+        logger: pluginGatewayLogger
+      });
+      pluginGatewayHandles = startedPluginGateways.handles;
+      logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
+      pluginRegistry = nextPluginRegistry;
+      extensionRegistry = nextExtensionRegistry;
+      pluginChannelBindings = getPluginChannelBindings2(nextPluginRegistry);
+      runtimePool.applyExtensionRegistry(nextExtensionRegistry);
+      runtimePool.applyRuntimeConfig(nextConfig);
+      console.log("Config reload: plugin channel gateways restarted.");
+    });
+    let pluginChannelBindings = getPluginChannelBindings2(pluginRegistry);
     setPluginRuntimeBridge({
       loadConfig: () => toPluginConfigView(loadConfig5(), pluginChannelBindings),
       writeConfigFile: async (nextConfigView) => {
@@ -2658,27 +2699,13 @@ var ServiceCommands = class {
     watcher.on("unlink", () => reloader.scheduleReload("config unlink"));
     await cron2.start();
     await heartbeat.start();
-    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}`)
-        }
+        logger: pluginGatewayLogger
       });
       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}`);
-        }
-      }
+      logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
       await reloader.getChannels().startAll();
       await this.wakeFromRestartSentinel({ bus, sessionManager });
       await runtimePool.run();
@@ -3236,9 +3263,7 @@ var CliRuntime = class {
     this.configCommands = new ConfigCommands({
       requestRestart: (params) => this.requestRestart(params)
     });
-    this.pluginCommands = new PluginCommands({
-      requestRestart: (params) => this.requestRestart(params)
-    });
+    this.pluginCommands = new PluginCommands();
     this.channelCommands = new ChannelCommands({
       logo: this.logo,
       getBridgeDir: () => this.workspaceManager.getBridgeDir(),
@@ -3274,7 +3299,9 @@ var CliRuntime = class {
       }
       const uiHost = FORCED_PUBLIC_UI_HOST;
       const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
-      console.log(`Applying changes (${reason}): restarting ${APP_NAME4} background service...`);
+      console.log(
+        `Applying changes (${reason}): restarting ${APP_NAME4} background service...`
+      );
       await this.serviceCommands.stopService();
       await this.serviceCommands.startService({
         uiOverrides: {
@@ -3421,11 +3448,15 @@ var CliRuntime = class {
         }
       });
     } catch (error) {
-      console.warn(`Warning: failed to write restart sentinel from exec context: ${String(error)}`);
+      console.warn(
+        `Warning: failed to write restart sentinel from exec context: ${String(error)}`
+      );
     }
   }
   async onboard() {
-    console.warn(`Warning: ${APP_NAME4} onboard is deprecated. Use "${APP_NAME4} init" instead.`);
+    console.warn(
+      `Warning: ${APP_NAME4} onboard is deprecated. Use "${APP_NAME4} init" instead.`
+    );
     await this.init({ source: "onboard" });
   }
   async init(options = {}) {
@@ -3444,7 +3475,10 @@ var CliRuntime = class {
     const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join6(getDataDir7(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
     const workspaceExisted = existsSync8(workspacePath);
     mkdirSync5(workspacePath, { recursive: true });
-    const templateResult = this.workspaceManager.createWorkspaceTemplates(workspacePath, { force });
+    const templateResult = this.workspaceManager.createWorkspaceTemplates(
+      workspacePath,
+      { force }
+    );
     if (createdConfig) {
       console.log(`\u2713 ${prefix}: created config at ${configPath}`);
     }
@@ -3464,7 +3498,9 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
       console.log(`  1. Add your API key to ${configPath}`);
       console.log(`  2. Chat: ${APP_NAME4} agent -m "Hello!"`);
     } else {
-      console.log(`Tip: Run "${APP_NAME4} init${force ? " --force" : ""}" to re-run initialization if needed.`);
+      console.log(
+        `Tip: Run "${APP_NAME4} init${force ? " --force" : ""}" to re-run initialization if needed.`
+      );
     }
   }
   async gateway(opts) {
@@ -3491,7 +3527,10 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     if (opts.port) {
       uiOverrides.port = Number(opts.port);
     }
-    await this.serviceCommands.startGateway({ uiOverrides, allowMissingProvider: true });
+    await this.serviceCommands.startGateway({
+      uiOverrides,
+      allowMissingProvider: true
+    });
   }
   async start(opts) {
     await this.init({ source: "start", auto: true });
@@ -3545,74 +3584,103 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
-    const bus = new MessageBus2();
-    const provider = this.serviceCommands.createProvider(config2) ?? this.serviceCommands.createMissingProvider(config2);
-    const providerManager = new ProviderManager2({
-      defaultProvider: provider,
-      config: config2
-    });
-    const agentLoop = new AgentLoop2({
-      bus,
-      providerManager,
-      workspace,
-      model: config2.agents.defaults.model,
-      maxIterations: config2.agents.defaults.maxToolIterations,
-      maxTokens: config2.agents.defaults.maxTokens,
-      contextTokens: config2.agents.defaults.contextTokens,
-      braveApiKey: config2.tools.web.search.apiKey || void 0,
-      execConfig: config2.tools.exec,
-      restrictToWorkspace: config2.tools.restrictToWorkspace,
-      contextConfig: config2.agents.context,
-      config: config2,
-      extensionRegistry,
-      resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
-        registry: pluginRegistry,
-        channel,
-        cfg: loadConfig6(),
-        accountId
-      })
+    const pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
+    setPluginRuntimeBridge2({
+      loadConfig: () => toPluginConfigView(loadConfig6(), pluginChannelBindings),
+      writeConfigFile: async (nextConfigView) => {
+        if (!nextConfigView || typeof nextConfigView !== "object" || Array.isArray(nextConfigView)) {
+          throw new Error(
+            "plugin runtime writeConfigFile expects an object config"
+          );
+        }
+        const current = loadConfig6();
+        const next = mergePluginConfigView(
+          current,
+          nextConfigView,
+          pluginChannelBindings
+        );
+        saveConfig5(next);
+      }
     });
-    if (opts.message) {
-      const response = await agentLoop.processDirect({
-        content: opts.message,
-        sessionKey: opts.session ?? "cli:default",
-        channel: "cli",
-        chatId: "direct",
-        metadata: typeof opts.model === "string" && opts.model.trim() ? { model: opts.model.trim() } : {}
+    try {
+      const bus = new MessageBus2();
+      const provider = this.serviceCommands.createProvider(config2) ?? this.serviceCommands.createMissingProvider(config2);
+      const providerManager = new ProviderManager2({
+        defaultProvider: provider,
+        config: config2
       });
-      printAgentResponse(response);
-      return;
-    }
-    console.log(`${this.logo} Interactive mode (type exit or Ctrl+C to quit)
-`);
-    const historyFile = join6(getDataDir7(), "history", "cli_history");
-    const historyDir = resolve9(historyFile, "..");
-    mkdirSync5(historyDir, { recursive: true });
-    const history = existsSync8(historyFile) ? readFileSync6(historyFile, "utf-8").split("\n").filter(Boolean) : [];
-    const rl = createInterface2({ input: process.stdin, output: process.stdout });
-    rl.on("close", () => {
-      const merged = history.concat(rl.history ?? []);
-      writeFileSync4(historyFile, merged.join("\n"));
-      process.exit(0);
-    });
-    let running = true;
-    while (running) {
-      const line = await prompt(rl, "You: ");
-      const trimmed = line.trim();
-      if (!trimmed) {
-        continue;
-      }
-      if (EXIT_COMMANDS.has(trimmed.toLowerCase())) {
-        rl.close();
-        running = false;
-        break;
+      const agentLoop = new AgentLoop2({
+        bus,
+        providerManager,
+        workspace,
+        model: config2.agents.defaults.model,
+        maxIterations: config2.agents.defaults.maxToolIterations,
+        maxTokens: config2.agents.defaults.maxTokens,
+        contextTokens: config2.agents.defaults.contextTokens,
+        braveApiKey: config2.tools.web.search.apiKey || void 0,
+        execConfig: config2.tools.exec,
+        restrictToWorkspace: config2.tools.restrictToWorkspace,
+        contextConfig: config2.agents.context,
+        config: config2,
+        extensionRegistry,
+        resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
+          registry: pluginRegistry,
+          channel,
+          cfg: loadConfig6(),
+          accountId
+        })
+      });
+      if (opts.message) {
+        const response = await agentLoop.processDirect({
+          content: opts.message,
+          sessionKey: opts.session ?? "cli:default",
+          channel: "cli",
+          chatId: "direct",
+          metadata: typeof opts.model === "string" && opts.model.trim() ? { model: opts.model.trim() } : {}
+        });
+        printAgentResponse(response);
+        return;
       }
-      const response = await agentLoop.processDirect({
-        content: trimmed,
-        sessionKey: opts.session ?? "cli:default",
-        metadata: typeof opts.model === "string" && opts.model.trim() ? { model: opts.model.trim() } : {}
+      console.log(
+        `${this.logo} Interactive mode (type exit or Ctrl+C to quit)
+`
+      );
+      const historyFile = join6(getDataDir7(), "history", "cli_history");
+      const historyDir = resolve9(historyFile, "..");
+      mkdirSync5(historyDir, { recursive: true });
+      const history = existsSync8(historyFile) ? readFileSync6(historyFile, "utf-8").split("\n").filter(Boolean) : [];
+      const rl = createInterface2({
+        input: process.stdin,
+        output: process.stdout
+      });
+      rl.on("close", () => {
+        const merged = history.concat(
+          rl.history ?? []
+        );
+        writeFileSync4(historyFile, merged.join("\n"));
+        process.exit(0);
       });
-      printAgentResponse(response);
+      let running = true;
+      while (running) {
+        const line = await prompt(rl, "You: ");
+        const trimmed = line.trim();
+        if (!trimmed) {
+          continue;
+        }
+        if (EXIT_COMMANDS.has(trimmed.toLowerCase())) {
+          rl.close();
+          running = false;
+          break;
+        }
+        const response = await agentLoop.processDirect({
+          content: trimmed,
+          sessionKey: opts.session ?? "cli:default",
+          metadata: typeof opts.model === "string" && opts.model.trim() ? { model: opts.model.trim() } : {}
+        });
+        printAgentResponse(response);
+      }
+    } finally {
+      setPluginRuntimeBridge2(null);
     }
   }
   async update(opts) {
@@ -3620,7 +3688,9 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     if (opts.timeout !== void 0) {
       const parsed = Number(opts.timeout);
       if (!Number.isFinite(parsed) || parsed <= 0) {
-        console.error("Invalid --timeout value. Provide milliseconds (e.g. 1200000).");
+        console.error(
+          "Invalid --timeout value. Provide milliseconds (e.g. 1200000)."
+        );
         process.exit(1);
       }
       timeoutMs = parsed;
@@ -3630,7 +3700,9 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     const result = runSelfUpdate({ timeoutMs, cwd: process.cwd() });
     const printSteps = () => {
       for (const step of result.steps) {
-        console.log(`- ${step.cmd} ${step.args.join(" ")} (code ${step.code ?? "?"})`);
+        console.log(
+          `- ${step.cmd} ${step.args.join(" ")} (code ${step.code ?? "?"})`
+        );
         if (step.stderr) {
           console.log(`  stderr: ${step.stderr}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.6.33",
+  "version": "0.6.35",
   "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.6.26",
-    "@nextclaw/server": "^0.4.15",
-    "@nextclaw/openclaw-compat": "^0.1.19"
+    "@nextclaw/core": "^0.6.27",
+    "@nextclaw/server": "^0.4.16",
+    "@nextclaw/openclaw-compat": "^0.1.20"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",

package/templates/USAGE.md

@@ -136,13 +136,13 @@ When the gateway is already running, config changes from the UI or `nextclaw con
 - `agents.defaults.contextTokens`
 - `agents.context.*`
 - `tools.*`
+- `plugins.*` (v1 hot plugin runtime: plugin registry/channel gateways/channels are hot-reloaded)
 
 Restart is still required for:
 
 - UI bind port (`--port` / `--ui-port`)
-- `plugins.*`
 
-To confirm hot reload succeeded, check gateway console logs or `${NEXTCLAW_HOME:-~/.nextclaw}/logs/service.log` for messages like `Config reload: ... applied.`
+To confirm hot reload succeeded, check gateway console logs or `${NEXTCLAW_HOME:-~/.nextclaw}/logs/service.log` for messages like `Config reload: plugins reloaded.` / `Config reload: plugin channel gateways restarted.` / `Config reload: channels restarted.`
 
 UI note: **Model** page save now persists both `agents.defaults.model` and `agents.defaults.maxTokens` (refresh should keep the updated max token value).