nextclaw 0.11.0 → 0.12.0

package/dist/cli/index.js

@@ -6,12 +6,12 @@ import { APP_NAME as APP_NAME5, APP_TAGLINE } from "@nextclaw/core";
 
 // src/cli/runtime.ts
 import {
-  loadConfig as loadConfig7,
+  loadConfig as loadConfig8,
   saveConfig as saveConfig6,
   getConfigPath as getConfigPath4,
   getDataDir as getDataDir8,
   ConfigSchema as ConfigSchema2,
-  getWorkspacePath as getWorkspacePath7,
+  getWorkspacePath as getWorkspacePath9,
   expandHome as expandHome2,
   MessageBus as MessageBus2,
   AgentLoop,
@@ -22,12 +22,12 @@ import {
   DEFAULT_WORKSPACE_PATH
 } from "@nextclaw/core";
 import {
-  getPluginChannelBindings as getPluginChannelBindings3,
+  getPluginChannelBindings as getPluginChannelBindings4,
   resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints2,
   setPluginRuntimeBridge as setPluginRuntimeBridge2
 } from "@nextclaw/openclaw-compat";
 import { existsSync as existsSync11, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "fs";
-import { join as join7, resolve as resolve10 } from "path";
+import { join as join7, resolve as resolve12 } from "path";
 import { createInterface as createInterface2 } from "readline";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { spawn as spawn3 } from "child_process";
@@ -115,32 +115,32 @@ function resolveRestartSentinelPath() {
   return resolve(getDataDir(), "run", RESTART_SENTINEL_FILENAME);
 }
 async function writeRestartSentinel(payload) {
-  const path = resolveRestartSentinelPath();
-  mkdirSync(resolve(path, ".."), { recursive: true });
+  const path2 = resolveRestartSentinelPath();
+  mkdirSync(resolve(path2, ".."), { recursive: true });
   const file = {
     version: 1,
     payload
   };
-  writeFileSync(path, `${JSON.stringify(file, null, 2)}
+  writeFileSync(path2, `${JSON.stringify(file, null, 2)}
 `, "utf-8");
-  return path;
+  return path2;
 }
 async function consumeRestartSentinel() {
-  const path = resolveRestartSentinelPath();
-  if (!existsSync(path)) {
+  const path2 = resolveRestartSentinelPath();
+  if (!existsSync(path2)) {
     return null;
   }
   try {
-    const raw = readFileSync(path, "utf-8");
+    const raw = readFileSync(path2, "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed || parsed.version !== 1 || !parsed.payload) {
-      rmSync(path, { force: true });
+      rmSync(path2, { force: true });
       return null;
     }
-    rmSync(path, { force: true });
+    rmSync(path2, { force: true });
     return parsed;
   } catch {
-    rmSync(path, { force: true });
+    rmSync(path2, { force: true });
     return null;
   }
 }
@@ -512,11 +512,11 @@ function collectRelativeFiles(rootDir) {
   };
   return walk(rootDir) ? output : null;
 }
-function normalizeMarketplaceRelativePath(path) {
-  return path.replace(/\\/g, "/");
+function normalizeMarketplaceRelativePath(path2) {
+  return path2.replace(/\\/g, "/");
 }
-function isIgnorableMarketplaceResidue(path) {
-  return path === ".DS_Store";
+function isIgnorableMarketplaceResidue(path2) {
+  return path2 === ".DS_Store";
 }
 async function publishMarketplaceSkill(options) {
   const skillDir = resolve3(options.skillDir);
@@ -673,10 +673,10 @@ async function fetchMarketplaceSkillFileBlob(apiBase, slug, file) {
   const arrayBuffer = await response.arrayBuffer();
   return Buffer.from(arrayBuffer);
 }
-function decodeMarketplaceFileContent(path, contentBase64) {
+function decodeMarketplaceFileContent(path2, contentBase64) {
   const normalized = contentBase64.replace(/\s+/g, "");
   if (!normalized || normalized.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(normalized)) {
-    throw new Error(`Invalid marketplace file contentBase64 for path: ${path}`);
+    throw new Error(`Invalid marketplace file contentBase64 for path: ${path2}`);
   }
   return Buffer.from(normalized, "base64");
 }
@@ -806,26 +806,26 @@ function buildServeArgs(options) {
   return [cliPath, "serve", "--ui-port", String(options.uiPort)];
 }
 function readServiceState() {
-  const path = resolveServiceStatePath();
-  if (!existsSync4(path)) {
+  const path2 = resolveServiceStatePath();
+  if (!existsSync4(path2)) {
     return null;
   }
   try {
-    const raw = readFileSync4(path, "utf-8");
+    const raw = readFileSync4(path2, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
   }
 }
 function writeServiceState(state) {
-  const path = resolveServiceStatePath();
-  mkdirSync3(resolve4(path, ".."), { recursive: true });
-  writeFileSync3(path, JSON.stringify(state, null, 2));
+  const path2 = resolveServiceStatePath();
+  mkdirSync3(resolve4(path2, ".."), { recursive: true });
+  writeFileSync3(path2, JSON.stringify(state, null, 2));
 }
 function clearServiceState() {
-  const path = resolveServiceStatePath();
-  if (existsSync4(path)) {
-    rmSync3(path, { force: true });
+  const path2 = resolveServiceStatePath();
+  if (existsSync4(path2)) {
+    rmSync3(path2, { force: true });
   }
 }
 function resolveServiceStatePath() {
@@ -848,7 +848,7 @@ async function waitForExit(pid, timeoutMs) {
     if (!isProcessRunning(pid)) {
       return true;
     }
-    await new Promise((resolve11) => setTimeout(resolve11, 200));
+    await new Promise((resolve13) => setTimeout(resolve13, 200));
   }
   return !isProcessRunning(pid);
 }
@@ -987,8 +987,8 @@ function printAgentResponse(response) {
 async function prompt(rl, question) {
   rl.setPrompt(question);
   rl.prompt();
-  return new Promise((resolve11) => {
-    rl.once("line", (line) => resolve11(line));
+  return new Promise((resolve13) => {
+    rl.once("line", (line) => resolve13(line));
   });
 }
 
@@ -1043,6 +1043,212 @@ function runSelfUpdate(options = {}) {
 }
 
 // src/cli/commands/plugins.ts
+import {
+  buildPluginStatusReport as buildPluginStatusReport2,
+  loadOpenClawPlugins,
+  resolveUninstallDirectoryTargets
+} from "@nextclaw/openclaw-compat";
+
+// src/cli/commands/plugin-command-utils.ts
+import { builtinProviderIds } from "@nextclaw/runtime";
+var RESERVED_PROVIDER_IDS = builtinProviderIds();
+var RESERVED_TOOL_NAMES = [
+  "read_file",
+  "write_file",
+  "edit_file",
+  "list_dir",
+  "exec",
+  "web_search",
+  "web_fetch",
+  "message",
+  "spawn",
+  "sessions_list",
+  "sessions_history",
+  "sessions_send",
+  "memory_search",
+  "memory_get",
+  "subagents",
+  "gateway",
+  "cron"
+];
+function buildReservedPluginLoadOptions() {
+  return {
+    reservedToolNames: [...RESERVED_TOOL_NAMES],
+    reservedChannelIds: [],
+    reservedProviderIds: RESERVED_PROVIDER_IDS,
+    reservedEngineKinds: ["native"],
+    reservedNcpAgentRuntimeKinds: ["native"]
+  };
+}
+function appendPluginCapabilityLines(lines, plugin) {
+  if (plugin.toolNames.length > 0) {
+    lines.push(`Tools: ${plugin.toolNames.join(", ")}`);
+  }
+  if (plugin.channelIds.length > 0) {
+    lines.push(`Channels: ${plugin.channelIds.join(", ")}`);
+  }
+  if (plugin.providerIds.length > 0) {
+    lines.push(`Providers: ${plugin.providerIds.join(", ")}`);
+  }
+  if (plugin.engineKinds.length > 0) {
+    lines.push(`Engines: ${plugin.engineKinds.join(", ")}`);
+  }
+  if (plugin.ncpAgentRuntimeKinds.length > 0) {
+    lines.push(`NCP runtimes: ${plugin.ncpAgentRuntimeKinds.join(", ")}`);
+  }
+}
+
+// src/cli/commands/dev-first-party-plugin-load-paths.ts
+import fs from "fs";
+import path from "path";
+var readJsonFile = (filePath) => {
+  try {
+    const raw = fs.readFileSync(filePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+};
+var readString = (value) => {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed || void 0;
+};
+var hasOpenClawExtensions = (pkg) => {
+  const openclaw = pkg.openclaw;
+  if (!openclaw || typeof openclaw !== "object" || Array.isArray(openclaw)) {
+    return false;
+  }
+  const extensions = openclaw.extensions;
+  return Array.isArray(extensions) && extensions.some((entry) => typeof entry === "string" && entry.trim().length > 0);
+};
+var normalizePackageSpec = (spec) => {
+  const trimmed = spec.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed.startsWith("@")) {
+    const slashIndex = trimmed.indexOf("/");
+    if (slashIndex < 0) {
+      return void 0;
+    }
+    const secondAtIndex = trimmed.indexOf("@", slashIndex + 1);
+    return secondAtIndex < 0 ? trimmed : trimmed.slice(0, secondAtIndex);
+  }
+  const versionIndex = trimmed.indexOf("@");
+  return versionIndex < 0 ? trimmed : trimmed.slice(0, versionIndex);
+};
+var readWorkspacePluginPackages = (workspaceExtensionsDir) => {
+  if (!workspaceExtensionsDir.trim() || !fs.existsSync(workspaceExtensionsDir)) {
+    return [];
+  }
+  const entries = fs.readdirSync(workspaceExtensionsDir, { withFileTypes: true });
+  const packages = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) {
+      continue;
+    }
+    const packageDir = path.join(workspaceExtensionsDir, entry.name);
+    const pkg = readJsonFile(path.join(packageDir, "package.json"));
+    if (!pkg || !hasOpenClawExtensions(pkg)) {
+      continue;
+    }
+    const packageName = readString(pkg.name);
+    if (!packageName?.startsWith("@nextclaw/")) {
+      continue;
+    }
+    packages.push({
+      packageName,
+      dir: packageDir
+    });
+  }
+  return packages;
+};
+var resolveDevFirstPartyPluginLoadPaths = (config2, workspaceExtensionsDir) => {
+  const rootDir = workspaceExtensionsDir?.trim();
+  if (!rootDir) {
+    return [];
+  }
+  const workspacePackages = readWorkspacePluginPackages(rootDir);
+  if (workspacePackages.length === 0) {
+    return [];
+  }
+  const packageDirByName = new Map(workspacePackages.map((entry) => [entry.packageName, entry.dir]));
+  const loadPaths = [];
+  const installs = config2.plugins.installs ?? {};
+  for (const installRecord of Object.values(installs)) {
+    const packageName = normalizePackageSpec(installRecord.spec ?? "");
+    if (!packageName) {
+      continue;
+    }
+    const packageDir = packageDirByName.get(packageName);
+    if (!packageDir || loadPaths.includes(packageDir)) {
+      continue;
+    }
+    loadPaths.push(packageDir);
+  }
+  return loadPaths;
+};
+var resolveDevFirstPartyPluginInstallRoots = (config2, workspaceExtensionsDir) => {
+  const rootDir = workspaceExtensionsDir?.trim();
+  if (!rootDir) {
+    return [];
+  }
+  const workspacePackages = readWorkspacePluginPackages(rootDir);
+  if (workspacePackages.length === 0) {
+    return [];
+  }
+  const packageNames = new Set(workspacePackages.map((entry) => entry.packageName));
+  const installRoots = [];
+  for (const installRecord of Object.values(config2.plugins.installs ?? {})) {
+    const packageName = normalizePackageSpec(installRecord.spec ?? "");
+    if (!packageName || !packageNames.has(packageName)) {
+      continue;
+    }
+    const installPath = readString(installRecord.installPath);
+    if (!installPath || installRoots.includes(installPath)) {
+      continue;
+    }
+    installRoots.push(installPath);
+  }
+  return installRoots;
+};
+var applyDevFirstPartyPluginLoadPaths = (config2, workspaceExtensionsDir) => {
+  const devLoadPaths = resolveDevFirstPartyPluginLoadPaths(config2, workspaceExtensionsDir);
+  if (devLoadPaths.length === 0) {
+    return config2;
+  }
+  const existingLoadPaths = Array.isArray(config2.plugins.load?.paths) ? config2.plugins.load.paths.filter((entry) => typeof entry === "string" && entry.trim().length > 0) : [];
+  const mergedLoadPaths = [...devLoadPaths];
+  for (const entry of existingLoadPaths) {
+    if (!mergedLoadPaths.includes(entry)) {
+      mergedLoadPaths.push(entry);
+    }
+  }
+  return {
+    ...config2,
+    plugins: {
+      ...config2.plugins,
+      load: {
+        ...config2.plugins.load,
+        paths: mergedLoadPaths
+      }
+    }
+  };
+};
+
+// src/cli/commands/plugins.ts
+import {
+  loadConfig as loadConfig2,
+  getWorkspacePath as getWorkspacePath2
+} from "@nextclaw/core";
+import { createInterface } from "readline";
+import { resolve as resolve7 } from "path";
+
+// src/cli/commands/plugin-mutation-actions.ts
 import {
   addPluginLoadPath,
   buildPluginStatusReport,
@@ -1050,48 +1256,203 @@ import {
   enablePluginInConfig,
   installPluginFromNpmSpec,
   installPluginFromPath,
-  loadOpenClawPlugins,
   recordPluginInstall,
-  resolveUninstallDirectoryTarget,
   uninstallPlugin
 } from "@nextclaw/openclaw-compat";
-import {
-  loadConfig,
-  saveConfig,
-  getWorkspacePath,
-  expandHome
-} from "@nextclaw/core";
-import { builtinProviderIds } from "@nextclaw/runtime";
-import { createInterface } from "readline";
 import { existsSync as existsSync5 } from "fs";
 import { resolve as resolve6 } from "path";
-var RESERVED_PROVIDER_IDS = builtinProviderIds();
+import { expandHome, getWorkspacePath, loadConfig, saveConfig } from "@nextclaw/core";
+function resolveFileNpmSpecToLocalPath(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed.toLowerCase().startsWith("file:")) {
+    return null;
+  }
+  const rest = trimmed.slice("file:".length);
+  if (!rest) {
+    return { ok: false, error: "unsupported file: spec: missing path" };
+  }
+  if (rest.startsWith("///")) {
+    return { ok: true, path: rest.slice(2) };
+  }
+  if (rest.startsWith("//localhost/")) {
+    return { ok: true, path: rest.slice("//localhost".length) };
+  }
+  if (rest.startsWith("//")) {
+    return {
+      ok: false,
+      error: 'unsupported file: URL host (expected "file:<path>" or "file:///abs/path")'
+    };
+  }
+  return { ok: true, path: rest };
+}
+function looksLikePath(raw) {
+  return raw.startsWith(".") || raw.startsWith("~") || raw.startsWith("/") || raw.endsWith(".ts") || raw.endsWith(".js") || raw.endsWith(".mjs") || raw.endsWith(".cjs") || raw.endsWith(".tgz") || raw.endsWith(".tar.gz") || raw.endsWith(".tar") || raw.endsWith(".zip");
+}
+function isArchivePath(filePath) {
+  const lower = filePath.toLowerCase();
+  return lower.endsWith(".zip") || lower.endsWith(".tgz") || lower.endsWith(".tar.gz") || lower.endsWith(".tar");
+}
+async function enablePluginMutation(id) {
+  const config2 = loadConfig();
+  const next = enablePluginInConfig(config2, id);
+  saveConfig(next);
+  return {
+    message: `Enabled plugin "${id}".`
+  };
+}
+async function disablePluginMutation(id) {
+  const config2 = loadConfig();
+  const next = disablePluginInConfig(config2, id);
+  saveConfig(next);
+  return {
+    message: `Disabled plugin "${id}".`
+  };
+}
+async function uninstallPluginMutation(id, opts = {}) {
+  const config2 = loadConfig();
+  const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
+  const report = buildPluginStatusReport({
+    config: config2,
+    workspaceDir,
+    ...buildReservedPluginLoadOptions()
+  });
+  const keepFiles = Boolean(opts.keepFiles || opts.keepConfig);
+  const plugin = report.plugins.find((entry) => entry.id === id || entry.name === id);
+  const pluginId = plugin?.id ?? id;
+  const hasEntry = pluginId in (config2.plugins.entries ?? {});
+  const hasInstall = pluginId in (config2.plugins.installs ?? {});
+  if (!hasEntry && !hasInstall) {
+    if (plugin) {
+      throw new Error(
+        `Plugin "${pluginId}" is not managed by plugins config/install records and cannot be uninstalled.`
+      );
+    }
+    throw new Error(`Plugin not found: ${id}`);
+  }
+  const result = await uninstallPlugin({
+    config: config2,
+    pluginId,
+    deleteFiles: !keepFiles
+  });
+  if (!result.ok) {
+    throw new Error(result.error);
+  }
+  saveConfig(result.config);
+  const removed = [];
+  if (result.actions.entry) {
+    removed.push("config entry");
+  }
+  if (result.actions.install) {
+    removed.push("install record");
+  }
+  if (result.actions.allowlist) {
+    removed.push("allowlist");
+  }
+  if (result.actions.loadPath) {
+    removed.push("load path");
+  }
+  if (result.actions.directory) {
+    removed.push("directory");
+  }
+  return {
+    message: `Uninstalled plugin "${pluginId}". Removed: ${removed.length > 0 ? removed.join(", ") : "nothing"}.`,
+    warnings: result.warnings
+  };
+}
+async function installPluginMutation(pathOrSpec, opts = {}) {
+  const fileSpec = resolveFileNpmSpecToLocalPath(pathOrSpec);
+  if (fileSpec && !fileSpec.ok) {
+    throw new Error(fileSpec.error);
+  }
+  const normalized = fileSpec && fileSpec.ok ? fileSpec.path : pathOrSpec;
+  const resolved = resolve6(expandHome(normalized));
+  const config2 = loadConfig();
+  if (existsSync5(resolved)) {
+    if (opts.link) {
+      const probe = await installPluginFromPath({ path: resolved, dryRun: true });
+      if (!probe.ok) {
+        throw new Error(probe.error);
+      }
+      let next3 = addPluginLoadPath(config2, resolved);
+      next3 = enablePluginInConfig(next3, probe.pluginId);
+      next3 = recordPluginInstall(next3, {
+        pluginId: probe.pluginId,
+        source: "path",
+        sourcePath: resolved,
+        installPath: resolved,
+        version: probe.version
+      });
+      saveConfig(next3);
+      return {
+        message: `Linked plugin path: ${resolved}`
+      };
+    }
+    const result2 = await installPluginFromPath({
+      path: resolved,
+      logger: {
+        info: (message) => console.log(message),
+        warn: (message) => console.warn(message)
+      }
+    });
+    if (!result2.ok) {
+      throw new Error(result2.error);
+    }
+    let next2 = enablePluginInConfig(config2, result2.pluginId);
+    next2 = recordPluginInstall(next2, {
+      pluginId: result2.pluginId,
+      source: isArchivePath(resolved) ? "archive" : "path",
+      sourcePath: resolved,
+      installPath: result2.targetDir,
+      version: result2.version
+    });
+    saveConfig(next2);
+    return {
+      message: `Installed plugin: ${result2.pluginId}`
+    };
+  }
+  if (opts.link) {
+    throw new Error("`--link` requires a local path.");
+  }
+  if (looksLikePath(pathOrSpec)) {
+    throw new Error(`Path not found: ${resolved}`);
+  }
+  const result = await installPluginFromNpmSpec({
+    spec: pathOrSpec,
+    logger: {
+      info: (message) => console.log(message),
+      warn: (message) => console.warn(message)
+    }
+  });
+  if (!result.ok) {
+    throw new Error(result.error);
+  }
+  let next = enablePluginInConfig(config2, result.pluginId);
+  next = recordPluginInstall(next, {
+    pluginId: result.pluginId,
+    source: "npm",
+    spec: pathOrSpec,
+    installPath: result.targetDir,
+    version: result.version
+  });
+  saveConfig(next);
+  return {
+    message: `Installed plugin: ${result.pluginId}`
+  };
+}
+
+// src/cli/commands/plugins.ts
 function loadPluginRegistry(config2, workspaceDir) {
+  const workspaceExtensionsDir = process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR;
+  const configWithDevPluginPaths = applyDevFirstPartyPluginLoadPaths(
+    config2,
+    workspaceExtensionsDir
+  );
+  const excludedRoots = resolveDevFirstPartyPluginInstallRoots(config2, workspaceExtensionsDir);
   return loadOpenClawPlugins({
-    config: config2,
+    config: configWithDevPluginPaths,
     workspaceDir,
-    reservedToolNames: [
-      "read_file",
-      "write_file",
-      "edit_file",
-      "list_dir",
-      "exec",
-      "web_search",
-      "web_fetch",
-      "message",
-      "spawn",
-      "sessions_list",
-      "sessions_history",
-      "sessions_send",
-      "memory_search",
-      "memory_get",
-      "subagents",
-      "gateway",
-      "cron"
-    ],
-    reservedChannelIds: [],
-    reservedProviderIds: RESERVED_PROVIDER_IDS,
-    reservedEngineKinds: ["native"],
+    excludeRoots: excludedRoots,
+    ...buildReservedPluginLoadOptions(),
     logger: {
       info: (message) => console.log(message),
       warn: (message) => console.warn(message),
@@ -1120,6 +1481,13 @@ function toExtensionRegistry(pluginRegistry) {
       factory: engine.factory,
       source: engine.source
     })),
+    ncpAgentRuntimes: pluginRegistry.ncpAgentRuntimes.map((runtime2) => ({
+      pluginId: runtime2.pluginId,
+      kind: runtime2.kind,
+      label: runtime2.label,
+      createRuntime: runtime2.createRuntime,
+      source: runtime2.source
+    })),
     diagnostics: pluginRegistry.diagnostics.map((diag) => ({
       level: diag.level,
       message: diag.message,
@@ -1178,15 +1546,25 @@ function mergePluginConfigView(baseConfig, pluginViewConfig, bindings) {
 var PluginCommands = class {
   constructor() {
   }
+  async enablePlugin(id) {
+    return await enablePluginMutation(id);
+  }
+  async disablePlugin(id) {
+    return await disablePluginMutation(id);
+  }
+  async uninstallPlugin(id, opts = {}) {
+    return await uninstallPluginMutation(id, opts);
+  }
+  async installPlugin(pathOrSpec, opts = {}) {
+    return await installPluginMutation(pathOrSpec, opts);
+  }
   pluginsList(opts = {}) {
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
+    const config2 = loadConfig2();
+    const workspaceDir = getWorkspacePath2(config2.agents.defaults.workspace);
+    const report = buildPluginStatusReport2({
       config: config2,
       workspaceDir,
-      reservedChannelIds: [],
-      reservedProviderIds: RESERVED_PROVIDER_IDS,
-      reservedEngineKinds: ["native"]
+      ...buildReservedPluginLoadOptions()
     });
     const list = opts.enabled ? report.plugins.filter((plugin) => plugin.status === "loaded") : report.plugins;
     if (opts.json) {
@@ -1221,17 +1599,10 @@ var PluginCommands = class {
       if (plugin.version) {
         console.log(`  version: ${plugin.version}`);
       }
-      if (plugin.toolNames.length > 0) {
-        console.log(`  tools: ${plugin.toolNames.join(", ")}`);
-      }
-      if (plugin.channelIds.length > 0) {
-        console.log(`  channels: ${plugin.channelIds.join(", ")}`);
-      }
-      if (plugin.providerIds.length > 0) {
-        console.log(`  providers: ${plugin.providerIds.join(", ")}`);
-      }
-      if (plugin.engineKinds.length > 0) {
-        console.log(`  engines: ${plugin.engineKinds.join(", ")}`);
+      const capabilityLines = [];
+      appendPluginCapabilityLines(capabilityLines, plugin);
+      for (const line of capabilityLines) {
+        console.log(`  ${line.toLowerCase()}`);
       }
       if (plugin.error) {
         console.log(`  error: ${plugin.error}`);
@@ -1240,14 +1611,12 @@ var PluginCommands = class {
     }
   }
   pluginsInfo(id, opts = {}) {
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
+    const config2 = loadConfig2();
+    const workspaceDir = getWorkspacePath2(config2.agents.defaults.workspace);
+    const report = buildPluginStatusReport2({
       config: config2,
       workspaceDir,
-      reservedChannelIds: [],
-      reservedProviderIds: RESERVED_PROVIDER_IDS,
-      reservedEngineKinds: ["native"]
+      ...buildReservedPluginLoadOptions()
     });
     const plugin = report.plugins.find((entry) => entry.id === id || entry.name === id);
     if (!plugin) {
@@ -1274,18 +1643,7 @@ var PluginCommands = class {
     if (plugin.version) {
       lines.push(`Version: ${plugin.version}`);
     }
-    if (plugin.toolNames.length > 0) {
-      lines.push(`Tools: ${plugin.toolNames.join(", ")}`);
-    }
-    if (plugin.channelIds.length > 0) {
-      lines.push(`Channels: ${plugin.channelIds.join(", ")}`);
-    }
-    if (plugin.providerIds.length > 0) {
-      lines.push(`Providers: ${plugin.providerIds.join(", ")}`);
-    }
-    if (plugin.engineKinds.length > 0) {
-      lines.push(`Engines: ${plugin.engineKinds.join(", ")}`);
-    }
+    appendPluginCapabilityLines(lines, plugin);
     if (plugin.error) {
       lines.push(`Error: ${plugin.error}`);
     }
@@ -1311,33 +1669,37 @@ var PluginCommands = class {
     console.log(lines.join("\n"));
   }
   async pluginsEnable(id) {
-    const config2 = loadConfig();
-    const next = enablePluginInConfig(config2, id);
-    saveConfig(next);
-    console.log(`Enabled plugin "${id}".`);
+    try {
+      const result = await this.enablePlugin(id);
+      console.log(result.message);
+    } catch (error) {
+      console.error(error instanceof Error ? error.message : String(error));
+      process.exit(1);
+    }
     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);
-    console.log(`Disabled plugin "${id}".`);
+    try {
+      const result = await this.disablePlugin(id);
+      console.log(result.message);
+    } catch (error) {
+      console.error(error instanceof Error ? error.message : String(error));
+      process.exit(1);
+    }
     console.log("If gateway is running, plugin changes are hot-applied automatically.");
   }
   async pluginsUninstall(id, opts = {}) {
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
+    if (opts.keepConfig) {
+      console.log("`--keep-config` is deprecated, use `--keep-files`.");
+    }
+    const config2 = loadConfig2();
+    const workspaceDir = getWorkspacePath2(config2.agents.defaults.workspace);
+    const report = buildPluginStatusReport2({
       config: config2,
       workspaceDir,
-      reservedChannelIds: [],
-      reservedProviderIds: RESERVED_PROVIDER_IDS,
-      reservedEngineKinds: ["native"]
+      ...buildReservedPluginLoadOptions()
     });
     const keepFiles = Boolean(opts.keepFiles || opts.keepConfig);
-    if (opts.keepConfig) {
-      console.log("`--keep-config` is deprecated, use `--keep-files`.");
-    }
     const plugin = report.plugins.find((entry) => entry.id === id || entry.name === id);
     const pluginId = plugin?.id ?? id;
     const hasEntry = pluginId in (config2.plugins.entries ?? {});
@@ -1353,7 +1715,7 @@ var PluginCommands = class {
       process.exit(1);
     }
     const install = config2.plugins.installs?.[pluginId];
-    const isLinked = install?.source === "path" && (!install.installPath || !install.sourcePath || resolve6(install.installPath) === resolve6(install.sourcePath));
+    const isLinked = install?.source === "path" && (!install.installPath || !install.sourcePath || resolve7(install.installPath) === resolve7(install.sourcePath));
     const preview = [];
     if (hasEntry) {
       preview.push("config entry");
@@ -1367,12 +1729,13 @@ var PluginCommands = class {
     if (isLinked && install?.sourcePath && config2.plugins.load?.paths?.includes(install.sourcePath)) {
       preview.push("load path");
     }
-    const deleteTarget = !keepFiles ? resolveUninstallDirectoryTarget({
+    const deleteTargets = !keepFiles ? resolveUninstallDirectoryTargets({
+      config: config2,
       pluginId,
       hasInstall,
       installRecord: install
-    }) : null;
-    if (deleteTarget) {
+    }) : [];
+    for (const deleteTarget of deleteTargets) {
       preview.push(`directory: ${deleteTarget}`);
     }
     const pluginName = plugin?.name || pluginId;
@@ -1390,132 +1753,35 @@ var PluginCommands = class {
         return;
       }
     }
-    const result = await uninstallPlugin({
-      config: config2,
-      pluginId,
-      deleteFiles: !keepFiles
-    });
-    if (!result.ok) {
-      console.error(result.error);
+    try {
+      const result = await this.uninstallPlugin(id, opts);
+      for (const warning of result.warnings) {
+        console.warn(warning);
+      }
+      console.log(result.message);
+    } catch (error) {
+      console.error(error instanceof Error ? error.message : String(error));
       process.exit(1);
     }
-    for (const warning of result.warnings) {
-      console.warn(warning);
-    }
-    saveConfig(result.config);
-    const removed = [];
-    if (result.actions.entry) {
-      removed.push("config entry");
-    }
-    if (result.actions.install) {
-      removed.push("install record");
-    }
-    if (result.actions.allowlist) {
-      removed.push("allowlist");
-    }
-    if (result.actions.loadPath) {
-      removed.push("load path");
-    }
-    if (result.actions.directory) {
-      removed.push("directory");
-    }
-    console.log(`Uninstalled plugin "${pluginId}". Removed: ${removed.length > 0 ? removed.join(", ") : "nothing"}.`);
     console.log("If gateway is running, plugin changes are hot-applied automatically.");
   }
   async pluginsInstall(pathOrSpec, opts = {}) {
-    const fileSpec = this.resolveFileNpmSpecToLocalPath(pathOrSpec);
-    if (fileSpec && !fileSpec.ok) {
-      console.error(fileSpec.error);
-      process.exit(1);
-    }
-    const normalized = fileSpec && fileSpec.ok ? fileSpec.path : pathOrSpec;
-    const resolved = resolve6(expandHome(normalized));
-    const config2 = loadConfig();
-    if (existsSync5(resolved)) {
-      if (opts.link) {
-        const probe = await installPluginFromPath({ path: resolved, dryRun: true });
-        if (!probe.ok) {
-          console.error(probe.error);
-          process.exit(1);
-        }
-        let next3 = addPluginLoadPath(config2, resolved);
-        next3 = enablePluginInConfig(next3, probe.pluginId);
-        next3 = recordPluginInstall(next3, {
-          pluginId: probe.pluginId,
-          source: "path",
-          sourcePath: resolved,
-          installPath: resolved,
-          version: probe.version
-        });
-        saveConfig(next3);
-        console.log(`Linked plugin path: ${resolved}`);
-        console.log("If gateway is running, plugin changes are hot-applied automatically.");
-        return;
-      }
-      const result2 = await installPluginFromPath({
-        path: resolved,
-        logger: {
-          info: (message) => console.log(message),
-          warn: (message) => console.warn(message)
-        }
-      });
-      if (!result2.ok) {
-        console.error(result2.error);
-        process.exit(1);
-      }
-      let next2 = enablePluginInConfig(config2, result2.pluginId);
-      next2 = recordPluginInstall(next2, {
-        pluginId: result2.pluginId,
-        source: this.isArchivePath(resolved) ? "archive" : "path",
-        sourcePath: resolved,
-        installPath: result2.targetDir,
-        version: result2.version
-      });
-      saveConfig(next2);
-      console.log(`Installed plugin: ${result2.pluginId}`);
-      console.log("If gateway is running, plugin changes are hot-applied automatically.");
-      return;
-    }
-    if (opts.link) {
-      console.error("`--link` requires a local path.");
-      process.exit(1);
-    }
-    if (this.looksLikePath(pathOrSpec)) {
-      console.error(`Path not found: ${resolved}`);
-      process.exit(1);
-    }
-    const result = await installPluginFromNpmSpec({
-      spec: pathOrSpec,
-      logger: {
-        info: (message) => console.log(message),
-        warn: (message) => console.warn(message)
-      }
-    });
-    if (!result.ok) {
-      console.error(result.error);
+    try {
+      const result = await this.installPlugin(pathOrSpec, opts);
+      console.log(result.message);
+    } catch (error) {
+      console.error(error instanceof Error ? error.message : String(error));
       process.exit(1);
     }
-    let next = enablePluginInConfig(config2, result.pluginId);
-    next = recordPluginInstall(next, {
-      pluginId: result.pluginId,
-      source: "npm",
-      spec: pathOrSpec,
-      installPath: result.targetDir,
-      version: result.version
-    });
-    saveConfig(next);
-    console.log(`Installed plugin: ${result.pluginId}`);
     console.log("If gateway is running, plugin changes are hot-applied automatically.");
   }
   pluginsDoctor() {
-    const config2 = loadConfig();
-    const workspaceDir = getWorkspacePath(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport({
+    const config2 = loadConfig2();
+    const workspaceDir = getWorkspacePath2(config2.agents.defaults.workspace);
+    const report = buildPluginStatusReport2({
       config: config2,
       workspaceDir,
-      reservedChannelIds: [],
-      reservedProviderIds: RESERVED_PROVIDER_IDS,
-      reservedEngineKinds: ["native"]
+      ...buildReservedPluginLoadOptions()
     });
     const pluginErrors = report.plugins.filter((plugin) => plugin.status === "error");
     const diagnostics = report.diagnostics.filter((diag) => diag.level === "error");
@@ -1545,47 +1811,17 @@ var PluginCommands = class {
       input: process.stdin,
       output: process.stdout
     });
-    const answer = await new Promise((resolve11) => {
-      rl.question(`${question} [y/N] `, (line) => resolve11(line));
+    const answer = await new Promise((resolve13) => {
+      rl.question(`${question} [y/N] `, (line) => resolve13(line));
     });
     rl.close();
     const normalized = answer.trim().toLowerCase();
     return normalized === "y" || normalized === "yes";
   }
-  resolveFileNpmSpecToLocalPath(raw) {
-    const trimmed = raw.trim();
-    if (!trimmed.toLowerCase().startsWith("file:")) {
-      return null;
-    }
-    const rest = trimmed.slice("file:".length);
-    if (!rest) {
-      return { ok: false, error: "unsupported file: spec: missing path" };
-    }
-    if (rest.startsWith("///")) {
-      return { ok: true, path: rest.slice(2) };
-    }
-    if (rest.startsWith("//localhost/")) {
-      return { ok: true, path: rest.slice("//localhost".length) };
-    }
-    if (rest.startsWith("//")) {
-      return {
-        ok: false,
-        error: 'unsupported file: URL host (expected "file:<path>" or "file:///abs/path")'
-      };
-    }
-    return { ok: true, path: rest };
-  }
-  looksLikePath(raw) {
-    return raw.startsWith(".") || raw.startsWith("~") || raw.startsWith("/") || raw.endsWith(".ts") || raw.endsWith(".js") || raw.endsWith(".mjs") || raw.endsWith(".cjs") || raw.endsWith(".tgz") || raw.endsWith(".tar.gz") || raw.endsWith(".tar") || raw.endsWith(".zip");
-  }
-  isArchivePath(filePath) {
-    const lower = filePath.toLowerCase();
-    return lower.endsWith(".zip") || lower.endsWith(".tgz") || lower.endsWith(".tar.gz") || lower.endsWith(".tar");
-  }
 };
 
 // src/cli/commands/config.ts
-import { buildReloadPlan, diffConfigPaths, loadConfig as loadConfig2, saveConfig as saveConfig2 } from "@nextclaw/core";
+import { buildReloadPlan, diffConfigPaths, loadConfig as loadConfig3, saveConfig as saveConfig2 } from "@nextclaw/core";
 
 // src/cli/config-path.ts
 function isIndexSegment(raw) {
@@ -1780,7 +2016,7 @@ var ConfigCommands = class {
     this.deps = deps;
   }
   configGet(pathExpr, opts = {}) {
-    const config2 = loadConfig2();
+    const config2 = loadConfig3();
     let parsedPath;
     try {
       parsedPath = parseRequiredConfigPath(pathExpr);
@@ -1822,7 +2058,7 @@ var ConfigCommands = class {
       process.exit(1);
       return;
     }
-    const prevConfig = loadConfig2();
+    const prevConfig = loadConfig3();
     const nextConfig = structuredClone(prevConfig);
     try {
       setAtConfigPath(nextConfig, parsedPath, parsedValue);
@@ -1848,7 +2084,7 @@ var ConfigCommands = class {
       process.exit(1);
       return;
     }
-    const prevConfig = loadConfig2();
+    const prevConfig = loadConfig3();
     const nextConfig = structuredClone(prevConfig);
     const removed = unsetAtConfigPath(nextConfig, parsedPath);
     if (!removed) {
@@ -1886,7 +2122,7 @@ import {
   buildReloadPlan as buildReloadPlan2,
   diffConfigPaths as diffConfigPaths2,
   getConfigPath,
-  loadConfig as loadConfig3,
+  loadConfig as loadConfig4,
   resolveConfigSecrets,
   saveConfig as saveConfig3
 } from "@nextclaw/core";
@@ -1939,17 +2175,17 @@ function parseRefsPatch(raw) {
     throw new Error("refs patch must be an object");
   }
   const output = {};
-  for (const [path, value] of Object.entries(raw)) {
+  for (const [path2, value] of Object.entries(raw)) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
-      throw new Error(`invalid ref for ${path}`);
+      throw new Error(`invalid ref for ${path2}`);
     }
     const source = normalizeSecretSource(value.source);
     const id = normalizeOptionalString(value.id);
     const provider = normalizeOptionalString(value.provider);
     if (!source || !id) {
-      throw new Error(`invalid ref for ${path}: source/id is required`);
+      throw new Error(`invalid ref for ${path2}: source/id is required`);
     }
-    output[path] = { source, ...provider ? { provider } : {}, id };
+    output[path2] = { source, ...provider ? { provider } : {}, id };
   }
   return output;
 }
@@ -1982,21 +2218,21 @@ var SecretsCommands = class {
     this.deps = deps;
   }
   secretsAudit(opts = {}) {
-    const config2 = loadConfig3();
+    const config2 = loadConfig4();
     const configPath = getConfigPath();
     const refs = config2.secrets.refs;
     const items = [];
-    for (const [path, ref] of Object.entries(refs)) {
+    for (const [path2, ref] of Object.entries(refs)) {
       const provider = inferProviderAlias(config2, ref);
       const scopedConfig = structuredClone(config2);
-      scopedConfig.secrets.refs = { [path]: ref };
+      scopedConfig.secrets.refs = { [path2]: ref };
       try {
         const resolved = resolveConfigSecrets(scopedConfig, { configPath });
-        const parsedPath = parseRequiredConfigPath(path);
+        const parsedPath = parseRequiredConfigPath(path2);
         const target = getAtConfigPath(resolved, parsedPath);
         if (!target.found) {
           items.push({
-            path,
+            path: path2,
             source: ref.source,
             provider,
             id: ref.id,
@@ -2008,7 +2244,7 @@ var SecretsCommands = class {
         const resolvedValue = target.value;
         const detail = typeof resolvedValue === "string" ? `resolved (length=${resolvedValue.length})` : `resolved (${typeof resolvedValue})`;
         items.push({
-          path,
+          path: path2,
           source: ref.source,
           provider,
           id: ref.id,
@@ -2017,7 +2253,7 @@ var SecretsCommands = class {
         });
       } catch (error) {
         items.push({
-          path,
+          path: path2,
           source: ref.source,
           provider,
           id: ref.id,
@@ -2050,7 +2286,7 @@ var SecretsCommands = class {
     if (!alias) {
       throw new Error("provider alias is required");
     }
-    const prevConfig = loadConfig3();
+    const prevConfig = loadConfig4();
     const nextConfig = structuredClone(prevConfig);
     const remove = Boolean(opts.remove);
     if (remove) {
@@ -2071,13 +2307,13 @@ var SecretsCommands = class {
           ...normalizeOptionalString(opts.prefix) ? { prefix: normalizeOptionalString(opts.prefix) } : {}
         };
       } else if (source === "file") {
-        const path = normalizeOptionalString(opts.path);
-        if (!path) {
+        const path2 = normalizeOptionalString(opts.path);
+        if (!path2) {
           throw new Error("file source requires --path");
         }
         nextConfig.secrets.providers[alias] = {
           source,
-          path,
+          path: path2,
           format: "json"
         };
       } else {
@@ -2112,7 +2348,7 @@ var SecretsCommands = class {
     console.log(`Secrets provider ${remove ? "removed" : "configured"}: ${alias}`);
   }
   async secretsApply(opts) {
-    const prevConfig = loadConfig3();
+    const prevConfig = loadConfig4();
     const nextConfig = structuredClone(prevConfig);
     if (opts.enable && opts.disable) {
       throw new Error("cannot set --enable and --disable at the same time");
@@ -2140,12 +2376,12 @@ var SecretsCommands = class {
       }
     }
     if (opts.path) {
-      const path = opts.path.trim();
-      if (!path) {
+      const path2 = opts.path.trim();
+      if (!path2) {
         throw new Error("path is empty");
       }
       if (opts.remove) {
-        delete nextConfig.secrets.refs[path];
+        delete nextConfig.secrets.refs[path2];
       } else {
         const source = normalizeSecretSource(opts.source);
         const id = normalizeOptionalString(opts.id);
@@ -2153,7 +2389,7 @@ var SecretsCommands = class {
           throw new Error("apply single ref requires --source and --id");
         }
         const provider = normalizeOptionalString(opts.provider);
-        nextConfig.secrets.refs[path] = {
+        nextConfig.secrets.refs[path2] = {
           source,
           id,
           ...provider ? { provider } : {}
@@ -2177,7 +2413,7 @@ var SecretsCommands = class {
     console.log("Secrets applied.");
   }
   async secretsReload(opts = {}) {
-    const config2 = loadConfig3();
+    const config2 = loadConfig4();
     const configPath = getConfigPath();
     resolveConfigSecrets(config2, { configPath });
     saveConfig3(config2);
@@ -2205,9 +2441,9 @@ var SecretsCommands = class {
 
 // src/cli/commands/channels.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { getWorkspacePath as getWorkspacePath2, loadConfig as loadConfig4, saveConfig as saveConfig4 } from "@nextclaw/core";
+import { getWorkspacePath as getWorkspacePath3, loadConfig as loadConfig5, saveConfig as saveConfig4 } from "@nextclaw/core";
 import { BUILTIN_CHANNEL_PLUGIN_IDS, builtinProviderIds as builtinProviderIds2 } from "@nextclaw/runtime";
-import { buildPluginStatusReport as buildPluginStatusReport2, enablePluginInConfig as enablePluginInConfig2, getPluginChannelBindings } from "@nextclaw/openclaw-compat";
+import { buildPluginStatusReport as buildPluginStatusReport3, enablePluginInConfig as enablePluginInConfig2, getPluginChannelBindings } from "@nextclaw/openclaw-compat";
 var CHANNEL_LABELS = {
   telegram: "Telegram",
   whatsapp: "WhatsApp",
@@ -2226,7 +2462,7 @@ var ChannelCommands = class {
     this.deps = deps;
   }
   channelsStatus() {
-    const config2 = loadConfig4();
+    const config2 = loadConfig5();
     console.log("Channel Status");
     const channelConfig = config2.channels;
     for (const channelId of BUILTIN_CHANNEL_PLUGIN_IDS) {
@@ -2234,8 +2470,8 @@ var ChannelCommands = class {
       const enabled = channelConfig[channelId]?.enabled === true;
       console.log(`${label}: ${enabled ? "\u2713" : "\u2717"}`);
     }
-    const workspaceDir = getWorkspacePath2(config2.agents.defaults.workspace);
-    const report = buildPluginStatusReport2({
+    const workspaceDir = getWorkspacePath3(config2.agents.defaults.workspace);
+    const report = buildPluginStatusReport3({
       config: config2,
       workspaceDir,
       reservedChannelIds: [],
@@ -2265,8 +2501,8 @@ var ChannelCommands = class {
       console.error("--channel is required");
       process.exit(1);
     }
-    const config2 = loadConfig4();
-    const workspaceDir = getWorkspacePath2(config2.agents.defaults.workspace);
+    const config2 = loadConfig5();
+    const workspaceDir = getWorkspacePath3(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspaceDir);
     const bindings = getPluginChannelBindings(pluginRegistry);
     const binding = bindings.find((entry) => entry.channelId === channelId || entry.pluginId === channelId);
@@ -2396,14 +2632,14 @@ var CronCommands = class {
 // src/cli/commands/diagnostics.ts
 import { createServer as createNetServer } from "net";
 import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
-import { resolve as resolve7 } from "path";
+import { resolve as resolve8 } from "path";
 import {
   APP_NAME,
   getConfigPath as getConfigPath2,
   getDataDir as getDataDir4,
-  getWorkspacePath as getWorkspacePath3,
+  getWorkspacePath as getWorkspacePath4,
   hasSecretRef,
-  loadConfig as loadConfig5
+  loadConfig as loadConfig6
 } from "@nextclaw/core";
 import { listBuiltinProviders } from "@nextclaw/runtime";
 var DiagnosticsCommands = class {
@@ -2565,9 +2801,9 @@ var DiagnosticsCommands = class {
   }
   async collectRuntimeStatus(params) {
     const configPath = getConfigPath2();
-    const config2 = loadConfig5();
-    const workspacePath = getWorkspacePath3(config2.agents.defaults.workspace);
-    const serviceStatePath = resolve7(getDataDir4(), "run", "service.json");
+    const config2 = loadConfig6();
+    const workspacePath = getWorkspacePath4(config2.agents.defaults.workspace);
+    const serviceStatePath = resolve8(getDataDir4(), "run", "service.json");
     const fixActions = [];
     let serviceState = readServiceState();
     if (params.fix && serviceState && !isProcessRunning(serviceState.pid)) {
@@ -2699,12 +2935,12 @@ var DiagnosticsCommands = class {
       clearTimeout(timer);
     }
   }
-  readLogTail(path, maxLines = 25) {
-    if (!existsSync6(path)) {
+  readLogTail(path2, maxLines = 25) {
+    if (!existsSync6(path2)) {
       return [];
     }
     try {
-      const lines = readFileSync6(path, "utf-8").split(/\r?\n/).filter(Boolean);
+      const lines = readFileSync6(path2, "utf-8").split(/\r?\n/).filter(Boolean);
       if (lines.length <= maxLines) {
         return lines;
       }
@@ -2714,17 +2950,17 @@ var DiagnosticsCommands = class {
     }
   }
   async checkPortAvailability(params) {
-    return await new Promise((resolve11) => {
+    return await new Promise((resolve13) => {
       const server = createNetServer();
       server.once("error", (error) => {
-        resolve11({
+        resolve13({
           available: false,
           detail: `bind failed on ${params.host}:${params.port} (${String(error)})`
         });
       });
       server.listen(params.port, params.host, () => {
         server.close(() => {
-          resolve11({
+          resolve13({
             available: true,
             detail: `bind ok on ${params.host}:${params.port}`
           });
@@ -2737,20 +2973,19 @@ var DiagnosticsCommands = class {
 // src/cli/commands/service.ts
 import * as NextclawCore from "@nextclaw/core";
 import {
-  getPluginChannelBindings as getPluginChannelBindings2,
+  getPluginChannelBindings as getPluginChannelBindings3,
   resolvePluginChannelMessageToolHints,
   setPluginRuntimeBridge,
-  startPluginChannelGateways,
-  stopPluginChannelGateways
+  startPluginChannelGateways as startPluginChannelGateways2,
+  stopPluginChannelGateways as stopPluginChannelGateways2
 } from "@nextclaw/openclaw-compat";
 import { startUiServer } from "@nextclaw/server";
 import { appendFileSync, closeSync, cpSync as cpSync2, existsSync as existsSync9, mkdirSync as mkdirSync5, openSync, rmSync as rmSync4 } from "fs";
-import { dirname as dirname2, join as join5, resolve as resolve8 } from "path";
+import { dirname as dirname2, join as join5, resolve as resolve10 } from "path";
 import { spawn as spawn2 } from "child_process";
 import { request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
 import { createServer as createNetServer2 } from "net";
-import { fileURLToPath as fileURLToPath2 } from "url";
 import chokidar from "chokidar";
 
 // src/cli/gateway/controller.ts
@@ -2764,11 +2999,11 @@ import {
 } from "@nextclaw/core";
 var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
 var readConfigSnapshot = (getConfigPath5) => {
-  const path = getConfigPath5();
+  const path2 = getConfigPath5();
   let raw = "";
   let parsed = {};
-  if (existsSync7(path)) {
-    raw = readFileSync7(path, "utf-8");
+  if (existsSync7(path2)) {
+    raw = readFileSync7(path2, "utf-8");
     try {
       parsed = JSON.parse(raw);
     } catch {
@@ -3079,11 +3314,15 @@ var ConfigReloader = class {
     this.currentConfig = nextConfig;
     this.options.providerManager?.setConfig(nextConfig);
     const plan = buildReloadPlan3(changedPaths);
+    let reloadPluginsResult = void 0;
     if (plan.reloadPlugins) {
-      await this.reloadPlugins(nextConfig);
+      reloadPluginsResult = await this.reloadPlugins({
+        config: nextConfig,
+        changedPaths
+      });
       console.log("Config reload: plugins reloaded.");
     }
-    if (plan.restartChannels) {
+    if (plan.restartChannels || reloadPluginsResult?.restartChannels) {
       await this.reloadChannels(nextConfig);
       console.log("Config reload: channels restarted.");
     }
@@ -3178,11 +3417,11 @@ var ConfigReloader = class {
       this.providerReloadTask = null;
     }
   }
-  async reloadPlugins(nextConfig) {
+  async reloadPlugins(params) {
     if (!this.options.reloadPlugins) {
       return;
     }
-    await this.options.reloadPlugins(nextConfig);
+    return await this.options.reloadPlugins(params);
   }
 };
 
@@ -3204,6 +3443,104 @@ var MissingProvider = class extends LLMProvider {
   }
 };
 
+// src/cli/commands/service-plugin-reload.ts
+import { getWorkspacePath as getWorkspacePath5 } from "@nextclaw/core";
+import {
+  getPluginChannelBindings as getPluginChannelBindings2,
+  startPluginChannelGateways,
+  stopPluginChannelGateways
+} from "@nextclaw/openclaw-compat";
+
+// src/cli/commands/plugin-reload.ts
+function buildPluginChannelBindingSignature(binding) {
+  return `${binding.pluginId}:${binding.channelId}`;
+}
+function buildSortedBindingSignatures(bindings) {
+  return bindings.map(buildPluginChannelBindingSignature).sort();
+}
+function buildSortedExtensionChannelIds(channels2) {
+  return channels2.map((registration) => registration.channel.id).filter((id) => typeof id === "string" && id.trim().length > 0).sort();
+}
+function areSortedStringListsEqual(left, right) {
+  if (left.length !== right.length) {
+    return false;
+  }
+  for (let index = 0; index < left.length; index += 1) {
+    if (left[index] !== right[index]) {
+      return false;
+    }
+  }
+  return true;
+}
+function readPluginIdFromPluginsEntryPath(path2) {
+  const prefix = "plugins.entries.";
+  if (!path2.startsWith(prefix)) {
+    return null;
+  }
+  const suffix = path2.slice(prefix.length);
+  const [pluginId] = suffix.split(".");
+  return pluginId?.trim() ? pluginId.trim() : null;
+}
+function shouldRestartChannelsForPluginReload(params) {
+  const currentBindingSignatures = buildSortedBindingSignatures(params.currentPluginChannelBindings);
+  const nextBindingSignatures = buildSortedBindingSignatures(params.nextPluginChannelBindings);
+  if (!areSortedStringListsEqual(currentBindingSignatures, nextBindingSignatures)) {
+    return true;
+  }
+  const currentExtensionChannelIds = buildSortedExtensionChannelIds(params.currentExtensionChannels);
+  const nextExtensionChannelIds = buildSortedExtensionChannelIds(params.nextExtensionChannels);
+  if (!areSortedStringListsEqual(currentExtensionChannelIds, nextExtensionChannelIds)) {
+    return true;
+  }
+  const channelPluginIds = /* @__PURE__ */ new Set();
+  for (const binding of params.currentPluginChannelBindings) {
+    channelPluginIds.add(binding.pluginId);
+  }
+  for (const binding of params.nextPluginChannelBindings) {
+    channelPluginIds.add(binding.pluginId);
+  }
+  for (const path2 of params.changedPaths) {
+    const pluginId = readPluginIdFromPluginsEntryPath(path2);
+    if (pluginId && channelPluginIds.has(pluginId)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// src/cli/commands/service-plugin-reload.ts
+async function reloadServicePlugins(params) {
+  const nextWorkspace = getWorkspacePath5(params.nextConfig.agents.defaults.workspace);
+  const nextPluginRegistry = loadPluginRegistry(params.nextConfig, nextWorkspace);
+  const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
+  const nextPluginChannelBindings = getPluginChannelBindings2(nextPluginRegistry);
+  const shouldRestartChannels = shouldRestartChannelsForPluginReload({
+    changedPaths: params.changedPaths,
+    currentPluginChannelBindings: params.pluginChannelBindings,
+    nextPluginChannelBindings,
+    currentExtensionChannels: params.extensionRegistry.channels,
+    nextExtensionChannels: nextExtensionRegistry.channels
+  });
+  logPluginDiagnostics(nextPluginRegistry);
+  let pluginGatewayHandles = params.pluginGatewayHandles;
+  if (shouldRestartChannels) {
+    await stopPluginChannelGateways(pluginGatewayHandles);
+    const startedPluginGateways = await startPluginChannelGateways({
+      registry: nextPluginRegistry,
+      logger: params.pluginGatewayLogger
+    });
+    pluginGatewayHandles = startedPluginGateways.handles;
+    params.logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
+  }
+  return {
+    pluginRegistry: nextPluginRegistry,
+    extensionRegistry: nextExtensionRegistry,
+    pluginChannelBindings: nextPluginChannelBindings,
+    pluginGatewayHandles,
+    restartChannels: shouldRestartChannels
+  };
+}
+
 // src/cli/commands/agent-runtime-pool.ts
 import {
   NativeAgentEngine,
@@ -3211,7 +3548,7 @@ import {
   createAssistantStreamDeltaControlMessage,
   createAssistantStreamResetControlMessage,
   AgentRouteResolver,
-  getWorkspacePath as getWorkspacePath4,
+  getWorkspacePath as getWorkspacePath6,
   parseAgentScopedSessionKey
 } from "@nextclaw/core";
 function normalizeAgentId(value) {
@@ -3256,7 +3593,7 @@ function resolveAgentProfiles(config2) {
   }
   return Array.from(unique.values()).map((entry) => ({
     id: entry.id,
-    workspace: getWorkspacePath4(entry.workspace ?? defaults.workspace),
+    workspace: getWorkspacePath6(entry.workspace ?? defaults.workspace),
     model: entry.model ?? defaults.model,
     engine: normalizeEngineKind(entry.engine ?? defaults.engine),
     engineConfig: entry.engineConfig ?? toRecord(defaults.engineConfig),
@@ -3521,7 +3858,7 @@ var GatewayAgentRuntimePool = class {
     const normalizedAgentId = normalizeAgentId(agentId);
     return this.resolvedProfiles.find((profile) => profile.id === normalizedAgentId) ?? this.resolvedProfiles.find((profile) => profile.id === this.defaultAgentId) ?? this.resolvedProfiles[0] ?? {
       id: this.defaultAgentId,
-      workspace: getWorkspacePath4(this.options.config.agents.defaults.workspace),
+      workspace: getWorkspacePath6(this.options.config.agents.defaults.workspace),
       model: this.options.config.agents.defaults.model,
       maxIterations: this.options.config.agents.defaults.maxToolIterations,
       contextTokens: this.options.config.agents.defaults.contextTokens,
@@ -3698,15 +4035,36 @@ function formatUserFacingError(error, maxChars = 320) {
   return `${normalized.slice(0, Math.max(0, maxChars - 3)).trimEnd()}...`;
 }
 
+// src/cli/commands/cli-subcommand-launch.ts
+import { createRequire } from "module";
+import { extname, resolve as resolve9 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+var require2 = createRequire(import.meta.url);
+var resolveCliSubcommandEntry = (params) => {
+  const argvEntry = params.argvEntry?.trim();
+  if (argvEntry) {
+    return resolve9(argvEntry);
+  }
+  return fileURLToPath2(new URL("../index.js", params.importMetaUrl));
+};
+
 // src/cli/commands/ncp/create-ui-ncp-agent.ts
+import {
+  DisposableStore
+} from "@nextclaw/core";
 import { DefaultNcpAgentRuntime } from "@nextclaw/ncp-agent-runtime";
+import {
+  readAssistantReasoningNormalizationMode,
+  readAssistantReasoningNormalizationModeFromMetadata,
+  writeAssistantReasoningNormalizationModeToMetadata
+} from "@nextclaw/ncp";
 import { createAgentClientFromServer, DefaultNcpAgentBackend } from "@nextclaw/ncp-toolkit";
 
 // src/cli/commands/ncp/nextclaw-ncp-context-builder.ts
 import {
   ContextBuilder,
   InputBudgetPruner,
-  getWorkspacePath as getWorkspacePath5,
+  getWorkspacePath as getWorkspacePath7,
   parseThinkingLevel,
   resolveThinkingLevel
 } from "@nextclaw/core";
@@ -4191,7 +4549,7 @@ function resolvePrimaryAgentProfile(config2) {
   const profile = config2.agents.list.find((entry) => entry.id.trim() === configuredDefaultAgentId);
   return {
     agentId: configuredDefaultAgentId,
-    workspace: getWorkspacePath5(profile?.workspace ?? config2.agents.defaults.workspace),
+    workspace: getWorkspacePath7(profile?.workspace ?? config2.agents.defaults.workspace),
     model: profile?.model ?? config2.agents.defaults.model,
     maxIterations: profile?.maxToolIterations ?? config2.agents.defaults.maxToolIterations,
     contextTokens: profile?.contextTokens ?? config2.agents.defaults.contextTokens,
@@ -4770,13 +5128,116 @@ var ProviderManagerNcpLLMApi = class {
   }
 };
 
+// src/cli/commands/ncp/ui-ncp-runtime-registry.ts
+import { toDisposable } from "@nextclaw/core";
+var DEFAULT_UI_NCP_RUNTIME_KIND = "native";
+function normalizeRuntimeKind(value) {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const normalized = value.trim().toLowerCase();
+  return normalized.length > 0 ? normalized : null;
+}
+function readRequestedRuntimeKind(sessionMetadata) {
+  return normalizeRuntimeKind(sessionMetadata.session_type) ?? normalizeRuntimeKind(sessionMetadata.sessionType) ?? null;
+}
+var UiNcpRuntimeRegistry = class {
+  constructor(defaultKind = DEFAULT_UI_NCP_RUNTIME_KIND) {
+    this.defaultKind = defaultKind;
+  }
+  registrations = /* @__PURE__ */ new Map();
+  register(registration) {
+    const normalizedKind = normalizeRuntimeKind(registration.kind);
+    if (!normalizedKind) {
+      throw new Error("ui ncp runtime kind must be a non-empty string");
+    }
+    const token = Symbol(normalizedKind);
+    this.registrations.set(normalizedKind, {
+      ...registration,
+      kind: normalizedKind,
+      token
+    });
+    return toDisposable(() => {
+      const current = this.registrations.get(normalizedKind);
+      if (!current || current.token !== token) {
+        return;
+      }
+      this.registrations.delete(normalizedKind);
+    });
+  }
+  createRuntime(params) {
+    const requestedKind = readRequestedRuntimeKind(params.sessionMetadata) ?? this.defaultKind;
+    const registration = this.registrations.get(requestedKind);
+    if (!registration) {
+      throw new Error(`ncp runtime unavailable: ${requestedKind}`);
+    }
+    const nextSessionMetadata = {
+      ...params.sessionMetadata,
+      session_type: registration.kind
+    };
+    params.setSessionMetadata(nextSessionMetadata);
+    return registration.createRuntime({
+      ...params,
+      sessionMetadata: nextSessionMetadata
+    });
+  }
+  listSessionTypes() {
+    const options = [...this.registrations.values()].map((registration) => ({
+      value: registration.kind,
+      label: registration.label
+    })).sort((left, right) => {
+      if (left.value === this.defaultKind) {
+        return -1;
+      }
+      if (right.value === this.defaultKind) {
+        return 1;
+      }
+      return left.value.localeCompare(right.value);
+    });
+    return {
+      defaultType: this.defaultKind,
+      options
+    };
+  }
+};
+
 // src/cli/commands/ncp/create-ui-ncp-agent.ts
+function isRecord5(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function resolveNativeReasoningNormalizationMode(params) {
+  const runtimeEntry = params.config.ui.ncp.runtimes.native;
+  const runtimeMetadata = isRecord5(runtimeEntry) ? runtimeEntry : {};
+  return readAssistantReasoningNormalizationModeFromMetadata(params.sessionMetadata) ?? readAssistantReasoningNormalizationMode(runtimeMetadata.reasoningNormalization) ?? readAssistantReasoningNormalizationMode(runtimeMetadata.reasoning_normalization) ?? readAssistantReasoningNormalizationMode(runtimeMetadata.reasoningNormalizationMode) ?? readAssistantReasoningNormalizationMode(runtimeMetadata.reasoning_normalization_mode) ?? "think-tags";
+}
+function buildPluginRuntimeSnapshotKey(extensionRegistry) {
+  const registrations = extensionRegistry?.ncpAgentRuntimes ?? [];
+  return registrations.map((registration) => [
+    registration.pluginId,
+    registration.kind,
+    registration.label,
+    registration.source
+  ].join(":")).join("|");
+}
 async function createUiNcpAgent(params) {
   const sessionStore = new NextclawAgentSessionStore(params.sessionManager);
-  const backend = new DefaultNcpAgentBackend({
-    endpointId: "nextclaw-ui-agent",
-    sessionStore,
-    createRuntime: ({ sessionId: _sessionId, stateManager }) => {
+  const runtimeRegistry = new UiNcpRuntimeRegistry();
+  runtimeRegistry.register({
+    kind: "native",
+    label: "Native",
+    createRuntime: ({ stateManager, sessionMetadata, setSessionMetadata }) => {
+      const reasoningNormalizationMode = resolveNativeReasoningNormalizationMode({
+        config: params.getConfig(),
+        sessionMetadata
+      });
+      if (reasoningNormalizationMode !== "off" && readAssistantReasoningNormalizationModeFromMetadata(sessionMetadata) !== reasoningNormalizationMode) {
+        setSessionMetadata(
+          writeAssistantReasoningNormalizationModeToMetadata(
+            sessionMetadata,
+            reasoningNormalizationMode
+          )
+        );
+      }
       const toolRegistry = new NextclawNcpToolRegistry({
         bus: params.bus,
         providerManager: params.providerManager,
@@ -4795,19 +5256,113 @@ async function createUiNcpAgent(params) {
         }),
         llmApi: new ProviderManagerNcpLLMApi(params.providerManager),
         toolRegistry,
-        stateManager
+        stateManager,
+        reasoningNormalizationMode
       });
     }
   });
+  const pluginRuntimeScopes = /* @__PURE__ */ new Map();
+  let pluginRuntimeSnapshotKey = "";
+  let activeExtensionRegistry;
+  const syncPluginRuntimeRegistrations = (extensionRegistry) => {
+    const nextSnapshotKey = buildPluginRuntimeSnapshotKey(extensionRegistry);
+    if (nextSnapshotKey === pluginRuntimeSnapshotKey) {
+      return;
+    }
+    pluginRuntimeSnapshotKey = nextSnapshotKey;
+    for (const scope of pluginRuntimeScopes.values()) {
+      scope.dispose();
+    }
+    pluginRuntimeScopes.clear();
+    for (const registration of extensionRegistry?.ncpAgentRuntimes ?? []) {
+      const pluginId = registration.pluginId.trim() || registration.kind;
+      let scope = pluginRuntimeScopes.get(pluginId);
+      if (!scope) {
+        scope = new DisposableStore();
+        pluginRuntimeScopes.set(pluginId, scope);
+      }
+      scope.add(runtimeRegistry.register({
+        kind: registration.kind,
+        label: registration.label,
+        createRuntime: registration.createRuntime
+      }));
+    }
+  };
+  const resolveActiveExtensionRegistry = () => activeExtensionRegistry ?? params.getExtensionRegistry?.();
+  const refreshPluginRuntimeRegistrations = () => {
+    syncPluginRuntimeRegistrations(resolveActiveExtensionRegistry());
+  };
+  refreshPluginRuntimeRegistrations();
+  const backend = new DefaultNcpAgentBackend({
+    endpointId: "nextclaw-ui-agent",
+    sessionStore,
+    createRuntime: (runtimeParams) => {
+      refreshPluginRuntimeRegistrations();
+      return runtimeRegistry.createRuntime(runtimeParams);
+    }
+  });
   await backend.start();
   return {
     basePath: "/api/ncp/agent",
     agentClientEndpoint: createAgentClientFromServer(backend),
     streamProvider: backend,
-    sessionApi: backend
+    sessionApi: backend,
+    listSessionTypes: () => {
+      refreshPluginRuntimeRegistrations();
+      return runtimeRegistry.listSessionTypes();
+    },
+    applyExtensionRegistry: (extensionRegistry) => {
+      activeExtensionRegistry = extensionRegistry;
+      syncPluginRuntimeRegistrations(extensionRegistry);
+    }
   };
 }
 
+// src/cli/commands/service-marketplace-helpers.ts
+var containsAbsoluteFsPath = (line) => {
+  const normalized = line.trim();
+  if (!normalized) {
+    return false;
+  }
+  const lowered = normalized.toLowerCase();
+  if (lowered.includes("http://") || lowered.includes("https://")) {
+    return false;
+  }
+  if (/^[A-Za-z]:\\/.test(normalized)) {
+    return true;
+  }
+  return /(?:^|\s)(?:~\/|\/[^\s]+)/.test(normalized);
+};
+var pickUserFacingCommandSummary = (output, fallback) => {
+  const lines = output.split("\n").map((line) => line.trim()).filter(Boolean);
+  if (lines.length === 0) {
+    return fallback;
+  }
+  const visibleLines = lines.filter((line) => {
+    if (/^(path|install path|source path|destination|location)\s*:/i.test(line)) {
+      return false;
+    }
+    if (containsAbsoluteFsPath(line)) {
+      return false;
+    }
+    return true;
+  });
+  if (visibleLines.length === 0) {
+    return fallback;
+  }
+  const preferred = [...visibleLines].reverse().find(
+    (line) => /\b(installed|enabled|disabled|uninstalled|published|updated|already installed|removed)\b/i.test(line)
+  );
+  return preferred ?? visibleLines[visibleLines.length - 1] ?? fallback;
+};
+var buildMarketplaceSkillInstallArgs = (params) => {
+  const args = ["skills", "install", params.slug, "--workdir", params.workspace];
+  if (params.force) {
+    args.push("--force");
+  }
+  return args;
+};
+
 // src/cli/commands/ui-chat-run-coordinator.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync4, readdirSync as readdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync4 } from "fs";
 import { join as join4 } from "path";
@@ -4825,7 +5380,7 @@ function createRunId() {
   const rand = Math.random().toString(36).slice(2, 10);
   return `run-${now}-${rand}`;
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function readOptionalString(value) {
@@ -5015,7 +5570,7 @@ var UiChatRunCoordinator = class {
     const parsedAgentId = parseAgentScopedSessionKey2(sessionKey)?.agentId;
     const agentId = explicitAgentId ?? readOptionalString(parsedAgentId);
     const model = readOptionalString(input.model);
-    const metadata = isRecord5(input.metadata) ? { ...input.metadata } : {};
+    const metadata = isRecord6(input.metadata) ? { ...input.metadata } : {};
     if (model) {
       metadata.model = model;
     }
@@ -5236,14 +5791,14 @@ var UiChatRunCoordinator = class {
     this.emitRunUpdated(run);
   }
   waitForRunUpdate(run, signal) {
-    return new Promise((resolve11) => {
+    return new Promise((resolve13) => {
       const wake = () => {
         cleanup();
-        resolve11();
+        resolve13();
       };
       const onAbort = () => {
         cleanup();
-        resolve11();
+        resolve13();
       };
       const cleanup = () => {
         run.waiters.delete(wake);
@@ -5371,9 +5926,9 @@ var UiChatRunCoordinator = class {
       if (!entry.isFile() || !entry.name.endsWith(".json")) {
         continue;
       }
-      const path = join4(RUNS_DIR, entry.name);
+      const path2 = join4(RUNS_DIR, entry.name);
       try {
-        const parsed = JSON.parse(readFileSync8(path, "utf-8"));
+        const parsed = JSON.parse(readFileSync8(path2, "utf-8"));
         const runId = readOptionalString(parsed.runId);
         const sessionKey = readOptionalString(parsed.sessionKey);
         if (!runId || !sessionKey) {
@@ -5436,10 +5991,10 @@ var {
   getDataDir: getDataDir6,
   getProvider,
   getProviderName,
-  getWorkspacePath: getWorkspacePath6,
+  getWorkspacePath: getWorkspacePath8,
   HeartbeatService,
   LiteLLMProvider,
-  loadConfig: loadConfig6,
+  loadConfig: loadConfig7,
   MessageBus,
   ProviderManager,
   resolveConfigSecrets: resolveConfigSecrets2,
@@ -5454,64 +6009,18 @@ function createSkillsLoader(workspace) {
   }
   return new ctor(workspace);
 }
-function containsAbsoluteFsPath(line) {
-  const normalized = line.trim();
-  if (!normalized) {
-    return false;
-  }
-  const lowered = normalized.toLowerCase();
-  if (lowered.includes("http://") || lowered.includes("https://")) {
-    return false;
-  }
-  if (/^[A-Za-z]:\\/.test(normalized)) {
-    return true;
-  }
-  return /(?:^|\s)(?:~\/|\/[^\s]+)/.test(normalized);
-}
-function pickUserFacingCommandSummary(output, fallback) {
-  const lines = output.split("\n").map((line) => line.trim()).filter(Boolean);
-  if (lines.length === 0) {
-    return fallback;
-  }
-  const visibleLines = lines.filter((line) => {
-    if (/^(path|install path|source path|destination|location)\s*:/i.test(line)) {
-      return false;
-    }
-    if (containsAbsoluteFsPath(line)) {
-      return false;
-    }
-    return true;
-  });
-  if (visibleLines.length === 0) {
-    return fallback;
-  }
-  const preferred = [...visibleLines].reverse().find(
-    (line) => /\b(installed|enabled|disabled|uninstalled|published|updated|already installed|removed)\b/i.test(line)
-  );
-  return preferred ?? visibleLines[visibleLines.length - 1] ?? fallback;
-}
-function buildMarketplaceSkillInstallArgs(params) {
-  const args = ["skills", "install", params.slug, "--workdir", params.workspace];
-  if (params.force) {
-    args.push("--force");
-  }
-  return args;
-}
-function resolveCliSubcommandEntry(params) {
-  const argvEntry = params.argvEntry?.trim();
-  if (argvEntry) {
-    return resolve8(argvEntry);
-  }
-  return fileURLToPath2(new URL("../index.js", params.importMetaUrl));
-}
 var ServiceCommands = class {
   constructor(deps) {
     this.deps = deps;
   }
+  applyLiveConfigReload = null;
+  liveUiNcpAgent = null;
   async startGateway(options = {}) {
+    this.applyLiveConfigReload = null;
+    this.liveUiNcpAgent = null;
     const runtimeConfigPath = getConfigPath3();
-    const config2 = resolveConfigSecrets2(loadConfig6(), { configPath: runtimeConfigPath });
-    const workspace = getWorkspacePath6(config2.agents.defaults.workspace);
+    const config2 = resolveConfigSecrets2(loadConfig7(), { configPath: runtimeConfigPath });
+    const workspace = getWorkspacePath8(config2.agents.defaults.workspace);
     let pluginRegistry = loadPluginRegistry(config2, workspace);
     let extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
@@ -5555,7 +6064,7 @@ var ServiceCommands = class {
       sessionManager,
       providerManager,
       makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }) ?? this.makeMissingProvider(nextConfig),
-      loadConfig: () => resolveConfigSecrets2(loadConfig6(), { configPath: runtimeConfigPath }),
+      loadConfig: () => resolveConfigSecrets2(loadConfig7(), { configPath: runtimeConfigPath }),
       getExtensionChannels: () => extensionRegistry.channels,
       onRestartRequired: (paths) => {
         void this.deps.requestRestart({
@@ -5565,6 +6074,9 @@ var ServiceCommands = class {
         });
       }
     });
+    this.applyLiveConfigReload = async () => {
+      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig7(), { configPath: runtimeConfigPath }));
+    };
     const gatewayController = new GatewayControllerImpl({
       reloader,
       cron: cron2,
@@ -5596,38 +6108,42 @@ var ServiceCommands = class {
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig6(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig7(), { configPath: runtimeConfigPath }),
         accountId
       })
     });
     reloader.setApplyAgentRuntimeConfig((nextConfig) => runtimePool.applyRuntimeConfig(nextConfig));
-    reloader.setReloadPlugins(async (nextConfig) => {
-      const nextWorkspace = getWorkspacePath6(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
+    reloader.setReloadPlugins(async ({ config: nextConfig, changedPaths }) => {
+      const result = await reloadServicePlugins({
+        nextConfig,
+        changedPaths,
+        pluginRegistry,
+        extensionRegistry,
+        pluginChannelBindings,
+        pluginGatewayHandles,
+        pluginGatewayLogger,
+        logPluginGatewayDiagnostics
       });
-      pluginGatewayHandles = startedPluginGateways.handles;
-      logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
-      pluginRegistry = nextPluginRegistry;
-      extensionRegistry = nextExtensionRegistry;
-      pluginChannelBindings = getPluginChannelBindings2(nextPluginRegistry);
-      runtimePool.applyExtensionRegistry(nextExtensionRegistry);
+      pluginRegistry = result.pluginRegistry;
+      extensionRegistry = result.extensionRegistry;
+      pluginChannelBindings = result.pluginChannelBindings;
+      pluginGatewayHandles = result.pluginGatewayHandles;
+      runtimePool.applyExtensionRegistry(result.extensionRegistry);
+      this.liveUiNcpAgent?.applyExtensionRegistry?.(result.extensionRegistry);
       runtimePool.applyRuntimeConfig(nextConfig);
-      console.log("Config reload: plugin channel gateways restarted.");
+      if (result.restartChannels) {
+        console.log("Config reload: plugin channel gateways restarted.");
+      }
+      return { restartChannels: result.restartChannels };
     });
-    let pluginChannelBindings = getPluginChannelBindings2(pluginRegistry);
+    let pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
     setPluginRuntimeBridge({
-      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig6(), { configPath: runtimeConfigPath }), pluginChannelBindings),
+      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig7(), { configPath: runtimeConfigPath }), 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 current = loadConfig7();
         const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
         saveConfig5(next);
       },
@@ -5703,12 +6219,12 @@ var ServiceCommands = class {
       providerManager,
       bus,
       gatewayController,
-      () => resolveConfigSecrets2(loadConfig6(), { configPath: runtimeConfigPath }),
+      () => resolveConfigSecrets2(loadConfig7(), { configPath: runtimeConfigPath }),
       () => extensionRegistry,
       ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig6(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig7(), { configPath: runtimeConfigPath }),
         accountId
       })
     );
@@ -5717,13 +6233,13 @@ var ServiceCommands = class {
       console.log(`\u2713 Cron: ${cronStatus.jobs} scheduled jobs`);
     }
     console.log("\u2713 Heartbeat: every 30m");
-    const configPath = resolve8(getConfigPath3());
+    const configPath = resolve10(getConfigPath3());
     const watcher = chokidar.watch(configPath, {
       ignoreInitial: true,
       awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 50 }
     });
     watcher.on("all", (event, changedPath) => {
-      if (resolve8(changedPath) !== configPath) {
+      if (resolve10(changedPath) !== configPath) {
         return;
       }
       if (event === "add") {
@@ -5741,7 +6257,7 @@ var ServiceCommands = class {
     await cron2.start();
     await heartbeat.start();
     try {
-      const startedPluginGateways = await startPluginChannelGateways({
+      const startedPluginGateways = await startPluginChannelGateways2({
         registry: pluginRegistry,
         logger: pluginGatewayLogger
       });
@@ -5751,7 +6267,9 @@ var ServiceCommands = class {
       await this.wakeFromRestartSentinel({ bus, sessionManager });
       await runtimePool.run();
     } finally {
-      await stopPluginChannelGateways(pluginGatewayHandles);
+      this.applyLiveConfigReload = null;
+      this.liveUiNcpAgent = null;
+      await stopPluginChannelGateways2(pluginGatewayHandles);
       setPluginRuntimeBridge(null);
     }
   }
@@ -5815,7 +6333,7 @@ var ServiceCommands = class {
     if (!sentinel) {
       return;
     }
-    await new Promise((resolve11) => setTimeout(resolve11, 750));
+    await new Promise((resolve13) => setTimeout(resolve13, 750));
     const payload = sentinel.payload;
     const summary = formatRestartSentinelMessage(payload);
     const sentinelSessionKey = this.normalizeOptionalString(payload.sessionKey);
@@ -5861,7 +6379,7 @@ var ServiceCommands = class {
     });
   }
   async runForeground(options) {
-    const config2 = loadConfig6();
+    const config2 = loadConfig7();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (options.open) {
@@ -5874,7 +6392,7 @@ var ServiceCommands = class {
     });
   }
   async startService(options) {
-    const config2 = loadConfig6();
+    const config2 = loadConfig7();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     const apiUrl = `${uiUrl}/api`;
@@ -5934,7 +6452,7 @@ var ServiceCommands = class {
       return;
     }
     const logPath = resolveServiceLogPath();
-    const logDir = resolve8(logPath, "..");
+    const logDir = resolve10(logPath, "..");
     mkdirSync5(logDir, { recursive: true });
     const logFd = openSync(logPath, "a");
     const readinessTimeoutMs = this.resolveStartupTimeoutMs(options.startupTimeoutMs);
@@ -6082,14 +6600,14 @@ var ServiceCommands = class {
       const probe = await this.probeHealthEndpoint(params.healthUrl);
       if (!probe.healthy) {
         lastProbeError = probe.error;
-        await new Promise((resolve11) => setTimeout(resolve11, 200));
+        await new Promise((resolve13) => setTimeout(resolve13, 200));
         continue;
       }
-      await new Promise((resolve11) => setTimeout(resolve11, 300));
+      await new Promise((resolve13) => setTimeout(resolve13, 300));
       if (isProcessRunning(params.pid)) {
         return { ready: true, lastProbeError: null };
       }
-      await new Promise((resolve11) => setTimeout(resolve11, 200));
+      await new Promise((resolve13) => setTimeout(resolve13, 200));
     }
     return { ready: false, lastProbeError };
   }
@@ -6160,17 +6678,17 @@ var ServiceCommands = class {
     };
   }
   async checkPortAvailability(params) {
-    return await new Promise((resolve11) => {
+    return await new Promise((resolve13) => {
       const server = createNetServer2();
       server.once("error", (error) => {
-        resolve11({
+        resolve13({
           available: false,
           detail: `bind failed on ${params.host}:${params.port} (${String(error)})`
         });
       });
       server.listen(params.port, params.host, () => {
         server.close(() => {
-          resolve11({
+          resolve13({
             available: true,
             detail: `bind ok on ${params.host}:${params.port}`
           });
@@ -6206,7 +6724,7 @@ var ServiceCommands = class {
       return { healthy: false, error: "invalid health URL" };
     }
     const requestImpl = parsed.protocol === "https:" ? httpsRequest : httpRequest;
-    return new Promise((resolve11) => {
+    return new Promise((resolve13) => {
       const req = requestImpl(
         {
           protocol: parsed.protocol,
@@ -6242,19 +6760,19 @@ var ServiceCommands = class {
               if (bodySnippet) {
                 details.push(`body=${bodySnippet}`);
               }
-              resolve11({ healthy: false, error: details.join("; ") });
+              resolve13({ healthy: false, error: details.join("; ") });
               return;
             }
             try {
               const payload = JSON.parse(responseText);
               const healthy = payload?.ok === true && payload?.data?.status === "ok";
               if (!healthy) {
-                resolve11({ healthy: false, error: "health payload not ok" });
+                resolve13({ healthy: false, error: "health payload not ok" });
                 return;
               }
-              resolve11({ healthy: true, error: null });
+              resolve13({ healthy: true, error: null });
             } catch {
-              resolve11({ healthy: false, error: "invalid health JSON response" });
+              resolve13({ healthy: false, error: "invalid health JSON response" });
             }
           });
         }
@@ -6263,7 +6781,7 @@ var ServiceCommands = class {
         req.destroy(new Error("probe timeout"));
       });
       req.on("error", (error) => {
-        resolve11({ healthy: false, error: error.message || String(error) });
+        resolve13({ healthy: false, error: error.message || String(error) });
       });
       req.end();
     });
@@ -6368,13 +6886,7 @@ var ServiceCommands = class {
       if (sessionType === "native") {
         return "Native";
       }
-      if (sessionType === "codex-sdk") {
-        return "Codex";
-      }
-      if (sessionType === "claude-agent-sdk") {
-        return "Claude Code";
-      }
-      return sessionType;
+      return sessionType.trim().split(/[-_]+/g).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ") || sessionType;
     };
     let publishUiEvent = null;
     runtimePool.setSystemSessionUpdatedHandler(({ sessionKey, message }) => {
@@ -6412,6 +6924,7 @@ var ServiceCommands = class {
         accountId
       })
     });
+    this.liveUiNcpAgent = ncpAgent;
     const uiServer = startUiServer({
       host: uiConfig.host,
       port: uiConfig.port,
@@ -6510,9 +7023,9 @@ var ServiceCommands = class {
     }
   }
   async installMarketplacePlugin(spec) {
-    const output = await this.runCliSubcommand(["plugins", "install", spec]);
-    const summary = pickUserFacingCommandSummary(output, `Installed plugin: ${spec}`);
-    return { message: summary };
+    const result = await installPluginMutation(spec);
+    await this.applyLiveConfigReload?.();
+    return { message: result.message };
   }
   async installMarketplaceSkill(params) {
     if (params.kind === "builtin") {
@@ -6525,7 +7038,7 @@ var ServiceCommands = class {
     if (params.kind && params.kind !== "marketplace") {
       throw new Error(`Unsupported marketplace skill kind: ${params.kind}`);
     }
-    const workspace = getWorkspacePath6(loadConfig6().agents.defaults.workspace);
+    const workspace = getWorkspacePath8(loadConfig7().agents.defaults.workspace);
     const args = buildMarketplaceSkillInstallArgs({
       slug: params.slug,
       workspace,
@@ -6544,22 +7057,24 @@ var ServiceCommands = class {
     }
   }
   async enableMarketplacePlugin(id) {
-    const output = await this.runCliSubcommand(["plugins", "enable", id]);
-    const summary = pickUserFacingCommandSummary(output, `Enabled plugin: ${id}`);
-    return { message: summary };
+    const result = await enablePluginMutation(id);
+    await this.applyLiveConfigReload?.();
+    return { message: result.message };
   }
   async disableMarketplacePlugin(id) {
-    const output = await this.runCliSubcommand(["plugins", "disable", id]);
-    const summary = pickUserFacingCommandSummary(output, `Disabled plugin: ${id}`);
-    return { message: summary };
+    const result = await disablePluginMutation(id);
+    await this.applyLiveConfigReload?.();
+    return { message: result.message };
   }
   async uninstallMarketplacePlugin(id) {
-    const output = await this.runCliSubcommand(["plugins", "uninstall", id, "--force"]);
-    const summary = pickUserFacingCommandSummary(output, `Uninstalled plugin: ${id}`);
-    return { message: summary };
+    await disablePluginMutation(id);
+    await this.applyLiveConfigReload?.();
+    const result = await uninstallPluginMutation(id, { force: true });
+    await this.applyLiveConfigReload?.();
+    return { message: result.message };
   }
   async uninstallMarketplaceSkill(slug) {
-    const workspace = getWorkspacePath6(loadConfig6().agents.defaults.workspace);
+    const workspace = getWorkspacePath8(loadConfig7().agents.defaults.workspace);
     const targetDir = join5(workspace, "skills", slug);
     if (!existsSync9(targetDir)) {
       throw new Error(`Skill not installed in workspace: ${slug}`);
@@ -6570,7 +7085,7 @@ var ServiceCommands = class {
     };
   }
   installBuiltinMarketplaceSkill(slug, force) {
-    const workspace = getWorkspacePath6(loadConfig6().agents.defaults.workspace);
+    const workspace = getWorkspacePath8(loadConfig7().agents.defaults.workspace);
     const destination = join5(workspace, "skills", slug);
     const destinationSkillFile = join5(destination, "SKILL.md");
     if (existsSync9(destinationSkillFile) && !force) {
@@ -6649,8 +7164,8 @@ ${stderr}`.trim();
 
 // src/cli/workspace.ts
 import { cpSync as cpSync3, existsSync as existsSync10, mkdirSync as mkdirSync6, readFileSync as readFileSync9, readdirSync as readdirSync3, rmSync as rmSync5, writeFileSync as writeFileSync5 } from "fs";
-import { createRequire } from "module";
-import { dirname as dirname3, join as join6, resolve as resolve9 } from "path";
+import { createRequire as createRequire2 } from "module";
+import { dirname as dirname3, join as join6, resolve as resolve11 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { APP_NAME as APP_NAME3, getDataDir as getDataDir7 } from "@nextclaw/core";
 import { spawnSync as spawnSync3 } from "child_process";
@@ -6742,9 +7257,9 @@ var WorkspaceManager = class {
   }
   resolveBuiltinSkillsDir() {
     try {
-      const require2 = createRequire(import.meta.url);
-      const entry = require2.resolve("@nextclaw/core");
-      const pkgRoot = resolve9(dirname3(entry), "..");
+      const require3 = createRequire2(import.meta.url);
+      const entry = require3.resolve("@nextclaw/core");
+      const pkgRoot = resolve11(dirname3(entry), "..");
       const distSkills = join6(pkgRoot, "dist", "skills");
       if (existsSync10(distSkills)) {
         return distSkills;
@@ -6763,8 +7278,8 @@ var WorkspaceManager = class {
     if (override) {
       return override;
     }
-    const cliDir = resolve9(fileURLToPath3(new URL(".", import.meta.url)));
-    const pkgRoot = resolve9(cliDir, "..", "..");
+    const cliDir = resolve11(fileURLToPath3(new URL(".", import.meta.url)));
+    const pkgRoot = resolve11(cliDir, "..", "..");
     const candidates = [join6(pkgRoot, "templates")];
     for (const candidate of candidates) {
       if (existsSync10(candidate)) {
@@ -6782,8 +7297,8 @@ var WorkspaceManager = class {
       console.error("npm not found. Please install Node.js >= 18.");
       process.exit(1);
     }
-    const cliDir = resolve9(fileURLToPath3(new URL(".", import.meta.url)));
-    const pkgRoot = resolve9(cliDir, "..", "..");
+    const cliDir = resolve11(fileURLToPath3(new URL(".", import.meta.url)));
+    const pkgRoot = resolve11(cliDir, "..", "..");
     const pkgBridge = join6(pkgRoot, "bridge");
     const srcBridge = join6(pkgRoot, "..", "..", "bridge");
     let source = null;
@@ -6797,7 +7312,7 @@ var WorkspaceManager = class {
       process.exit(1);
     }
     console.log(`${this.logo} Setting up bridge...`);
-    mkdirSync6(resolve9(userBridge, ".."), { recursive: true });
+    mkdirSync6(resolve11(userBridge, ".."), { recursive: true });
     if (existsSync10(userBridge)) {
       rmSync5(userBridge, { recursive: true, force: true });
     }
@@ -6834,7 +7349,7 @@ function resolveSkillsInstallWorkdir(params) {
   if (params.explicitWorkdir) {
     return expandHome2(params.explicitWorkdir);
   }
-  return getWorkspacePath7(params.configuredWorkspace);
+  return getWorkspacePath9(params.configuredWorkspace);
 }
 var CliRuntime = class {
   logo;
@@ -6933,7 +7448,7 @@ var CliRuntime = class {
     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() || fileURLToPath4(new URL("./index.js", import.meta.url));
     const startArgs = [cliPath, "start", "--ui-port", String(uiPort)];
-    const serviceStatePath = resolve10(getDataDir8(), "run", "service.json");
+    const serviceStatePath = resolve12(getDataDir8(), "run", "service.json");
     const helperScript = [
       'const { spawnSync } = require("node:child_process");',
       'const { readFileSync } = require("node:fs");',
@@ -7068,7 +7583,7 @@ var CliRuntime = class {
       saveConfig6(config3);
       createdConfig = true;
     }
-    const config2 = loadConfig7();
+    const config2 = loadConfig8();
     const workspaceSetting = config2.agents.defaults.workspace;
     const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join7(getDataDir8(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
     const workspaceExisted = existsSync11(workspacePath);
@@ -7104,7 +7619,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
   async login(opts = {}) {
     await this.init({ source: "login", auto: true });
     const configPath = getConfigPath4();
-    const config2 = loadConfig7(configPath);
+    const config2 = loadConfig8(configPath);
     const providers = config2.providers;
     const nextclawProvider = providers.nextclaw ?? {
       displayName: "",
@@ -7261,15 +7776,15 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
   }
   async agent(opts) {
     const configPath = getConfigPath4();
-    const config2 = resolveConfigSecrets3(loadConfig7(), { configPath });
-    const workspace = getWorkspacePath7(config2.agents.defaults.workspace);
+    const config2 = resolveConfigSecrets3(loadConfig8(), { configPath });
+    const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
-    const pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
+    const pluginChannelBindings = getPluginChannelBindings4(pluginRegistry);
     setPluginRuntimeBridge2({
       loadConfig: () => toPluginConfigView(
-        resolveConfigSecrets3(loadConfig7(), { configPath }),
+        resolveConfigSecrets3(loadConfig8(), { configPath }),
         pluginChannelBindings
       ),
       writeConfigFile: async (nextConfigView) => {
@@ -7278,7 +7793,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
             "plugin runtime writeConfigFile expects an object config"
           );
         }
-        const current = loadConfig7();
+        const current = loadConfig8();
         const next = mergePluginConfigView(
           current,
           nextConfigView,
@@ -7310,7 +7825,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
           registry: pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets3(loadConfig7(), { configPath }),
+          cfg: resolveConfigSecrets3(loadConfig8(), { configPath }),
           accountId
         })
       });
@@ -7330,7 +7845,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
 `
       );
       const historyFile = join7(getDataDir8(), "history", "cli_history");
-      const historyDir = resolve10(historyFile, "..");
+      const historyDir = resolve12(historyFile, "..");
       mkdirSync7(historyDir, { recursive: true });
       const history = existsSync11(historyFile) ? readFileSync10(historyFile, "utf-8").split("\n").filter(Boolean) : [];
       const rl = createInterface2({
@@ -7487,7 +8002,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const config2 = loadConfig7();
+    const config2 = loadConfig8();
     const workdir = resolveSkillsInstallWorkdir({
       explicitWorkdir: options.workdir,
       configuredWorkspace: config2.agents.defaults.workspace
@@ -7577,9 +8092,9 @@ 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 config = program.command("config").description("Manage config values");
-config.command("get <path>").description("Get a config value by dot path").option("--json", "Output JSON", false).action((path, opts) => runtime.configGet(path, opts));
-config.command("set <path> <value>").description("Set a config value by dot path").option("--json", "Parse value as JSON", false).action((path, value, opts) => runtime.configSet(path, value, opts));
-config.command("unset <path>").description("Remove a config value by dot path").action((path) => runtime.configUnset(path));
+config.command("get <path>").description("Get a config value by dot path").option("--json", "Output JSON", false).action((path2, opts) => runtime.configGet(path2, opts));
+config.command("set <path> <value>").description("Set a config value by dot path").option("--json", "Parse value as JSON", false).action((path2, value, opts) => runtime.configSet(path2, value, opts));
+config.command("unset <path>").description("Remove a config value by dot path").action((path2) => runtime.configUnset(path2));
 var secrets = program.command("secrets").description("Manage secrets refs/providers");
 secrets.command("audit").description("Audit secret refs resolution status").option("--json", "Output JSON", false).option("--strict", "Exit non-zero when unresolved refs exist", false).action((opts) => runtime.secretsAudit(opts));
 secrets.command("configure").description("Configure a secret provider alias").requiredOption("--provider <alias>", "Provider alias").option("--source <source>", "Provider source (env|file|exec)").option("--prefix <prefix>", "Env key prefix (env source)").option("--path <path>", "Secret JSON file path (file source)").option("--command <command>", "Command for exec source").option(