nextclaw 0.12.5 → 0.13.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 loadConfig9,
-  saveConfig as saveConfig7,
-  getConfigPath as getConfigPath4,
-  getDataDir as getDataDir8,
+  loadConfig as loadConfig12,
+  saveConfig as saveConfig8,
+  getConfigPath as getConfigPath5,
+  getDataDir as getDataDir9,
   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 existsSync13, mkdirSync as mkdirSync8, readFileSync as readFileSync11, writeFileSync as writeFileSync7 } from "fs";
+import { join as join9, resolve as resolve12 } from "path";
 import { createInterface as createInterface2 } from "readline";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { spawn as spawn3 } from "child_process";
@@ -74,9 +74,9 @@ var RestartCoordinator = class {
           message: "Restart already scheduled; skipping duplicate request."
         };
       }
-      const delay = typeof request.delayMs === "number" && Number.isFinite(request.delayMs) ? Math.max(0, Math.floor(request.delayMs)) : 100;
+      const delay2 = typeof request.delayMs === "number" && Number.isFinite(request.delayMs) ? Math.max(0, Math.floor(request.delayMs)) : 100;
       this.exitScheduled = true;
-      this.deps.scheduleProcessExit(delay, reason);
+      this.deps.scheduleProcessExit(delay2, reason);
       return {
         status: "exit-scheduled",
         message: `Restart scheduled (${reason}).`
@@ -1486,6 +1486,7 @@ function toExtensionRegistry(pluginRegistry) {
       kind: runtime2.kind,
       label: runtime2.label,
       createRuntime: runtime2.createRuntime,
+      describeSessionType: runtime2.describeSessionType,
       source: runtime2.source
     })),
     diagnostics: pluginRegistry.diagnostics.map((diag) => ({
@@ -2118,7 +2119,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 +2160,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 +2182,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 +2203,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 +2270,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 +2303,7 @@ var McpCommands = class {
     const registry = new McpRegistryService({
       getConfig: () => loadConfig4()
     });
-    const doctor = new McpDoctorService({
+    const doctor = new McpDoctorFacade({
       getConfig: () => loadConfig4(),
       registryService: registry
     });
@@ -2314,16 +2329,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) {
@@ -2844,17 +2859,281 @@ var CronCommands = class {
   }
 };
 
+// src/cli/commands/remote.ts
+import { getConfigPath as getConfigPath2, getDataDir as getDataDir4, loadConfig as loadConfig7 } from "@nextclaw/core";
+import { ensureUiBridgeSecret } from "@nextclaw/server";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { dirname as dirname2, join as join4 } from "path";
+import { hostname, platform as readPlatform } from "os";
+function encodeBase64(bytes) {
+  return Buffer.from(bytes).toString("base64");
+}
+function decodeBase64(base64) {
+  if (!base64) {
+    return new Uint8Array();
+  }
+  return new Uint8Array(Buffer.from(base64, "base64"));
+}
+function delay(ms) {
+  return new Promise((resolveDelay) => setTimeout(resolveDelay, ms));
+}
+function ensureDir(path2) {
+  mkdirSync4(path2, { recursive: true });
+}
+function readJsonFile2(path2) {
+  if (!existsSync6(path2)) {
+    return null;
+  }
+  try {
+    return JSON.parse(readFileSync6(path2, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function writeJsonFile(path2, value) {
+  ensureDir(dirname2(path2));
+  writeFileSync4(path2, `${JSON.stringify(value, null, 2)}
+`, "utf-8");
+}
+var RemoteCommands = class {
+  remoteDir = join4(getDataDir4(), "remote");
+  devicePath = join4(this.remoteDir, "device.json");
+  ensureDeviceInstallId() {
+    const existing = readJsonFile2(this.devicePath);
+    if (existing?.deviceInstallId?.trim()) {
+      return existing.deviceInstallId.trim();
+    }
+    const deviceInstallId = crypto.randomUUID();
+    ensureDir(this.remoteDir);
+    writeJsonFile(this.devicePath, { deviceInstallId });
+    return deviceInstallId;
+  }
+  resolvePlatformAccess(opts) {
+    const config2 = loadConfig7(getConfigPath2());
+    const providers = config2.providers;
+    const nextclawProvider = providers.nextclaw;
+    const token = typeof nextclawProvider?.apiKey === "string" ? nextclawProvider.apiKey.trim() : "";
+    if (!token) {
+      throw new Error('NextClaw platform token is missing. Run "nextclaw login" first.');
+    }
+    const configuredApiBase = typeof nextclawProvider?.apiBase === "string" ? nextclawProvider.apiBase.trim() : "";
+    const rawApiBase = typeof opts.apiBase === "string" && opts.apiBase.trim().length > 0 ? opts.apiBase.trim() : configuredApiBase;
+    if (!rawApiBase) {
+      throw new Error("Platform API base is missing. Pass --api-base or run nextclaw login.");
+    }
+    const platformBase = rawApiBase.replace(/\/v1\/?$/i, "");
+    return { platformBase, token, config: config2 };
+  }
+  resolveLocalOrigin(config2, opts) {
+    if (typeof opts.localOrigin === "string" && opts.localOrigin.trim().length > 0) {
+      return opts.localOrigin.trim().replace(/\/$/, "");
+    }
+    const state = readServiceState();
+    if (state && isProcessRunning(state.pid) && Number.isFinite(state.uiPort)) {
+      return `http://127.0.0.1:${state.uiPort}`;
+    }
+    const configuredPort = typeof config2.ui?.port === "number" && Number.isFinite(config2.ui.port) ? config2.ui.port : 18791;
+    return `http://127.0.0.1:${configuredPort}`;
+  }
+  async ensureLocalUiHealthy(localOrigin) {
+    const response = await fetch(`${localOrigin}/api/health`);
+    if (!response.ok) {
+      throw new Error(`Local UI is not healthy at ${localOrigin}. Start NextClaw first.`);
+    }
+  }
+  async registerDevice(params) {
+    const response = await fetch(`${params.platformBase}/platform/remote/devices/register`, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${params.token}`
+      },
+      body: JSON.stringify({
+        deviceInstallId: params.deviceInstallId,
+        displayName: params.displayName,
+        platform: readPlatform(),
+        appVersion: getPackageVersion(),
+        localOrigin: params.localOrigin
+      })
+    });
+    const payload = await response.json();
+    if (!response.ok || !payload.ok || !payload.data?.device) {
+      throw new Error(payload.error?.message ?? `Failed to register remote device (${response.status}).`);
+    }
+    return payload.data.device;
+  }
+  async requestBridgeCookie(localOrigin) {
+    const response = await fetch(`${localOrigin}/api/auth/bridge`, {
+      method: "POST",
+      headers: {
+        "x-nextclaw-ui-bridge-secret": ensureUiBridgeSecret()
+      }
+    });
+    const payload = await response.json();
+    if (!response.ok || !payload.ok) {
+      throw new Error(payload.error?.message ?? `Failed to request local auth bridge (${response.status}).`);
+    }
+    return typeof payload.data?.cookie === "string" && payload.data.cookie.trim().length > 0 ? payload.data.cookie.trim() : null;
+  }
+  async handleRelayRequest(params) {
+    const bridgeCookie = await this.requestBridgeCookie(params.localOrigin);
+    const url = new URL(params.frame.path, params.localOrigin);
+    const headers = new Headers();
+    for (const [key, value] of params.frame.headers) {
+      const lower = key.toLowerCase();
+      if ([
+        "host",
+        "connection",
+        "content-length",
+        "cookie",
+        "x-forwarded-for",
+        "x-forwarded-proto",
+        "cf-connecting-ip"
+      ].includes(lower)) {
+        continue;
+      }
+      headers.set(key, value);
+    }
+    if (bridgeCookie) {
+      headers.set("cookie", bridgeCookie);
+    }
+    const bodyBytes = decodeBase64(params.frame.bodyBase64);
+    const response = await fetch(url, {
+      method: params.frame.method,
+      headers,
+      body: params.frame.method === "GET" || params.frame.method === "HEAD" ? void 0 : bodyBytes
+    });
+    const responseHeaders = Array.from(response.headers.entries()).filter(([key]) => {
+      const lower = key.toLowerCase();
+      return !["content-length", "connection", "transfer-encoding", "set-cookie"].includes(lower);
+    });
+    const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
+    if (response.body && contentType.startsWith("text/event-stream")) {
+      params.socket.send(JSON.stringify({
+        type: "response.start",
+        requestId: params.frame.requestId,
+        status: response.status,
+        headers: responseHeaders
+      }));
+      const reader = response.body.getReader();
+      try {
+        while (true) {
+          const { value, done } = await reader.read();
+          if (done) {
+            break;
+          }
+          if (value && value.length > 0) {
+            params.socket.send(JSON.stringify({
+              type: "response.chunk",
+              requestId: params.frame.requestId,
+              bodyBase64: encodeBase64(value)
+            }));
+          }
+        }
+      } finally {
+        reader.releaseLock();
+      }
+      params.socket.send(JSON.stringify({
+        type: "response.end",
+        requestId: params.frame.requestId
+      }));
+      return;
+    }
+    const responseBody = response.body ? new Uint8Array(await response.arrayBuffer()) : new Uint8Array();
+    params.socket.send(JSON.stringify({
+      type: "response",
+      requestId: params.frame.requestId,
+      status: response.status,
+      headers: responseHeaders,
+      bodyBase64: encodeBase64(responseBody)
+    }));
+  }
+  async connectOnce(params) {
+    await new Promise((resolve13, reject) => {
+      const socket = new WebSocket(params.wsUrl);
+      const pingTimer = setInterval(() => {
+        if (socket.readyState === WebSocket.OPEN) {
+          socket.send(JSON.stringify({ type: "ping", at: (/* @__PURE__ */ new Date()).toISOString() }));
+        }
+      }, 15e3);
+      socket.addEventListener("open", () => {
+        console.log(`\u2713 Remote connector connected: ${params.wsUrl}`);
+      });
+      socket.addEventListener("message", (event) => {
+        void (async () => {
+          let frame = null;
+          try {
+            frame = JSON.parse(String(event.data ?? ""));
+          } catch {
+            return;
+          }
+          if (!frame || frame.type !== "request") {
+            return;
+          }
+          try {
+            await this.handleRelayRequest({ frame, localOrigin: params.localOrigin, socket });
+          } catch (error) {
+            socket.send(JSON.stringify({
+              type: "response.error",
+              requestId: frame.requestId,
+              message: error instanceof Error ? error.message : String(error)
+            }));
+          }
+        })();
+      });
+      socket.addEventListener("close", () => {
+        clearInterval(pingTimer);
+        resolve13();
+      });
+      socket.addEventListener("error", () => {
+        clearInterval(pingTimer);
+        reject(new Error("Remote connector websocket failed."));
+      });
+    });
+  }
+  async connect(opts = {}) {
+    const { platformBase, token, config: config2 } = this.resolvePlatformAccess(opts);
+    const localOrigin = this.resolveLocalOrigin(config2, opts);
+    await this.ensureLocalUiHealthy(localOrigin);
+    const deviceInstallId = this.ensureDeviceInstallId();
+    const displayName = typeof opts.name === "string" && opts.name.trim().length > 0 ? opts.name.trim() : hostname();
+    const device = await this.registerDevice({
+      platformBase,
+      token,
+      deviceInstallId,
+      displayName,
+      localOrigin
+    });
+    console.log(`\u2713 Remote device registered: ${device.displayName} (${device.id})`);
+    console.log(`\u2713 Local origin: ${localOrigin}`);
+    console.log(`\u2713 Platform: ${platformBase}`);
+    const wsUrl = `${platformBase.replace(/^http/i, "ws")}/platform/remote/connect?deviceId=${encodeURIComponent(device.id)}&token=${encodeURIComponent(token)}`;
+    do {
+      try {
+        await this.connectOnce({ wsUrl, localOrigin });
+      } catch (error) {
+        console.error(`Remote connector error: ${error instanceof Error ? error.message : String(error)}`);
+      }
+      if (opts.once) {
+        break;
+      }
+      console.log("Remote connector disconnected. Reconnecting in 3s...");
+      await delay(3e3);
+    } while (!opts.once);
+  }
+};
+
 // src/cli/commands/diagnostics.ts
 import { createServer as createNetServer } from "net";
-import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
 import { resolve as resolve8 } from "path";
 import {
   APP_NAME,
-  getConfigPath as getConfigPath2,
-  getDataDir as getDataDir4,
+  getConfigPath as getConfigPath3,
+  getDataDir as getDataDir5,
   getWorkspacePath as getWorkspacePath4,
   hasSecretRef,
-  loadConfig as loadConfig7
+  loadConfig as loadConfig8
 } from "@nextclaw/core";
 import { listBuiltinProviders } from "@nextclaw/runtime";
 var DiagnosticsCommands = class {
@@ -3015,10 +3294,10 @@ var DiagnosticsCommands = class {
     process.exitCode = exitCode;
   }
   async collectRuntimeStatus(params) {
-    const configPath = getConfigPath2();
-    const config2 = loadConfig7();
+    const configPath = getConfigPath3();
+    const config2 = loadConfig8();
     const workspacePath = getWorkspacePath4(config2.agents.defaults.workspace);
-    const serviceStatePath = resolve8(getDataDir4(), "run", "service.json");
+    const serviceStatePath = resolve8(getDataDir5(), "run", "service.json");
     const fixActions = [];
     let serviceState = readServiceState();
     if (params.fix && serviceState && !isProcessRunning(serviceState.pid)) {
@@ -3058,11 +3337,11 @@ var DiagnosticsCommands = class {
     });
     const issues = [];
     const recommendations = [];
-    if (!existsSync6(configPath)) {
+    if (!existsSync7(configPath)) {
       issues.push("Config file is missing.");
       recommendations.push(`Run ${APP_NAME} init to create config files.`);
     }
-    if (!existsSync6(workspacePath)) {
+    if (!existsSync7(workspacePath)) {
       issues.push("Workspace directory does not exist.");
       recommendations.push(`Run ${APP_NAME} init to create workspace templates.`);
     }
@@ -3095,13 +3374,13 @@ var DiagnosticsCommands = class {
     return {
       generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
       configPath,
-      configExists: existsSync6(configPath),
+      configExists: existsSync7(configPath),
       workspacePath,
-      workspaceExists: existsSync6(workspacePath),
+      workspaceExists: existsSync7(workspacePath),
       model: config2.agents.defaults.model,
       providers,
       serviceStatePath,
-      serviceStateExists: existsSync6(serviceStatePath),
+      serviceStateExists: existsSync7(serviceStatePath),
       fixActions,
       process: {
         managedByState,
@@ -3151,11 +3430,11 @@ var DiagnosticsCommands = class {
     }
   }
   readLogTail(path2, maxLines = 25) {
-    if (!existsSync6(path2)) {
+    if (!existsSync7(path2)) {
       return [];
     }
     try {
-      const lines = readFileSync6(path2, "utf-8").split(/\r?\n/).filter(Boolean);
+      const lines = readFileSync7(path2, "utf-8").split(/\r?\n/).filter(Boolean);
       if (lines.length <= maxLines) {
         return lines;
       }
@@ -3195,8 +3474,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 existsSync11, mkdirSync as mkdirSync6, openSync } from "fs";
+import { dirname as dirname3, join as join7, resolve as resolve10 } from "path";
 import { spawn as spawn2 } from "child_process";
 import { request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
@@ -3205,7 +3484,7 @@ import chokidar from "chokidar";
 
 // src/cli/gateway/controller.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
 import {
   buildConfigSchema,
   ConfigSchema,
@@ -3213,12 +3492,12 @@ import {
   redactConfigObject
 } from "@nextclaw/core";
 var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
-var readConfigSnapshot = (getConfigPath5) => {
-  const path2 = getConfigPath5();
+var readConfigSnapshot = (getConfigPath6) => {
+  const path2 = getConfigPath6();
   let raw = "";
   let parsed = {};
-  if (existsSync7(path2)) {
-    raw = readFileSync7(path2, "utf-8");
+  if (existsSync8(path2)) {
+    raw = readFileSync8(path2, "utf-8");
     try {
       parsed = JSON.parse(raw);
     } catch {
@@ -3325,11 +3604,11 @@ var GatewayControllerImpl = class {
       await this.deps.requestRestart(options);
       return;
     }
-    const delay = typeof options?.delayMs === "number" && Number.isFinite(options.delayMs) ? Math.max(0, options.delayMs) : 100;
+    const delay2 = typeof options?.delayMs === "number" && Number.isFinite(options.delayMs) ? Math.max(0, options.delayMs) : 100;
     console.log(`Gateway restart requested via tool${options?.reason ? ` (${options.reason})` : ""}.`);
     setTimeout(() => {
       process.exit(0);
-    }, delay);
+    }, delay2);
   }
   status() {
     return {
@@ -3674,8 +3953,242 @@ var MissingProvider = class extends LLMProvider {
   }
 };
 
+// src/cli/commands/service-marketplace-installer.ts
+import { getWorkspacePath as getWorkspacePath5, loadConfig as loadConfig10 } from "@nextclaw/core";
+import { existsSync as existsSync9, rmSync as rmSync4 } from "fs";
+import { join as join5 } 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 loadConfig9, 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: () => loadConfig9(),
+      saveConfig: (config2) => saveConfig6(config2)
+    });
+  }
+  createDoctorFacade() {
+    return new McpDoctorFacade2({
+      getConfig: () => loadConfig9()
+    });
+  }
+};
+
+// 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(loadConfig10().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(loadConfig10().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}`
+    };
+  }
+  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 +4254,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 +4292,7 @@ import {
   createAssistantStreamDeltaControlMessage,
   createAssistantStreamResetControlMessage,
   AgentRouteResolver,
-  getWorkspacePath as getWorkspacePath6,
+  getWorkspacePath as getWorkspacePath7,
   parseAgentScopedSessionKey
 } from "@nextclaw/core";
 function normalizeAgentId(value) {
@@ -3824,7 +4337,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 +4602,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 +4810,7 @@ import { createAgentClientFromServer, DefaultNcpAgentBackend } from "@nextclaw/n
 import {
   ContextBuilder,
   InputBudgetPruner,
-  getWorkspacePath as getWorkspacePath7,
+  getWorkspacePath as getWorkspacePath8,
   parseThinkingLevel,
   resolveThinkingLevel
 } from "@nextclaw/core";
@@ -4795,7 +5308,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,
@@ -5427,22 +5940,33 @@ var UiNcpRuntimeRegistry = class {
       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);
-    });
+  async listSessionTypes() {
+    const options = await Promise.all(
+      [...this.registrations.values()].map(async (registration) => {
+        const descriptor = await registration.describeSessionType?.();
+        return {
+          value: registration.kind,
+          label: registration.label,
+          ready: descriptor?.ready ?? true,
+          reason: descriptor?.reason ?? null,
+          reasonMessage: descriptor?.reasonMessage ?? null,
+          recommendedModel: descriptor?.recommendedModel ?? null,
+          cta: descriptor?.cta ?? null,
+          ...descriptor?.supportedModels ? { supportedModels: descriptor.supportedModels } : {}
+        };
+      })
+    );
     return {
       defaultType: this.defaultKind,
-      options
+      options: options.sort((left, right) => {
+        if (left.value === this.defaultKind) {
+          return -1;
+        }
+        if (right.value === this.defaultKind) {
+          return 1;
+        }
+        return left.value.localeCompare(right.value);
+      })
     };
   }
 };
@@ -5548,7 +6072,8 @@ async function createUiNcpAgent(params) {
       scope.add(runtimeRegistry.register({
         kind: registration.kind,
         label: registration.label,
-        createRuntime: registration.createRuntime
+        createRuntime: registration.createRuntime,
+        describeSessionType: registration.describeSessionType
       }));
     }
   };
@@ -5595,60 +6120,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 existsSync10, mkdirSync as mkdirSync5, readdirSync as readdirSync2, readFileSync as readFileSync9, writeFileSync as writeFileSync5 } from "fs";
+import { join as join6 } from "path";
 import {
-  getDataDir as getDataDir5,
+  getDataDir as getDataDir6,
   parseAgentScopedSessionKey as parseAgentScopedSessionKey2,
   safeFilename
 } from "@nextclaw/core";
-var RUNS_DIR = join4(getDataDir5(), "runs");
+var RUNS_DIR = join6(getDataDir6(), "runs");
 var NON_TERMINAL_STATES = /* @__PURE__ */ new Set(["queued", "running"]);
 var DEFAULT_SESSION_TYPE = "native";
 var SESSION_TYPE_METADATA_KEY = "session_type";
@@ -5707,7 +6187,7 @@ function hasToolSessionEvent(run) {
 var UiChatRunCoordinator = class {
   constructor(options) {
     this.options = options;
-    mkdirSync4(RUNS_DIR, { recursive: true });
+    mkdirSync5(RUNS_DIR, { recursive: true });
     this.loadPersistedRuns();
   }
   runs = /* @__PURE__ */ new Map();
@@ -6174,7 +6654,7 @@ var UiChatRunCoordinator = class {
     };
   }
   getRunPath(runId) {
-    return join4(RUNS_DIR, `${safeFilename(runId)}.json`);
+    return join6(RUNS_DIR, `${safeFilename(runId)}.json`);
   }
   persistRun(run) {
     const persisted = {
@@ -6192,20 +6672,20 @@ var UiChatRunCoordinator = class {
       ...typeof run.reply === "string" ? { reply: run.reply } : {},
       events: run.events
     };
-    writeFileSync4(this.getRunPath(run.runId), `${JSON.stringify(persisted, null, 2)}
+    writeFileSync5(this.getRunPath(run.runId), `${JSON.stringify(persisted, null, 2)}
 `);
   }
   loadPersistedRuns() {
-    if (!existsSync8(RUNS_DIR)) {
+    if (!existsSync10(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 = join6(RUNS_DIR, entry.name);
       try {
-        const parsed = JSON.parse(readFileSync8(path2, "utf-8"));
+        const parsed = JSON.parse(readFileSync9(path2, "utf-8"));
         const runId = readOptionalString(parsed.runId);
         const sessionKey = readOptionalString(parsed.sessionKey);
         if (!runId || !sessionKey) {
@@ -6264,18 +6744,18 @@ var {
   ChannelManager: ChannelManager2,
   CronService: CronService2,
   getApiBase,
-  getConfigPath: getConfigPath3,
-  getDataDir: getDataDir6,
+  getConfigPath: getConfigPath4,
+  getDataDir: getDataDir7,
   getProvider,
   getProviderName,
-  getWorkspacePath: getWorkspacePath8,
+  getWorkspacePath: getWorkspacePath9,
   HeartbeatService,
   LiteLLMProvider,
-  loadConfig: loadConfig8,
+  loadConfig: loadConfig11,
   MessageBus,
   ProviderManager,
   resolveConfigSecrets: resolveConfigSecrets2,
-  saveConfig: saveConfig6,
+  saveConfig: saveConfig7,
   SessionManager,
   parseAgentScopedSessionKey: parseAgentScopedSessionKey3
 } = NextclawCore;
@@ -6295,9 +6775,9 @@ var ServiceCommands = class {
   async startGateway(options = {}) {
     this.applyLiveConfigReload = null;
     this.liveUiNcpAgent = null;
-    const runtimeConfigPath = getConfigPath3();
-    const config2 = resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath });
-    const workspace = getWorkspacePath8(config2.agents.defaults.workspace);
+    const runtimeConfigPath = getConfigPath4();
+    const config2 = resolveConfigSecrets2(loadConfig11(), { configPath: runtimeConfigPath });
+    const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
     let pluginRegistry = loadPluginRegistry(config2, workspace);
     let extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
@@ -6326,7 +6806,7 @@ var ServiceCommands = class {
         }
       }
     };
-    const cronStorePath = join5(getDataDir6(), "cron", "jobs.json");
+    const cronStorePath = join7(getDataDir7(), "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 +6821,7 @@ var ServiceCommands = class {
       sessionManager,
       providerManager,
       makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }) ?? this.makeMissingProvider(nextConfig),
-      loadConfig: () => resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }),
+      loadConfig: () => resolveConfigSecrets2(loadConfig11(), { configPath: runtimeConfigPath }),
       getExtensionChannels: () => extensionRegistry.channels,
       onRestartRequired: (paths) => {
         void this.deps.requestRestart({
@@ -6352,14 +6832,14 @@ var ServiceCommands = class {
       }
     });
     this.applyLiveConfigReload = async () => {
-      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }));
+      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig11(), { configPath: runtimeConfigPath }));
     };
     const gatewayController = new GatewayControllerImpl({
       reloader,
       cron: cron2,
       sessionManager,
-      getConfigPath: getConfigPath3,
-      saveConfig: saveConfig6,
+      getConfigPath: getConfigPath4,
+      saveConfig: saveConfig7,
       requestRestart: async (options2) => {
         await this.deps.requestRestart({
           reason: options2?.reason ?? "gateway tool restart",
@@ -6385,7 +6865,7 @@ var ServiceCommands = class {
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig11(), { configPath: runtimeConfigPath }),
         accountId
       })
     });
@@ -6418,14 +6898,14 @@ var ServiceCommands = class {
     });
     let pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
     setPluginRuntimeBridge({
-      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }), pluginChannelBindings),
+      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig11(), { 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 = loadConfig11();
         const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
-        saveConfig6(next);
+        saveConfig7(next);
       },
       dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
         const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
@@ -6499,12 +6979,12 @@ var ServiceCommands = class {
       providerManager,
       bus,
       gatewayController,
-      () => resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }),
+      () => resolveConfigSecrets2(loadConfig11(), { configPath: runtimeConfigPath }),
       () => extensionRegistry,
       ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig8(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig11(), { configPath: runtimeConfigPath }),
         accountId
       })
     );
@@ -6541,7 +7021,7 @@ var ServiceCommands = class {
     return trimmed || void 0;
   }
   watchConfigFile(reloader) {
-    const configPath = resolve10(getConfigPath3());
+    const configPath = resolve10(getConfigPath4());
     const watcher = chokidar.watch(configPath, {
       ignoreInitial: true,
       awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 50 }
@@ -6662,7 +7142,7 @@ var ServiceCommands = class {
     });
   }
   async runForeground(options) {
-    const config2 = loadConfig8();
+    const config2 = loadConfig11();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (options.open) {
@@ -6675,7 +7155,7 @@ var ServiceCommands = class {
     });
   }
   async startService(options) {
-    const config2 = loadConfig8();
+    const config2 = loadConfig11();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     const apiUrl = `${uiUrl}/api`;
@@ -6736,7 +7216,7 @@ var ServiceCommands = class {
     }
     const logPath = resolveServiceLogPath();
     const logDir = resolve10(logPath, "..");
-    mkdirSync5(logDir, { recursive: true });
+    mkdirSync6(logDir, { recursive: true });
     const logFd = openSync(logPath, "a");
     const readinessTimeoutMs = this.resolveStartupTimeoutMs(options.startupTimeoutMs);
     const quickPhaseTimeoutMs = Math.min(8e3, readinessTimeoutMs);
@@ -7089,7 +7569,7 @@ var ServiceCommands = class {
         return null;
       }
       console.error("Error: No API key configured.");
-      console.error(`Set one in ${getConfigPath3()} under providers section`);
+      console.error(`Set one in ${getConfigPath4()} under providers section`);
       process.exit(1);
     }
     return new LiteLLMProvider({
@@ -7208,23 +7688,21 @@ 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,
-      configPath: getConfigPath3(),
+      configPath: getConfigPath4(),
       productVersion: getPackageVersion(),
       staticDir: uiStaticDir ?? void 0,
       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 +7783,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(loadConfig11().agents.defaults.workspace);
+    const destination = join7(workspace, "skills", slug);
+    const destinationSkillFile = join7(destination, "SKILL.md");
+    if (existsSync11(destinationSkillFile) && !force) {
       return {
         message: `${slug} is already installed`
       };
@@ -7379,15 +7795,15 @@ 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 (existsSync11(destinationSkillFile)) {
         return {
           message: `${slug} is already installed`
         };
       }
       return null;
     }
-    mkdirSync5(join5(workspace, "skills"), { recursive: true });
-    cpSync2(dirname2(builtin.path), destination, { recursive: true, force: true });
+    mkdirSync6(join7(workspace, "skills"), { recursive: true });
+    cpSync2(dirname3(builtin.path), destination, { recursive: true, force: true });
     return {
       message: `Installed skill: ${slug}`
     };
@@ -7446,11 +7862,11 @@ ${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 existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync10, readdirSync as readdirSync3, rmSync as rmSync5, writeFileSync as writeFileSync6 } from "fs";
 import { createRequire as createRequire2 } from "module";
-import { dirname as dirname3, join as join6, resolve as resolve11 } from "path";
+import { dirname as dirname4, join as join8, resolve as resolve11 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { APP_NAME as APP_NAME3, getDataDir as getDataDir7 } from "@nextclaw/core";
+import { APP_NAME as APP_NAME3, getDataDir as getDataDir8 } from "@nextclaw/core";
 import { spawnSync as spawnSync3 } from "child_process";
 var WorkspaceManager = class {
   constructor(logo) {
@@ -7478,30 +7894,30 @@ 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 = join8(workspace, entry.target);
+      if (!force && existsSync12(filePath)) {
         continue;
       }
-      const templatePath = join6(templateDir, entry.source);
-      if (!existsSync10(templatePath)) {
+      const templatePath = join8(templateDir, entry.source);
+      if (!existsSync12(templatePath)) {
         console.warn(`Warning: Template file missing: ${templatePath}`);
         continue;
       }
-      const raw = readFileSync9(templatePath, "utf-8");
+      const raw = readFileSync10(templatePath, "utf-8");
       const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME3);
-      mkdirSync6(dirname3(filePath), { recursive: true });
-      writeFileSync5(filePath, content);
+      mkdirSync7(dirname4(filePath), { recursive: true });
+      writeFileSync6(filePath, content);
       created.push(entry.target);
     }
-    const memoryDir = join6(workspace, "memory");
-    if (!existsSync10(memoryDir)) {
-      mkdirSync6(memoryDir, { recursive: true });
-      created.push(join6("memory", ""));
+    const memoryDir = join8(workspace, "memory");
+    if (!existsSync12(memoryDir)) {
+      mkdirSync7(memoryDir, { recursive: true });
+      created.push(join8("memory", ""));
     }
-    const skillsDir = join6(workspace, "skills");
-    if (!existsSync10(skillsDir)) {
-      mkdirSync6(skillsDir, { recursive: true });
-      created.push(join6("skills", ""));
+    const skillsDir = join8(workspace, "skills");
+    if (!existsSync12(skillsDir)) {
+      mkdirSync7(skillsDir, { recursive: true });
+      created.push(join8("skills", ""));
     }
     const seeded = this.seedBuiltinSkills(skillsDir, { force });
     if (seeded > 0) {
@@ -7520,12 +7936,12 @@ var WorkspaceManager = class {
       if (!entry.isDirectory()) {
         continue;
       }
-      const src = join6(sourceDir, entry.name);
-      if (!existsSync10(join6(src, "SKILL.md"))) {
+      const src = join8(sourceDir, entry.name);
+      if (!existsSync12(join8(src, "SKILL.md"))) {
         continue;
       }
-      const dest = join6(targetDir, entry.name);
-      if (!force && existsSync10(dest)) {
+      const dest = join8(targetDir, entry.name);
+      if (!force && existsSync12(dest)) {
         continue;
       }
       try {
@@ -7542,13 +7958,13 @@ var WorkspaceManager = class {
     try {
       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 pkgRoot = resolve11(dirname4(entry), "..");
+      const distSkills = join8(pkgRoot, "dist", "skills");
+      if (existsSync12(distSkills)) {
         return distSkills;
       }
-      const srcSkills = join6(pkgRoot, "src", "agent", "skills");
-      if (existsSync10(srcSkills)) {
+      const srcSkills = join8(pkgRoot, "src", "agent", "skills");
+      if (existsSync12(srcSkills)) {
         return srcSkills;
       }
       return null;
@@ -7563,17 +7979,17 @@ var WorkspaceManager = class {
     }
     const cliDir = resolve11(fileURLToPath3(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
-    const candidates = [join6(pkgRoot, "templates")];
+    const candidates = [join8(pkgRoot, "templates")];
     for (const candidate of candidates) {
-      if (existsSync10(candidate)) {
+      if (existsSync12(candidate)) {
         return candidate;
       }
     }
     return null;
   }
   getBridgeDir() {
-    const userBridge = join6(getDataDir7(), "bridge");
-    if (existsSync10(join6(userBridge, "dist", "index.js"))) {
+    const userBridge = join8(getDataDir8(), "bridge");
+    if (existsSync12(join8(userBridge, "dist", "index.js"))) {
       return userBridge;
     }
     if (!which("npm")) {
@@ -7582,12 +7998,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 = join8(pkgRoot, "bridge");
+    const srcBridge = join8(pkgRoot, "..", "..", "bridge");
     let source = null;
-    if (existsSync10(join6(pkgBridge, "package.json"))) {
+    if (existsSync12(join8(pkgBridge, "package.json"))) {
       source = pkgBridge;
-    } else if (existsSync10(join6(srcBridge, "package.json"))) {
+    } else if (existsSync12(join8(srcBridge, "package.json"))) {
       source = srcBridge;
     }
     if (!source) {
@@ -7595,8 +8011,8 @@ var WorkspaceManager = class {
       process.exit(1);
     }
     console.log(`${this.logo} Setting up bridge...`);
-    mkdirSync6(resolve11(userBridge, ".."), { recursive: true });
-    if (existsSync10(userBridge)) {
+    mkdirSync7(resolve11(userBridge, ".."), { recursive: true });
+    if (existsSync12(userBridge)) {
       rmSync5(userBridge, { recursive: true, force: true });
     }
     cpSync3(source, userBridge, {
@@ -7632,7 +8048,7 @@ function resolveSkillsInstallWorkdir(params) {
   if (params.explicitWorkdir) {
     return expandHome2(params.explicitWorkdir);
   }
-  return getWorkspacePath9(params.configuredWorkspace);
+  return getWorkspacePath10(params.configuredWorkspace);
 }
 var CliRuntime = class {
   logo;
@@ -7647,6 +8063,7 @@ var CliRuntime = class {
   pluginCommands;
   channelCommands;
   cronCommands;
+  remoteCommands;
   diagnosticsCommands;
   constructor(options = {}) {
     this.logo = options.logo ?? LOGO;
@@ -7668,6 +8085,7 @@ var CliRuntime = class {
       requestRestart: (params) => this.requestRestart(params)
     });
     this.cronCommands = new CronCommands();
+    this.remoteCommands = new RemoteCommands();
     this.diagnosticsCommands = new DiagnosticsCommands({ logo: this.logo });
     this.restartCoordinator = new RestartCoordinator({
       readServiceState,
@@ -7733,7 +8151,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 = resolve12(getDataDir8(), "run", "service.json");
+    const serviceStatePath = resolve12(getDataDir9(), "run", "service.json");
     const helperScript = [
       'const { spawnSync } = require("node:child_process");',
       'const { readFileSync } = require("node:fs");',
@@ -7861,18 +8279,18 @@ var CliRuntime = class {
     const source = options.source ?? "init";
     const prefix = options.auto ? "Auto init" : "Init";
     const force = Boolean(options.force);
-    const configPath = getConfigPath4();
+    const configPath = getConfigPath5();
     let createdConfig = false;
-    if (!existsSync11(configPath)) {
+    if (!existsSync13(configPath)) {
       const config3 = ConfigSchema2.parse({});
-      saveConfig7(config3);
+      saveConfig8(config3);
       createdConfig = true;
     }
-    const config2 = loadConfig9();
+    const config2 = loadConfig12();
     const workspaceSetting = config2.agents.defaults.workspace;
-    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join7(getDataDir8(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
-    const workspaceExisted = existsSync11(workspacePath);
-    mkdirSync7(workspacePath, { recursive: true });
+    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join9(getDataDir9(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
+    const workspaceExisted = existsSync13(workspacePath);
+    mkdirSync8(workspacePath, { recursive: true });
     const templateResult = this.workspaceManager.createWorkspaceTemplates(
       workspacePath,
       { force }
@@ -7903,8 +8321,8 @@ ${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 configPath = getConfigPath5();
+    const config2 = loadConfig12(configPath);
     const providers = config2.providers;
     const nextclawProvider = providers.nextclaw ?? {
       displayName: "",
@@ -7966,11 +8384,14 @@ ${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`);
   }
+  async remoteConnect(opts = {}) {
+    await this.remoteCommands.connect(opts);
+  }
   async gateway(opts) {
     const uiOverrides = {
       host: FORCED_PUBLIC_UI_HOST
@@ -8060,16 +8481,16 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.serviceCommands.stopService();
   }
   async agent(opts) {
-    const configPath = getConfigPath4();
-    const config2 = resolveConfigSecrets3(loadConfig9(), { configPath });
-    const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
+    const configPath = getConfigPath5();
+    const config2 = resolveConfigSecrets3(loadConfig12(), { 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(loadConfig12(), { configPath }),
         pluginChannelBindings
       ),
       writeConfigFile: async (nextConfigView) => {
@@ -8078,13 +8499,13 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
             "plugin runtime writeConfigFile expects an object config"
           );
         }
-        const current = loadConfig9();
+        const current = loadConfig12();
         const next = mergePluginConfigView(
           current,
           nextConfigView,
           pluginChannelBindings
         );
-        saveConfig7(next);
+        saveConfig8(next);
       }
     });
     try {
@@ -8110,7 +8531,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
           registry: pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets3(loadConfig9(), { configPath }),
+          cfg: resolveConfigSecrets3(loadConfig12(), { configPath }),
           accountId
         })
       });
@@ -8129,10 +8550,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 = join9(getDataDir9(), "history", "cli_history");
       const historyDir = resolve12(historyFile, "..");
-      mkdirSync7(historyDir, { recursive: true });
-      const history = existsSync11(historyFile) ? readFileSync10(historyFile, "utf-8").split("\n").filter(Boolean) : [];
+      mkdirSync8(historyDir, { recursive: true });
+      const history = existsSync13(historyFile) ? readFileSync11(historyFile, "utf-8").split("\n").filter(Boolean) : [];
       const rl = createInterface2({
         input: process.stdin,
         output: process.stdout
@@ -8141,7 +8562,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         const merged = history.concat(
           rl.history ?? []
         );
-        writeFileSync6(historyFile, merged.join("\n"));
+        writeFileSync7(historyFile, merged.join("\n"));
         process.exit(0);
       });
       let running = true;
@@ -8305,7 +8726,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const config2 = loadConfig9();
+    const config2 = loadConfig12();
     const workdir = resolveSkillsInstallWorkdir({
       explicitWorkdir: options.workdir,
       configuredWorkspace: config2.agents.defaults.workspace
@@ -8373,6 +8794,8 @@ program.name(APP_NAME5).description(`${LOGO} ${APP_NAME5} - ${APP_TAGLINE}`).ver
 program.command("onboard").description(`Initialize ${APP_NAME5} configuration and workspace`).action(async () => runtime.onboard());
 program.command("init").description(`Initialize ${APP_NAME5} configuration and workspace`).option("-f, --force", "Overwrite existing template files").action(async (opts) => runtime.init({ force: Boolean(opts.force) }));
 program.command("login").description("Login to NextClaw platform and save token into providers.nextclaw.apiKey").option("--api-base <url>", "Platform API base (supports /v1 suffix)").option("--email <email>", "Login email").option("--password <password>", "Login password").option("--register", "Register first, then login", false).action(async (opts) => runtime.login(opts));
+var remote = program.command("remote").description("Manage remote access");
+remote.command("connect").description("Register this machine as a remote device and keep the connector online").option("--api-base <url>", "Platform API base (supports /v1 suffix)").option("--local-origin <url>", "Local NextClaw UI origin (default: active service or http://127.0.0.1:18791)").option("--name <name>", "Device display name").option("--once", "Connect once without auto-reconnect", false).action(async (opts) => runtime.remoteConnect(opts));
 program.command("gateway").description(`Start the ${APP_NAME5} gateway`).option("-p, --port <port>", "Gateway port", "18790").option("-v, --verbose", "Verbose output", false).option("--ui", "Enable UI server", false).option("--ui-port <port>", "UI port").option("--ui-open", "Open browser when UI starts", false).action(async (opts) => runtime.gateway(opts));
 program.command("ui").description(`Start the ${APP_NAME5} UI with gateway`).option("--port <port>", "UI port").option("--no-open", "Disable opening browser").action(async (opts) => runtime.ui(opts));
 program.command("start").description(`Start the ${APP_NAME5} gateway + UI in the background`).option("--ui-port <port>", "UI port").option("--start-timeout <ms>", "Maximum wait time for startup readiness in milliseconds").option("--open", "Open browser after start", false).action(async (opts) => runtime.start(opts));