nextclaw 0.12.5 → 0.12.7

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 loadConfig9,
-  saveConfig as saveConfig7,
+  loadConfig as loadConfig11,
+  saveConfig as saveConfig8,
   getConfigPath as getConfigPath4,
   getDataDir as getDataDir8,
   ConfigSchema as ConfigSchema2,
-  getWorkspacePath as getWorkspacePath9,
+  getWorkspacePath as getWorkspacePath10,
   expandHome as expandHome2,
   MessageBus as MessageBus2,
   AgentLoop,
@@ -26,8 +26,8 @@ import {
   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 resolve12 } from "path";
+import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "fs";
+import { join as join8, resolve as resolve12 } from "path";
 import { createInterface as createInterface2 } from "readline";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { spawn as spawn3 } from "child_process";
@@ -2118,7 +2118,11 @@ var ConfigCommands = class {
 
 // src/cli/commands/mcp.ts
 import { loadConfig as loadConfig4, saveConfig as saveConfig3 } from "@nextclaw/core";
-import { McpDoctorService, McpRegistryService, normalizeMcpServerName } from "@nextclaw/mcp";
+import {
+  McpDoctorFacade,
+  McpMutationService,
+  McpRegistryService
+} from "@nextclaw/mcp";
 function normalizeOptionalString(value) {
   if (typeof value !== "string") {
     return void 0;
@@ -2155,12 +2159,12 @@ function parseTimeoutMs(value) {
 function buildMcpServerDefinition(command, opts) {
   const transport = (normalizeOptionalString(opts.transport) ?? "stdio").toLowerCase();
   const disabled = Boolean(opts.disabled);
-  const allAgents = Boolean(opts.allAgents);
   const explicitAgents = Array.from(
     new Set(
       (opts.agent ?? []).map((agentId) => normalizeOptionalString(agentId)).filter((agentId) => Boolean(agentId))
     )
   );
+  const allAgents = explicitAgents.length === 0 ? true : Boolean(opts.allAgents);
   if (transport === "stdio") {
     if (command.length === 0) {
       throw new Error("stdio transport requires a command after --");
@@ -2177,11 +2181,15 @@ function buildMcpServerDefinition(command, opts) {
       },
       scope: {
         allAgents,
-        agents: explicitAgents
+        agents: allAgents ? [] : explicitAgents
       },
       policy: {
         trust: "explicit",
         start: "eager"
+      },
+      metadata: {
+        source: "manual",
+        installedAt: (/* @__PURE__ */ new Date()).toISOString()
       }
     };
   }
@@ -2194,11 +2202,15 @@ function buildMcpServerDefinition(command, opts) {
     enabled: !disabled,
     scope: {
       allAgents,
-      agents: explicitAgents
+      agents: allAgents ? [] : explicitAgents
     },
     policy: {
       trust: "explicit",
       start: "eager"
+    },
+    metadata: {
+      source: "manual",
+      installedAt: (/* @__PURE__ */ new Date()).toISOString()
     }
   };
   if (transport === "http") {
@@ -2257,26 +2269,28 @@ var McpCommands = class {
     }
   }
   async mcpAdd(name, command, opts) {
-    const normalizedName = normalizeMcpServerName(name);
-    const config2 = loadConfig4();
-    if (config2.mcp.servers[normalizedName]) {
-      reportUserInputIssue(`MCP server already exists: ${normalizedName}. Use 'mcp list' or remove it first.`);
+    const mutation = new McpMutationService({
+      getConfig: () => loadConfig4(),
+      saveConfig: (config2) => saveConfig3(config2)
+    });
+    const result = mutation.addServer(name, buildMcpServerDefinition(command, opts));
+    if (!result.changed) {
+      reportUserInputIssue(result.message);
       return;
     }
-    config2.mcp.servers[normalizedName] = buildMcpServerDefinition(command, opts);
-    saveConfig3(config2);
-    console.log(`Added MCP server ${normalizedName}.`);
+    console.log(result.message);
   }
   async mcpRemove(name) {
-    const normalizedName = normalizeMcpServerName(name);
-    const config2 = loadConfig4();
-    if (!config2.mcp.servers[normalizedName]) {
-      reportUserInputIssue(`Unknown MCP server: ${normalizedName}`);
+    const mutation = new McpMutationService({
+      getConfig: () => loadConfig4(),
+      saveConfig: (config2) => saveConfig3(config2)
+    });
+    const result = mutation.removeServer(name);
+    if (!result.changed) {
+      reportUserInputIssue(result.message);
       return;
     }
-    delete config2.mcp.servers[normalizedName];
-    saveConfig3(config2);
-    console.log(`Removed MCP server ${normalizedName}.`);
+    console.log(result.message);
   }
   async mcpEnable(name) {
     await this.toggleEnabled(name, true);
@@ -2288,7 +2302,7 @@ var McpCommands = class {
     const registry = new McpRegistryService({
       getConfig: () => loadConfig4()
     });
-    const doctor = new McpDoctorService({
+    const doctor = new McpDoctorFacade({
       getConfig: () => loadConfig4(),
       registryService: registry
     });
@@ -2314,16 +2328,16 @@ var McpCommands = class {
     }
   }
   async toggleEnabled(name, enabled) {
-    const normalizedName = normalizeMcpServerName(name);
-    const config2 = loadConfig4();
-    const current = config2.mcp.servers[normalizedName];
-    if (!current) {
-      reportUserInputIssue(`Unknown MCP server: ${normalizedName}`);
+    const mutation = new McpMutationService({
+      getConfig: () => loadConfig4(),
+      saveConfig: (config2) => saveConfig3(config2)
+    });
+    const result = mutation.toggleEnabled(name, enabled);
+    if (!result.changed) {
+      reportUserInputIssue(result.message);
       return;
     }
-    current.enabled = enabled;
-    saveConfig3(config2);
-    console.log(`${enabled ? "Enabled" : "Disabled"} MCP server ${normalizedName}.`);
+    console.log(result.message);
   }
 };
 function reportUserInputIssue(message) {
@@ -3195,8 +3209,8 @@ import {
   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 resolve10 } from "path";
+import { appendFileSync, closeSync, cpSync as cpSync2, existsSync as existsSync10, mkdirSync as mkdirSync5, openSync } from "fs";
+import { dirname as dirname2, join as join6, resolve as resolve10 } from "path";
 import { spawn as spawn2 } from "child_process";
 import { request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
@@ -3674,8 +3688,242 @@ var MissingProvider = class extends LLMProvider {
   }
 };
 
+// src/cli/commands/service-marketplace-installer.ts
+import { getWorkspacePath as getWorkspacePath5, loadConfig as loadConfig9 } from "@nextclaw/core";
+import { existsSync as existsSync8, rmSync as rmSync4 } from "fs";
+import { join as join4 } from "path";
+
+// 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/service-mcp-marketplace-ops.ts
+import { loadConfig as loadConfig8, saveConfig as saveConfig6 } from "@nextclaw/core";
+import { McpDoctorFacade as McpDoctorFacade2, McpMutationService as McpMutationService2 } from "@nextclaw/mcp";
+var ServiceMcpMarketplaceOps = class {
+  constructor(options) {
+    this.options = options;
+  }
+  async install(params) {
+    if (!params.template) {
+      throw new Error(`Missing MCP marketplace template for ${params.spec}`);
+    }
+    const template = params.template;
+    const result = this.createMutationService().installFromTemplate({
+      template,
+      name: params.name,
+      enabled: params.enabled,
+      scope: {
+        allAgents: params.allAgents ?? true,
+        agents: params.allAgents === false ? params.agents ?? [] : []
+      },
+      inputs: params.inputs,
+      metadata: {
+        source: "marketplace",
+        catalogSlug: params.spec,
+        displayName: template.defaultName
+      }
+    });
+    if (!result.changed) {
+      throw new Error(result.message);
+    }
+    await this.options.applyLiveConfigReload?.();
+    return {
+      name: result.name,
+      message: result.message
+    };
+  }
+  async enable(name) {
+    const result = this.createMutationService().toggleEnabled(name, true);
+    if (!result.changed) {
+      throw new Error(result.message);
+    }
+    await this.options.applyLiveConfigReload?.();
+    return { message: result.message };
+  }
+  async disable(name) {
+    const result = this.createMutationService().toggleEnabled(name, false);
+    if (!result.changed) {
+      throw new Error(result.message);
+    }
+    await this.options.applyLiveConfigReload?.();
+    return { message: result.message };
+  }
+  async remove(name) {
+    const result = this.createMutationService().removeServer(name);
+    if (!result.changed) {
+      throw new Error(result.message);
+    }
+    await this.options.applyLiveConfigReload?.();
+    return { message: result.message };
+  }
+  async doctor(name) {
+    const report = await this.createDoctorFacade().inspectOne(name);
+    if (!report) {
+      throw new Error(`Unknown MCP server: ${name}`);
+    }
+    return report;
+  }
+  createMutationService() {
+    return new McpMutationService2({
+      getConfig: () => loadConfig8(),
+      saveConfig: (config2) => saveConfig6(config2)
+    });
+  }
+  createDoctorFacade() {
+    return new McpDoctorFacade2({
+      getConfig: () => loadConfig8()
+    });
+  }
+};
+
+// src/cli/commands/service-marketplace-installer.ts
+var ServiceMarketplaceInstaller = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  createInstaller() {
+    return {
+      installPlugin: (spec) => this.installPlugin(spec),
+      installSkill: (params) => this.installSkill(params),
+      installMcp: (params) => this.installMcp(params),
+      enablePlugin: (id) => this.enablePlugin(id),
+      disablePlugin: (id) => this.disablePlugin(id),
+      uninstallPlugin: (id) => this.uninstallPlugin(id),
+      uninstallSkill: (slug) => this.uninstallSkill(slug),
+      enableMcp: (name) => this.enableMcp(name),
+      disableMcp: (name) => this.disableMcp(name),
+      removeMcp: (name) => this.removeMcp(name),
+      doctorMcp: (name) => this.doctorMcp(name)
+    };
+  }
+  async installPlugin(spec) {
+    const result = await installPluginMutation(spec);
+    await this.deps.applyLiveConfigReload?.();
+    return { message: result.message };
+  }
+  async installSkill(params) {
+    if (params.kind === "builtin") {
+      const result = this.deps.installBuiltinSkill(params.slug, params.force);
+      if (!result) {
+        throw new Error(`Builtin skill not found: ${params.slug}`);
+      }
+      return result;
+    }
+    if (params.kind && params.kind !== "marketplace") {
+      throw new Error(`Unsupported marketplace skill kind: ${params.kind}`);
+    }
+    const workspace = getWorkspacePath5(loadConfig9().agents.defaults.workspace);
+    const args = buildMarketplaceSkillInstallArgs({
+      slug: params.slug,
+      workspace,
+      force: params.force
+    });
+    try {
+      const output = await this.deps.runCliSubcommand(args);
+      const summary = pickUserFacingCommandSummary(output, `Installed skill: ${params.slug}`);
+      return { message: summary };
+    } catch (error) {
+      const fallback = this.deps.installBuiltinSkill(params.slug, params.force);
+      if (!fallback) {
+        throw error;
+      }
+      return fallback;
+    }
+  }
+  async installMcp(params) {
+    return await this.createMcpMarketplaceOps().install(params);
+  }
+  async enablePlugin(id) {
+    const result = await enablePluginMutation(id);
+    await this.deps.applyLiveConfigReload?.();
+    return { message: result.message };
+  }
+  async disablePlugin(id) {
+    const result = await disablePluginMutation(id);
+    await this.deps.applyLiveConfigReload?.();
+    return { message: result.message };
+  }
+  async uninstallPlugin(id) {
+    await disablePluginMutation(id);
+    await this.deps.applyLiveConfigReload?.();
+    const result = await uninstallPluginMutation(id, { force: true });
+    await this.deps.applyLiveConfigReload?.();
+    return { message: result.message };
+  }
+  async uninstallSkill(slug) {
+    const workspace = getWorkspacePath5(loadConfig9().agents.defaults.workspace);
+    const targetDir = join4(workspace, "skills", slug);
+    if (!existsSync8(targetDir)) {
+      throw new Error(`Skill not installed in workspace: ${slug}`);
+    }
+    rmSync4(targetDir, { recursive: true, force: true });
+    return {
+      message: `Uninstalled skill: ${slug}`
+    };
+  }
+  async enableMcp(name) {
+    return await this.createMcpMarketplaceOps().enable(name);
+  }
+  async disableMcp(name) {
+    return await this.createMcpMarketplaceOps().disable(name);
+  }
+  async removeMcp(name) {
+    return await this.createMcpMarketplaceOps().remove(name);
+  }
+  async doctorMcp(name) {
+    return await this.createMcpMarketplaceOps().doctor(name);
+  }
+  createMcpMarketplaceOps() {
+    return new ServiceMcpMarketplaceOps({
+      applyLiveConfigReload: this.deps.applyLiveConfigReload
+    });
+  }
+};
+
 // src/cli/commands/service-plugin-reload.ts
-import { getWorkspacePath as getWorkspacePath5 } from "@nextclaw/core";
+import { getWorkspacePath as getWorkspacePath6 } from "@nextclaw/core";
 import {
   getPluginChannelBindings as getPluginChannelBindings2,
   startPluginChannelGateways,
@@ -3741,7 +3989,7 @@ function shouldRestartChannelsForPluginReload(params) {
 
 // src/cli/commands/service-plugin-reload.ts
 async function reloadServicePlugins(params) {
-  const nextWorkspace = getWorkspacePath5(params.nextConfig.agents.defaults.workspace);
+  const nextWorkspace = getWorkspacePath6(params.nextConfig.agents.defaults.workspace);
   const nextPluginRegistry = loadPluginRegistry(params.nextConfig, nextWorkspace);
   const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
   const nextPluginChannelBindings = getPluginChannelBindings2(nextPluginRegistry);
@@ -3779,7 +4027,7 @@ import {
   createAssistantStreamDeltaControlMessage,
   createAssistantStreamResetControlMessage,
   AgentRouteResolver,
-  getWorkspacePath as getWorkspacePath6,
+  getWorkspacePath as getWorkspacePath7,
   parseAgentScopedSessionKey
 } from "@nextclaw/core";
 function normalizeAgentId(value) {
@@ -3824,7 +4072,7 @@ function resolveAgentProfiles(config2) {
   }
   return Array.from(unique.values()).map((entry) => ({
     id: entry.id,
-    workspace: getWorkspacePath6(entry.workspace ?? defaults.workspace),
+    workspace: getWorkspacePath7(entry.workspace ?? defaults.workspace),
     model: entry.model ?? defaults.model,
     engine: normalizeEngineKind(entry.engine ?? defaults.engine),
     engineConfig: entry.engineConfig ?? toRecord(defaults.engineConfig),
@@ -4089,7 +4337,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: getWorkspacePath6(this.options.config.agents.defaults.workspace),
+      workspace: getWorkspacePath7(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,
@@ -4297,7 +4545,7 @@ import { createAgentClientFromServer, DefaultNcpAgentBackend } from "@nextclaw/n
 import {
   ContextBuilder,
   InputBudgetPruner,
-  getWorkspacePath as getWorkspacePath7,
+  getWorkspacePath as getWorkspacePath8,
   parseThinkingLevel,
   resolveThinkingLevel
 } from "@nextclaw/core";
@@ -4795,7 +5043,7 @@ function resolvePrimaryAgentProfile(config2) {
   const profile = config2.agents.list.find((entry) => entry.id.trim() === configuredDefaultAgentId);
   return {
     agentId: configuredDefaultAgentId,
-    workspace: getWorkspacePath7(profile?.workspace ?? config2.agents.defaults.workspace),
+    workspace: getWorkspacePath8(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,
@@ -5595,60 +5843,15 @@ async function createUiNcpAgent(params) {
   };
 }
 
-// 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";
+import { existsSync as existsSync9, mkdirSync as mkdirSync4, readdirSync as readdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync4 } from "fs";
+import { join as join5 } from "path";
 import {
   getDataDir as getDataDir5,
   parseAgentScopedSessionKey as parseAgentScopedSessionKey2,
   safeFilename
 } from "@nextclaw/core";
-var RUNS_DIR = join4(getDataDir5(), "runs");
+var RUNS_DIR = join5(getDataDir5(), "runs");
 var NON_TERMINAL_STATES = /* @__PURE__ */ new Set(["queued", "running"]);
 var DEFAULT_SESSION_TYPE = "native";
 var SESSION_TYPE_METADATA_KEY = "session_type";
@@ -6174,7 +6377,7 @@ var UiChatRunCoordinator = class {
     };
   }
   getRunPath(runId) {
-    return join4(RUNS_DIR, `${safeFilename(runId)}.json`);
+    return join5(RUNS_DIR, `${safeFilename(runId)}.json`);
   }
   persistRun(run) {
     const persisted = {
@@ -6196,14 +6399,14 @@ var UiChatRunCoordinator = class {
 `);
   }
   loadPersistedRuns() {
-    if (!existsSync8(RUNS_DIR)) {
+    if (!existsSync9(RUNS_DIR)) {
       return;
     }
     for (const entry of readdirSync2(RUNS_DIR, { withFileTypes: true })) {
       if (!entry.isFile() || !entry.name.endsWith(".json")) {
         continue;
       }
-      const path2 = join4(RUNS_DIR, entry.name);
+      const path2 = join5(RUNS_DIR, entry.name);
       try {
         const parsed = JSON.parse(readFileSync8(path2, "utf-8"));
         const runId = readOptionalString(parsed.runId);
@@ -6268,14 +6471,14 @@ var {
   getDataDir: getDataDir6,
   getProvider,
   getProviderName,
-  getWorkspacePath: getWorkspacePath8,
+  getWorkspacePath: getWorkspacePath9,
   HeartbeatService,
   LiteLLMProvider,
-  loadConfig: loadConfig8,
+  loadConfig: loadConfig10,
   MessageBus,
   ProviderManager,
   resolveConfigSecrets: resolveConfigSecrets2,
-  saveConfig: saveConfig6,
+  saveConfig: saveConfig7,
   SessionManager,
   parseAgentScopedSessionKey: parseAgentScopedSessionKey3
 } = NextclawCore;
@@ -6296,8 +6499,8 @@ var ServiceCommands = class {
     this.applyLiveConfigReload = null;
     this.liveUiNcpAgent = null;
     const runtimeConfigPath = getConfigPath3();
-    const config2 = resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath });
-    const workspace = getWorkspacePath8(config2.agents.defaults.workspace);
+    const config2 = resolveConfigSecrets2(loadConfig10(), { configPath: runtimeConfigPath });
+    const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
     let pluginRegistry = loadPluginRegistry(config2, workspace);
     let extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
@@ -6326,7 +6529,7 @@ var ServiceCommands = class {
         }
       }
     };
-    const cronStorePath = join5(getDataDir6(), "cron", "jobs.json");
+    const cronStorePath = join6(getDataDir6(), "cron", "jobs.json");
     const cron2 = new CronService2(cronStorePath);
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiStaticDir = options.uiStaticDir === void 0 ? resolveUiStaticDir() : options.uiStaticDir;
@@ -6341,7 +6544,7 @@ var ServiceCommands = class {
       sessionManager,
       providerManager,
       makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }) ?? this.makeMissingProvider(nextConfig),
-      loadConfig: () => resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }),
+      loadConfig: () => resolveConfigSecrets2(loadConfig10(), { configPath: runtimeConfigPath }),
       getExtensionChannels: () => extensionRegistry.channels,
       onRestartRequired: (paths) => {
         void this.deps.requestRestart({
@@ -6352,14 +6555,14 @@ var ServiceCommands = class {
       }
     });
     this.applyLiveConfigReload = async () => {
-      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }));
+      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig10(), { configPath: runtimeConfigPath }));
     };
     const gatewayController = new GatewayControllerImpl({
       reloader,
       cron: cron2,
       sessionManager,
       getConfigPath: getConfigPath3,
-      saveConfig: saveConfig6,
+      saveConfig: saveConfig7,
       requestRestart: async (options2) => {
         await this.deps.requestRestart({
           reason: options2?.reason ?? "gateway tool restart",
@@ -6385,7 +6588,7 @@ var ServiceCommands = class {
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig10(), { configPath: runtimeConfigPath }),
         accountId
       })
     });
@@ -6418,14 +6621,14 @@ var ServiceCommands = class {
     });
     let pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
     setPluginRuntimeBridge({
-      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }), pluginChannelBindings),
+      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig10(), { 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 = loadConfig8();
+        const current = loadConfig10();
         const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
-        saveConfig6(next);
+        saveConfig7(next);
       },
       dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
         const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
@@ -6499,12 +6702,12 @@ var ServiceCommands = class {
       providerManager,
       bus,
       gatewayController,
-      () => resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }),
+      () => resolveConfigSecrets2(loadConfig10(), { configPath: runtimeConfigPath }),
       () => extensionRegistry,
       ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig10(), { configPath: runtimeConfigPath }),
         accountId
       })
     );
@@ -6662,7 +6865,7 @@ var ServiceCommands = class {
     });
   }
   async runForeground(options) {
-    const config2 = loadConfig8();
+    const config2 = loadConfig10();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (options.open) {
@@ -6675,7 +6878,7 @@ var ServiceCommands = class {
     });
   }
   async startService(options) {
-    const config2 = loadConfig8();
+    const config2 = loadConfig10();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     const apiUrl = `${uiUrl}/api`;
@@ -7208,6 +7411,11 @@ var ServiceCommands = class {
       })
     });
     this.liveUiNcpAgent = ncpAgent;
+    const marketplaceInstaller = new ServiceMarketplaceInstaller({
+      applyLiveConfigReload: this.applyLiveConfigReload ?? void 0,
+      runCliSubcommand: (args) => this.runCliSubcommand(args),
+      installBuiltinSkill: (slug, force) => this.installBuiltinMarketplaceSkill(slug, force)
+    }).createInstaller();
     const uiServer = startUiServer({
       host: uiConfig.host,
       port: uiConfig.port,
@@ -7217,14 +7425,7 @@ var ServiceCommands = class {
       cronService,
       marketplace: {
         apiBaseUrl: process.env.NEXTCLAW_MARKETPLACE_API_BASE,
-        installer: {
-          installPlugin: (spec) => this.installMarketplacePlugin(spec),
-          installSkill: (params) => this.installMarketplaceSkill(params),
-          enablePlugin: (id) => this.enableMarketplacePlugin(id),
-          disablePlugin: (id) => this.disableMarketplacePlugin(id),
-          uninstallPlugin: (id) => this.uninstallMarketplacePlugin(id),
-          uninstallSkill: (slug) => this.uninstallMarketplaceSkill(slug)
-        }
+        installer: marketplaceInstaller
       },
       ncpAgent,
       chatRuntime: {
@@ -7305,73 +7506,11 @@ var ServiceCommands = class {
       openBrowser(uiUrl);
     }
   }
-  async installMarketplacePlugin(spec) {
-    const result = await installPluginMutation(spec);
-    await this.applyLiveConfigReload?.();
-    return { message: result.message };
-  }
-  async installMarketplaceSkill(params) {
-    if (params.kind === "builtin") {
-      const result = this.installBuiltinMarketplaceSkill(params.slug, params.force);
-      if (!result) {
-        throw new Error(`Builtin skill not found: ${params.slug}`);
-      }
-      return result;
-    }
-    if (params.kind && params.kind !== "marketplace") {
-      throw new Error(`Unsupported marketplace skill kind: ${params.kind}`);
-    }
-    const workspace = getWorkspacePath8(loadConfig8().agents.defaults.workspace);
-    const args = buildMarketplaceSkillInstallArgs({
-      slug: params.slug,
-      workspace,
-      force: params.force
-    });
-    try {
-      const output = await this.runCliSubcommand(args);
-      const summary = pickUserFacingCommandSummary(output, `Installed skill: ${params.slug}`);
-      return { message: summary };
-    } catch (error) {
-      const fallback = this.installBuiltinMarketplaceSkill(params.slug, params.force);
-      if (!fallback) {
-        throw error;
-      }
-      return fallback;
-    }
-  }
-  async enableMarketplacePlugin(id) {
-    const result = await enablePluginMutation(id);
-    await this.applyLiveConfigReload?.();
-    return { message: result.message };
-  }
-  async disableMarketplacePlugin(id) {
-    const result = await disablePluginMutation(id);
-    await this.applyLiveConfigReload?.();
-    return { message: result.message };
-  }
-  async uninstallMarketplacePlugin(id) {
-    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 = getWorkspacePath8(loadConfig8().agents.defaults.workspace);
-    const targetDir = join5(workspace, "skills", slug);
-    if (!existsSync9(targetDir)) {
-      throw new Error(`Skill not installed in workspace: ${slug}`);
-    }
-    rmSync4(targetDir, { recursive: true, force: true });
-    return {
-      message: `Uninstalled skill: ${slug}`
-    };
-  }
   installBuiltinMarketplaceSkill(slug, force) {
-    const workspace = getWorkspacePath8(loadConfig8().agents.defaults.workspace);
-    const destination = join5(workspace, "skills", slug);
-    const destinationSkillFile = join5(destination, "SKILL.md");
-    if (existsSync9(destinationSkillFile) && !force) {
+    const workspace = getWorkspacePath9(loadConfig10().agents.defaults.workspace);
+    const destination = join6(workspace, "skills", slug);
+    const destinationSkillFile = join6(destination, "SKILL.md");
+    if (existsSync10(destinationSkillFile) && !force) {
       return {
         message: `${slug} is already installed`
       };
@@ -7379,14 +7518,14 @@ var ServiceCommands = class {
     const loader = createSkillsLoader(workspace);
     const builtin = (loader?.listSkills(false) ?? []).find((skill) => skill.name === slug && skill.source === "builtin");
     if (!builtin) {
-      if (existsSync9(destinationSkillFile)) {
+      if (existsSync10(destinationSkillFile)) {
         return {
           message: `${slug} is already installed`
         };
       }
       return null;
     }
-    mkdirSync5(join5(workspace, "skills"), { recursive: true });
+    mkdirSync5(join6(workspace, "skills"), { recursive: true });
     cpSync2(dirname2(builtin.path), destination, { recursive: true, force: true });
     return {
       message: `Installed skill: ${slug}`
@@ -7446,9 +7585,9 @@ ${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 { cpSync as cpSync3, existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync9, readdirSync as readdirSync3, rmSync as rmSync5, writeFileSync as writeFileSync5 } from "fs";
 import { createRequire as createRequire2 } from "module";
-import { dirname as dirname3, join as join6, resolve as resolve11 } from "path";
+import { dirname as dirname3, join as join7, 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";
@@ -7478,12 +7617,12 @@ var WorkspaceManager = class {
       { source: "memory/MEMORY.md", target: "memory/MEMORY.md" }
     ];
     for (const entry of templateFiles) {
-      const filePath = join6(workspace, entry.target);
-      if (!force && existsSync10(filePath)) {
+      const filePath = join7(workspace, entry.target);
+      if (!force && existsSync11(filePath)) {
         continue;
       }
-      const templatePath = join6(templateDir, entry.source);
-      if (!existsSync10(templatePath)) {
+      const templatePath = join7(templateDir, entry.source);
+      if (!existsSync11(templatePath)) {
         console.warn(`Warning: Template file missing: ${templatePath}`);
         continue;
       }
@@ -7493,15 +7632,15 @@ var WorkspaceManager = class {
       writeFileSync5(filePath, content);
       created.push(entry.target);
     }
-    const memoryDir = join6(workspace, "memory");
-    if (!existsSync10(memoryDir)) {
+    const memoryDir = join7(workspace, "memory");
+    if (!existsSync11(memoryDir)) {
       mkdirSync6(memoryDir, { recursive: true });
-      created.push(join6("memory", ""));
+      created.push(join7("memory", ""));
     }
-    const skillsDir = join6(workspace, "skills");
-    if (!existsSync10(skillsDir)) {
+    const skillsDir = join7(workspace, "skills");
+    if (!existsSync11(skillsDir)) {
       mkdirSync6(skillsDir, { recursive: true });
-      created.push(join6("skills", ""));
+      created.push(join7("skills", ""));
     }
     const seeded = this.seedBuiltinSkills(skillsDir, { force });
     if (seeded > 0) {
@@ -7520,12 +7659,12 @@ var WorkspaceManager = class {
       if (!entry.isDirectory()) {
         continue;
       }
-      const src = join6(sourceDir, entry.name);
-      if (!existsSync10(join6(src, "SKILL.md"))) {
+      const src = join7(sourceDir, entry.name);
+      if (!existsSync11(join7(src, "SKILL.md"))) {
         continue;
       }
-      const dest = join6(targetDir, entry.name);
-      if (!force && existsSync10(dest)) {
+      const dest = join7(targetDir, entry.name);
+      if (!force && existsSync11(dest)) {
         continue;
       }
       try {
@@ -7543,12 +7682,12 @@ var WorkspaceManager = class {
       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)) {
+      const distSkills = join7(pkgRoot, "dist", "skills");
+      if (existsSync11(distSkills)) {
         return distSkills;
       }
-      const srcSkills = join6(pkgRoot, "src", "agent", "skills");
-      if (existsSync10(srcSkills)) {
+      const srcSkills = join7(pkgRoot, "src", "agent", "skills");
+      if (existsSync11(srcSkills)) {
         return srcSkills;
       }
       return null;
@@ -7563,17 +7702,17 @@ var WorkspaceManager = class {
     }
     const cliDir = resolve11(fileURLToPath3(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
-    const candidates = [join6(pkgRoot, "templates")];
+    const candidates = [join7(pkgRoot, "templates")];
     for (const candidate of candidates) {
-      if (existsSync10(candidate)) {
+      if (existsSync11(candidate)) {
         return candidate;
       }
     }
     return null;
   }
   getBridgeDir() {
-    const userBridge = join6(getDataDir7(), "bridge");
-    if (existsSync10(join6(userBridge, "dist", "index.js"))) {
+    const userBridge = join7(getDataDir7(), "bridge");
+    if (existsSync11(join7(userBridge, "dist", "index.js"))) {
       return userBridge;
     }
     if (!which("npm")) {
@@ -7582,12 +7721,12 @@ var WorkspaceManager = class {
     }
     const cliDir = resolve11(fileURLToPath3(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
-    const pkgBridge = join6(pkgRoot, "bridge");
-    const srcBridge = join6(pkgRoot, "..", "..", "bridge");
+    const pkgBridge = join7(pkgRoot, "bridge");
+    const srcBridge = join7(pkgRoot, "..", "..", "bridge");
     let source = null;
-    if (existsSync10(join6(pkgBridge, "package.json"))) {
+    if (existsSync11(join7(pkgBridge, "package.json"))) {
       source = pkgBridge;
-    } else if (existsSync10(join6(srcBridge, "package.json"))) {
+    } else if (existsSync11(join7(srcBridge, "package.json"))) {
       source = srcBridge;
     }
     if (!source) {
@@ -7596,7 +7735,7 @@ var WorkspaceManager = class {
     }
     console.log(`${this.logo} Setting up bridge...`);
     mkdirSync6(resolve11(userBridge, ".."), { recursive: true });
-    if (existsSync10(userBridge)) {
+    if (existsSync11(userBridge)) {
       rmSync5(userBridge, { recursive: true, force: true });
     }
     cpSync3(source, userBridge, {
@@ -7632,7 +7771,7 @@ function resolveSkillsInstallWorkdir(params) {
   if (params.explicitWorkdir) {
     return expandHome2(params.explicitWorkdir);
   }
-  return getWorkspacePath9(params.configuredWorkspace);
+  return getWorkspacePath10(params.configuredWorkspace);
 }
 var CliRuntime = class {
   logo;
@@ -7863,15 +8002,15 @@ var CliRuntime = class {
     const force = Boolean(options.force);
     const configPath = getConfigPath4();
     let createdConfig = false;
-    if (!existsSync11(configPath)) {
+    if (!existsSync12(configPath)) {
       const config3 = ConfigSchema2.parse({});
-      saveConfig7(config3);
+      saveConfig8(config3);
       createdConfig = true;
     }
-    const config2 = loadConfig9();
+    const config2 = loadConfig11();
     const workspaceSetting = config2.agents.defaults.workspace;
-    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join7(getDataDir8(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
-    const workspaceExisted = existsSync11(workspacePath);
+    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join8(getDataDir8(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
+    const workspaceExisted = existsSync12(workspacePath);
     mkdirSync7(workspacePath, { recursive: true });
     const templateResult = this.workspaceManager.createWorkspaceTemplates(
       workspacePath,
@@ -7904,7 +8043,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
   async login(opts = {}) {
     await this.init({ source: "login", auto: true });
     const configPath = getConfigPath4();
-    const config2 = loadConfig9(configPath);
+    const config2 = loadConfig11(configPath);
     const providers = config2.providers;
     const nextclawProvider = providers.nextclaw ?? {
       displayName: "",
@@ -7966,7 +8105,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     nextclawProvider.apiBase = v1Base;
     nextclawProvider.apiKey = token;
     providers.nextclaw = nextclawProvider;
-    saveConfig7(config2, configPath);
+    saveConfig8(config2, configPath);
     console.log(`\u2713 Logged in to NextClaw platform (${platformBase})`);
     console.log(`\u2713 Account: ${email} (${role})`);
     console.log(`\u2713 Token saved into providers.nextclaw.apiKey`);
@@ -8061,15 +8200,15 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
   }
   async agent(opts) {
     const configPath = getConfigPath4();
-    const config2 = resolveConfigSecrets3(loadConfig9(), { configPath });
-    const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
+    const config2 = resolveConfigSecrets3(loadConfig11(), { configPath });
+    const workspace = getWorkspacePath10(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
     const pluginChannelBindings = getPluginChannelBindings4(pluginRegistry);
     setPluginRuntimeBridge2({
       loadConfig: () => toPluginConfigView(
-        resolveConfigSecrets3(loadConfig9(), { configPath }),
+        resolveConfigSecrets3(loadConfig11(), { configPath }),
         pluginChannelBindings
       ),
       writeConfigFile: async (nextConfigView) => {
@@ -8078,13 +8217,13 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
             "plugin runtime writeConfigFile expects an object config"
           );
         }
-        const current = loadConfig9();
+        const current = loadConfig11();
         const next = mergePluginConfigView(
           current,
           nextConfigView,
           pluginChannelBindings
         );
-        saveConfig7(next);
+        saveConfig8(next);
       }
     });
     try {
@@ -8110,7 +8249,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
           registry: pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets3(loadConfig9(), { configPath }),
+          cfg: resolveConfigSecrets3(loadConfig11(), { configPath }),
           accountId
         })
       });
@@ -8129,10 +8268,10 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         `${this.logo} Interactive mode (type exit or Ctrl+C to quit)
 `
       );
-      const historyFile = join7(getDataDir8(), "history", "cli_history");
+      const historyFile = join8(getDataDir8(), "history", "cli_history");
       const historyDir = resolve12(historyFile, "..");
       mkdirSync7(historyDir, { recursive: true });
-      const history = existsSync11(historyFile) ? readFileSync10(historyFile, "utf-8").split("\n").filter(Boolean) : [];
+      const history = existsSync12(historyFile) ? readFileSync10(historyFile, "utf-8").split("\n").filter(Boolean) : [];
       const rl = createInterface2({
         input: process.stdin,
         output: process.stdout
@@ -8305,7 +8444,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const config2 = loadConfig9();
+    const config2 = loadConfig11();
     const workdir = resolveSkillsInstallWorkdir({
       explicitWorkdir: options.workdir,
       configuredWorkspace: config2.agents.defaults.workspace