nextclaw 0.6.34 → 0.6.36

package/dist/cli/index.js

@@ -20,11 +20,15 @@ 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";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import { fileURLToPath as fileURLToPath4 } from "url";
 import { spawn as spawn3 } from "child_process";
 
 // src/cli/restart-coordinator.ts
@@ -1861,6 +1865,7 @@ import { startUiServer } from "@nextclaw/server";
 import { closeSync, mkdirSync as mkdirSync3, openSync } from "fs";
 import { join as join4, resolve as resolve7 } from "path";
 import { spawn as spawn2 } from "child_process";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import chokidar from "chokidar";
 
 // src/cli/gateway/controller.ts
@@ -3046,7 +3051,14 @@ var ServiceCommands = class {
       host: uiConfig.host,
       port: uiConfig.port,
       configPath: getConfigPath2(),
-      staticDir: uiStaticDir ?? void 0
+      staticDir: uiStaticDir ?? void 0,
+      marketplace: {
+        apiBaseUrl: process.env.NEXTCLAW_MARKETPLACE_API_BASE,
+        installer: {
+          installPlugin: (spec) => this.installMarketplacePlugin(spec),
+          installSkill: (params) => this.installMarketplaceSkill(params)
+        }
+      }
     });
     const uiUrl = `http://${uiServer.host}:${uiServer.port}`;
     console.log(`\u2713 UI API: ${uiUrl}/api`);
@@ -3058,13 +3070,75 @@ var ServiceCommands = class {
       openBrowser(uiUrl);
     }
   }
+  async installMarketplacePlugin(spec) {
+    const output = await this.runCliSubcommand(["plugins", "install", spec]);
+    const summary = this.pickLastOutputLine(output) ?? `Installed plugin: ${spec}`;
+    return { message: summary, output };
+  }
+  async installMarketplaceSkill(params) {
+    const args = ["skills", "install", params.slug];
+    if (params.version) {
+      args.push("--version", params.version);
+    }
+    if (params.registry) {
+      args.push("--registry", params.registry);
+    }
+    if (params.force) {
+      args.push("--force");
+    }
+    const output = await this.runCliSubcommand(args);
+    const summary = this.pickLastOutputLine(output) ?? `Installed skill: ${params.slug}`;
+    return { message: summary, output };
+  }
+  runCliSubcommand(args, timeoutMs = 18e4) {
+    const cliEntry = fileURLToPath2(new URL("../index.js", import.meta.url));
+    return new Promise((resolvePromise, rejectPromise) => {
+      const child = spawn2(process.execPath, [...process.execArgv, cliEntry, ...args], {
+        cwd: process.cwd(),
+        env: process.env,
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      let stdout = "";
+      let stderr = "";
+      child.stdout?.setEncoding("utf-8");
+      child.stderr?.setEncoding("utf-8");
+      child.stdout?.on("data", (chunk) => {
+        stdout += chunk;
+      });
+      child.stderr?.on("data", (chunk) => {
+        stderr += chunk;
+      });
+      const timer = setTimeout(() => {
+        child.kill("SIGTERM");
+        rejectPromise(new Error(`CLI command timed out after ${timeoutMs}ms`));
+      }, timeoutMs);
+      child.on("error", (error) => {
+        clearTimeout(timer);
+        rejectPromise(new Error(`failed to start CLI command: ${String(error)}`));
+      });
+      child.on("close", (code) => {
+        clearTimeout(timer);
+        const output = `${stdout}
+${stderr}`.trim();
+        if (code === 0) {
+          resolvePromise(output);
+          return;
+        }
+        rejectPromise(new Error(output || `CLI command failed with code ${code ?? 1}`));
+      });
+    });
+  }
+  pickLastOutputLine(output) {
+    const lines = output.split("\n").map((line) => line.trim()).filter(Boolean);
+    return lines.length > 0 ? lines[lines.length - 1] : null;
+  }
 };
 
 // src/cli/workspace.ts
 import { cpSync, existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync5, readdirSync, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
 import { createRequire } from "module";
 import { dirname, join as join5, resolve as resolve8 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import { APP_NAME as APP_NAME3, getDataDir as getDataDir6 } from "@nextclaw/core";
 import { spawnSync as spawnSync4 } from "child_process";
 var WorkspaceManager = class {
@@ -3171,7 +3245,7 @@ var WorkspaceManager = class {
     if (override) {
       return override;
     }
-    const cliDir = resolve8(fileURLToPath2(new URL(".", import.meta.url)));
+    const cliDir = resolve8(fileURLToPath3(new URL(".", import.meta.url)));
     const pkgRoot = resolve8(cliDir, "..", "..");
     const candidates = [join5(pkgRoot, "templates")];
     for (const candidate of candidates) {
@@ -3190,7 +3264,7 @@ var WorkspaceManager = class {
       console.error("npm not found. Please install Node.js >= 18.");
       process.exit(1);
     }
-    const cliDir = resolve8(fileURLToPath2(new URL(".", import.meta.url)));
+    const cliDir = resolve8(fileURLToPath3(new URL(".", import.meta.url)));
     const pkgRoot = resolve8(cliDir, "..", "..");
     const pkgBridge = join5(pkgRoot, "bridge");
     const srcBridge = join5(pkgRoot, "..", "..", "bridge");
@@ -3295,7 +3369,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: {
@@ -3327,7 +3403,7 @@ var CliRuntime = class {
     }
     const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
     const delayMs = typeof params.delayMs === "number" && Number.isFinite(params.delayMs) ? Math.max(0, Math.floor(params.delayMs)) : 100;
-    const cliPath = process.env.NEXTCLAW_SELF_RELAUNCH_CLI?.trim() || fileURLToPath3(new URL("./index.js", import.meta.url));
+    const cliPath = process.env.NEXTCLAW_SELF_RELAUNCH_CLI?.trim() || fileURLToPath4(new URL("./index.js", import.meta.url));
     const startArgs = [cliPath, "start", "--ui-port", String(uiPort)];
     const serviceStatePath = resolve9(getDataDir7(), "run", "service.json");
     const helperScript = [
@@ -3442,11 +3518,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 = {}) {
@@ -3465,7 +3545,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}`);
     }
@@ -3485,7 +3568,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) {
@@ -3512,7 +3597,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 });
@@ -3566,74 +3654,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
       });
-      printAgentResponse(response);
+      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 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) {
@@ -3641,7 +3758,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;
@@ -3651,7 +3770,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.34",
+  "version": "0.6.36",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -39,7 +39,7 @@
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
     "@nextclaw/core": "^0.6.27",
-    "@nextclaw/server": "^0.4.16",
+    "@nextclaw/server": "^0.4.17",
     "@nextclaw/openclaw-compat": "^0.1.20"
   },
   "devDependencies": {