nextclaw 0.13.5 → 0.13.6

package/dist/cli/index.js

@@ -2,13 +2,14 @@
 
 // src/cli/index.ts
 import { Command } from "commander";
-import { APP_NAME as APP_NAME5, APP_TAGLINE } from "@nextclaw/core";
+import { APP_NAME as APP_NAME6, APP_TAGLINE } from "@nextclaw/core";
+import { registerRemoteCommands } from "@nextclaw/remote";
 
 // src/cli/runtime.ts
 import {
-  loadConfig as loadConfig13,
-  saveConfig as saveConfig9,
-  getConfigPath as getConfigPath6,
+  loadConfig as loadConfig14,
+  saveConfig as saveConfig10,
+  getConfigPath as getConfigPath7,
   getDataDir as getDataDir9,
   ConfigSchema as ConfigSchema2,
   getWorkspacePath as getWorkspacePath10,
@@ -17,17 +18,18 @@ import {
   AgentLoop,
   ProviderManager as ProviderManager2,
   resolveConfigSecrets as resolveConfigSecrets3,
-  APP_NAME as APP_NAME4,
+  APP_NAME as APP_NAME5,
   DEFAULT_WORKSPACE_DIR,
   DEFAULT_WORKSPACE_PATH
 } from "@nextclaw/core";
+import { RemoteRuntimeActions } from "@nextclaw/remote";
 import {
   getPluginChannelBindings as getPluginChannelBindings4,
   resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints2,
   setPluginRuntimeBridge as setPluginRuntimeBridge2
 } from "@nextclaw/openclaw-compat";
-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 { 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 createInterface3 } from "readline";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import { spawn as spawn3 } from "child_process";
@@ -74,9 +76,9 @@ var RestartCoordinator = class {
           message: "Restart already scheduled; skipping duplicate request."
         };
       }
-      const delay2 = typeof request.delayMs === "number" && Number.isFinite(request.delayMs) ? Math.max(0, Math.floor(request.delayMs)) : 100;
+      const delay = typeof request.delayMs === "number" && Number.isFinite(request.delayMs) ? Math.max(0, Math.floor(request.delayMs)) : 100;
       this.exitScheduled = true;
-      this.deps.scheduleProcessExit(delay2, reason);
+      this.deps.scheduleProcessExit(delay, reason);
       return {
         status: "exit-scheduled",
         message: `Restart scheduled (${reason}).`
@@ -822,6 +824,15 @@ function writeServiceState(state) {
   mkdirSync3(resolve4(path2, ".."), { recursive: true });
   writeFileSync3(path2, JSON.stringify(state, null, 2));
 }
+function updateServiceState(updater) {
+  const current = readServiceState();
+  if (!current) {
+    return null;
+  }
+  const next = updater(current);
+  writeServiceState(next);
+  return next;
+}
 function clearServiceState() {
   const path2 = resolveServiceStatePath();
   if (existsSync4(path2)) {
@@ -3025,285 +3036,311 @@ var PlatformAuthCommands = class {
 };
 
 // src/cli/commands/remote.ts
+import { getConfigPath as getConfigPath4, loadConfig as loadConfig9, saveConfig as saveConfig7 } from "@nextclaw/core";
+import "@nextclaw/remote";
+import { hostname } from "os";
+
+// src/cli/commands/remote-runtime-support.ts
 import { getConfigPath as getConfigPath3, getDataDir as getDataDir4, loadConfig as loadConfig8 } 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");
+import {
+  RemoteConnector,
+  RemotePlatformClient,
+  RemoteStatusStore,
+  buildConfiguredRemoteState,
+  resolveRemoteStatusSnapshot
+} from "@nextclaw/remote";
+function createNextclawRemotePlatformClient() {
+  return new RemotePlatformClient({
+    loadConfig: () => loadConfig8(getConfigPath3()),
+    getDataDir: getDataDir4,
+    getPackageVersion,
+    resolvePlatformBase: (rawApiBase) => resolvePlatformApiBase({
+      explicitApiBase: rawApiBase,
+      requireConfigured: true
+    }).platformBase,
+    readManagedServiceState: () => {
+      const state = readServiceState();
+      if (!state) {
+        return null;
+      }
+      return {
+        pid: state.pid,
+        uiPort: state.uiPort
+      };
+    },
+    isProcessRunning
+  });
 }
-function decodeBase64(base64) {
-  if (!base64) {
-    return new Uint8Array();
-  }
-  return new Uint8Array(Buffer.from(base64, "base64"));
+function createNextclawRemoteConnector(params = {}) {
+  return new RemoteConnector({
+    platformClient: createNextclawRemotePlatformClient(),
+    logger: params.logger
+  });
 }
-function delay(ms) {
-  return new Promise((resolveDelay) => setTimeout(resolveDelay, ms));
+function createNextclawRemoteStatusStore(mode) {
+  return new RemoteStatusStore(mode, {
+    writeRemoteState: (next) => {
+      updateServiceState((state) => ({
+        ...state,
+        remote: next
+      }));
+    }
+  });
 }
-function ensureDir(path2) {
-  mkdirSync4(path2, { recursive: true });
+function buildNextclawConfiguredRemoteState(config2) {
+  return buildConfiguredRemoteState(config2);
 }
-function readJsonFile2(path2) {
-  if (!existsSync6(path2)) {
-    return null;
-  }
-  try {
-    return JSON.parse(readFileSync6(path2, "utf-8"));
-  } catch {
-    return null;
-  }
+function readCurrentNextclawRemoteRuntimeState() {
+  return readServiceState()?.remote ?? null;
 }
-function writeJsonFile(path2, value) {
-  ensureDir(dirname2(path2));
-  writeFileSync4(path2, `${JSON.stringify(value, null, 2)}
-`, "utf-8");
+function resolveNextclawRemoteStatusSnapshot(config2) {
+  return resolveRemoteStatusSnapshot({
+    config: config2,
+    currentRemoteState: readCurrentNextclawRemoteRuntimeState()
+  });
 }
-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 = loadConfig8(getConfigPath3());
-    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 } = resolvePlatformApiBase({
-      explicitApiBase: rawApiBase,
-      requireConfigured: true
-    });
-    return { platformBase, token, config: config2 };
+
+// src/cli/commands/remote.ts
+function normalizeOptionalString3(value) {
+  if (typeof value !== "string") {
+    return void 0;
   }
-  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}`;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+function resolveConfiguredLocalOrigin(config2) {
+  const state = readServiceState();
+  if (state && isProcessRunning(state.pid) && Number.isFinite(state.uiPort)) {
+    return `http://127.0.0.1:${state.uiPort}`;
   }
-  async ensureLocalUiHealthy(localOrigin) {
+  const port = typeof config2.ui.port === "number" && Number.isFinite(config2.ui.port) ? config2.ui.port : 18791;
+  return `http://127.0.0.1:${port}`;
+}
+async function probeLocalUi(localOrigin) {
+  try {
     const response = await fetch(`${localOrigin}/api/health`);
     if (!response.ok) {
-      throw new Error(`Local UI is not healthy at ${localOrigin}. Start NextClaw first.`);
+      return { ok: false, detail: `health returned ${response.status}` };
     }
+    return { ok: true, detail: "health endpoint returned ok" };
+  } catch (error) {
+    return {
+      ok: false,
+      detail: error instanceof Error ? error.message : String(error)
+    };
   }
-  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;
+}
+var RemoteCommands = class {
+  enableConfig(opts = {}) {
+    const config2 = loadConfig9(getConfigPath4());
+    const next = {
+      ...config2,
+      remote: {
+        ...config2.remote,
+        enabled: true,
+        ...normalizeOptionalString3(opts.apiBase) ? { platformApiBase: normalizeOptionalString3(opts.apiBase) ?? "" } : {},
+        ...normalizeOptionalString3(opts.name) ? { deviceName: normalizeOptionalString3(opts.name) ?? "" } : {}
+      }
+    };
+    saveConfig7(next);
+    return {
+      changed: config2.remote.enabled !== next.remote.enabled || config2.remote.platformApiBase !== next.remote.platformApiBase || config2.remote.deviceName !== next.remote.deviceName,
+      config: next
+    };
   }
-  async requestBridgeCookie(localOrigin) {
-    const response = await fetch(`${localOrigin}/api/auth/bridge`, {
-      method: "POST",
-      headers: {
-        "x-nextclaw-ui-bridge-secret": ensureUiBridgeSecret()
+  disableConfig() {
+    const config2 = loadConfig9(getConfigPath4());
+    const next = {
+      ...config2,
+      remote: {
+        ...config2.remote,
+        enabled: false
       }
+    };
+    saveConfig7(next);
+    return {
+      changed: config2.remote.enabled !== next.remote.enabled,
+      config: next
+    };
+  }
+  async connect(opts = {}) {
+    const connector = createNextclawRemoteConnector();
+    await connector.run({
+      ...opts,
+      mode: "foreground"
     });
-    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);
+  }
+  async status(opts = {}) {
+    const config2 = loadConfig9(getConfigPath4());
+    const snapshot = resolveNextclawRemoteStatusSnapshot(config2);
+    if (opts.json) {
+      console.log(JSON.stringify(snapshot, null, 2));
+      return;
     }
-    if (bridgeCookie) {
-      headers.set("cookie", bridgeCookie);
+    const runtime2 = snapshot.runtime;
+    console.log("NextClaw Remote Status");
+    console.log(`Enabled: ${snapshot.configuredEnabled ? "yes" : "no"}`);
+    console.log(`Mode: ${runtime2?.mode ?? "service"}`);
+    console.log(`State: ${runtime2?.state ?? "disabled"}`);
+    console.log(`Device: ${runtime2?.deviceName ?? normalizeOptionalString3(config2.remote.deviceName) ?? hostname()}`);
+    console.log(
+      `Platform: ${runtime2?.platformBase ?? normalizeOptionalString3(config2.remote.platformApiBase) ?? normalizeOptionalString3(config2.providers.nextclaw?.apiBase) ?? "not set"}`
+    );
+    console.log(`Local origin: ${runtime2?.localOrigin ?? resolveConfiguredLocalOrigin(config2)}`);
+    if (runtime2?.deviceId) {
+      console.log(`Device ID: ${runtime2.deviceId}`);
     }
-    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;
+    if (runtime2?.lastConnectedAt) {
+      console.log(`Last connected: ${runtime2.lastConnectedAt}`);
+    }
+    if (runtime2?.lastError) {
+      console.log(`Last error: ${runtime2.lastError}`);
     }
-    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;
+  async doctor(opts = {}) {
+    const config2 = loadConfig9(getConfigPath4());
+    const snapshot = resolveNextclawRemoteStatusSnapshot(config2);
+    const localOrigin = resolveConfiguredLocalOrigin(config2);
+    const localUi = await probeLocalUi(localOrigin);
+    const token = normalizeOptionalString3(config2.providers.nextclaw?.apiKey);
+    const platformApiBase = normalizeOptionalString3(config2.remote.platformApiBase) ?? normalizeOptionalString3(config2.providers.nextclaw?.apiBase);
+    const checks = [
+      {
+        name: "remote-enabled",
+        ok: snapshot.configuredEnabled,
+        detail: snapshot.configuredEnabled ? "enabled in config" : "disabled in config"
+      },
+      {
+        name: "platform-token",
+        ok: Boolean(token),
+        detail: token ? "token configured" : 'run "nextclaw login" first'
+      },
+      {
+        name: "platform-api-base",
+        ok: Boolean(platformApiBase),
+        detail: platformApiBase ?? "set remote.platformApiBase or login with --api-base"
+      },
+      {
+        name: "local-ui",
+        ok: localUi.ok,
+        detail: `${localOrigin} (${localUi.detail})`
+      },
+      {
+        name: "service-runtime",
+        ok: snapshot.runtime?.state === "connected",
+        detail: snapshot.runtime ? snapshot.runtime.state : "no managed remote runtime detected"
       }
-      console.log("Remote connector disconnected. Reconnecting in 3s...");
-      await delay(3e3);
-    } while (!opts.once);
+    ];
+    if (opts.json) {
+      console.log(JSON.stringify({ generatedAt: (/* @__PURE__ */ new Date()).toISOString(), checks, snapshot }, null, 2));
+      return;
+    }
+    console.log("NextClaw Remote Doctor");
+    for (const check of checks) {
+      console.log(`${check.ok ? "\u2713" : "\u2717"} ${check.name}: ${check.detail}`);
+    }
   }
 };
 
 // src/cli/commands/diagnostics.ts
 import { createServer as createNetServer } from "net";
-import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
 import { resolve as resolve8 } from "path";
 import {
-  APP_NAME,
-  getConfigPath as getConfigPath4,
+  APP_NAME as APP_NAME2,
+  getConfigPath as getConfigPath5,
   getDataDir as getDataDir5,
   getWorkspacePath as getWorkspacePath4,
   hasSecretRef,
-  loadConfig as loadConfig9
+  loadConfig as loadConfig10
 } from "@nextclaw/core";
 import { listBuiltinProviders } from "@nextclaw/runtime";
+
+// src/cli/commands/diagnostics-render.ts
+import { APP_NAME } from "@nextclaw/core";
+function printStatusReport(params) {
+  const { logo, report, verbose } = params;
+  console.log(`${logo} ${APP_NAME} Status`);
+  console.log(`Level: ${report.level}`);
+  console.log(`Generated: ${report.generatedAt}`);
+  console.log("");
+  printProcessSection(report);
+  printEndpointSection(report);
+  printProviderSection(report);
+  printTextList("Fix actions", report.fixActions);
+  printTextList("Issues", report.issues);
+  printTextList("Recommendations", report.recommendations);
+  if (verbose && report.logTail.length > 0) {
+    console.log("");
+    console.log("Recent logs:");
+    for (const line of report.logTail) {
+      console.log(line);
+    }
+  }
+}
+function printProcessSection(report) {
+  const processLabel = report.process.running ? `running (PID ${report.process.pid})` : report.process.staleState ? "stale-state" : "stopped";
+  console.log(`Process: ${processLabel}`);
+  console.log(`State file: ${report.serviceStatePath} ${report.serviceStateExists ? "\u2713" : "\u2717"}`);
+  if (report.process.startedAt) {
+    console.log(`Started: ${report.process.startedAt}`);
+  }
+  console.log(`Managed health: ${report.health.managed.state} (${report.health.managed.detail})`);
+  if (!report.process.running) {
+    console.log(`Configured health: ${report.health.configured.state} (${report.health.configured.detail})`);
+  }
+}
+function printEndpointSection(report) {
+  console.log(`UI: ${report.endpoints.uiUrl ?? report.endpoints.configuredUiUrl}`);
+  console.log(`API: ${report.endpoints.apiUrl ?? report.endpoints.configuredApiUrl}`);
+  console.log(`Remote: ${report.remote.configuredEnabled ? "enabled" : "disabled"}${report.remote.runtime ? ` (${report.remote.runtime.state})` : ""}`);
+  if (report.remote.runtime?.deviceName) {
+    console.log(`Remote device: ${report.remote.runtime.deviceName}`);
+  }
+  if (report.remote.runtime?.platformBase) {
+    console.log(`Remote platform: ${report.remote.runtime.platformBase}`);
+  }
+  if (report.remote.runtime?.lastError) {
+    console.log(`Remote error: ${report.remote.runtime.lastError}`);
+  }
+  console.log(`Config: ${report.configPath} ${report.configExists ? "\u2713" : "\u2717"}`);
+  console.log(`Workspace: ${report.workspacePath} ${report.workspaceExists ? "\u2713" : "\u2717"}`);
+  console.log(`Model: ${report.model}`);
+}
+function printProviderSection(report) {
+  for (const provider of report.providers) {
+    console.log(`${provider.name}: ${provider.configured ? "\u2713" : "not set"}${provider.detail ? ` (${provider.detail})` : ""}`);
+  }
+}
+function printDoctorReport(params) {
+  console.log(`${params.logo} ${APP_NAME} Doctor`);
+  console.log(`Generated: ${params.generatedAt}`);
+  console.log("");
+  for (const check of params.checks) {
+    const icon = check.status === "pass" ? "\u2713" : check.status === "warn" ? "!" : "\u2717";
+    console.log(`${icon} ${check.name}: ${check.detail}`);
+  }
+  printTextList("Recommendations", params.recommendations);
+  if (params.verbose && params.logTail.length > 0) {
+    console.log("");
+    console.log("Recent logs:");
+    for (const line of params.logTail) {
+      console.log(line);
+    }
+  }
+}
+function printTextList(title, items) {
+  if (items.length === 0) {
+    return;
+  }
+  console.log("");
+  console.log(`${title}:`);
+  for (const item of items) {
+    console.log(`- ${item}`);
+  }
+}
+
+// src/cli/commands/diagnostics.ts
 var DiagnosticsCommands = class {
   constructor(deps) {
     this.deps = deps;
@@ -3318,56 +3355,7 @@ var DiagnosticsCommands = class {
       process.exitCode = 0;
       return;
     }
-    console.log(`${this.deps.logo} ${APP_NAME} Status`);
-    console.log(`Level: ${report.level}`);
-    console.log(`Generated: ${report.generatedAt}`);
-    console.log("");
-    const processLabel = report.process.running ? `running (PID ${report.process.pid})` : report.process.staleState ? "stale-state" : "stopped";
-    console.log(`Process: ${processLabel}`);
-    console.log(`State file: ${report.serviceStatePath} ${report.serviceStateExists ? "\u2713" : "\u2717"}`);
-    if (report.process.startedAt) {
-      console.log(`Started: ${report.process.startedAt}`);
-    }
-    console.log(`Managed health: ${report.health.managed.state} (${report.health.managed.detail})`);
-    if (!report.process.running) {
-      console.log(`Configured health: ${report.health.configured.state} (${report.health.configured.detail})`);
-    }
-    console.log(`UI: ${report.endpoints.uiUrl ?? report.endpoints.configuredUiUrl}`);
-    console.log(`API: ${report.endpoints.apiUrl ?? report.endpoints.configuredApiUrl}`);
-    console.log(`Config: ${report.configPath} ${report.configExists ? "\u2713" : "\u2717"}`);
-    console.log(`Workspace: ${report.workspacePath} ${report.workspaceExists ? "\u2713" : "\u2717"}`);
-    console.log(`Model: ${report.model}`);
-    for (const provider of report.providers) {
-      console.log(`${provider.name}: ${provider.configured ? "\u2713" : "not set"}${provider.detail ? ` (${provider.detail})` : ""}`);
-    }
-    if (report.fixActions.length > 0) {
-      console.log("");
-      console.log("Fix actions:");
-      for (const action of report.fixActions) {
-        console.log(`- ${action}`);
-      }
-    }
-    if (report.issues.length > 0) {
-      console.log("");
-      console.log("Issues:");
-      for (const issue of report.issues) {
-        console.log(`- ${issue}`);
-      }
-    }
-    if (report.recommendations.length > 0) {
-      console.log("");
-      console.log("Recommendations:");
-      for (const recommendation of report.recommendations) {
-        console.log(`- ${recommendation}`);
-      }
-    }
-    if (opts.verbose && report.logTail.length > 0) {
-      console.log("");
-      console.log("Recent logs:");
-      for (const line of report.logTail) {
-        console.log(line);
-      }
-    }
+    printStatusReport({ logo: this.deps.logo, report, verbose: Boolean(opts.verbose) });
     process.exitCode = 0;
   }
   async doctor(opts = {}) {
@@ -3438,32 +3426,19 @@ var DiagnosticsCommands = class {
       process.exitCode = exitCode;
       return;
     }
-    console.log(`${this.deps.logo} ${APP_NAME} Doctor`);
-    console.log(`Generated: ${report.generatedAt}`);
-    console.log("");
-    for (const check of checks) {
-      const icon = check.status === "pass" ? "\u2713" : check.status === "warn" ? "!" : "\u2717";
-      console.log(`${icon} ${check.name}: ${check.detail}`);
-    }
-    if (report.recommendations.length > 0) {
-      console.log("");
-      console.log("Recommendations:");
-      for (const recommendation of report.recommendations) {
-        console.log(`- ${recommendation}`);
-      }
-    }
-    if (opts.verbose && report.logTail.length > 0) {
-      console.log("");
-      console.log("Recent logs:");
-      for (const line of report.logTail) {
-        console.log(line);
-      }
-    }
+    printDoctorReport({
+      logo: this.deps.logo,
+      generatedAt: report.generatedAt,
+      checks,
+      recommendations: report.recommendations,
+      verbose: Boolean(opts.verbose),
+      logTail: report.logTail
+    });
     process.exitCode = exitCode;
   }
   async collectRuntimeStatus(params) {
-    const configPath = getConfigPath4();
-    const config2 = loadConfig9();
+    const configPath = getConfigPath5();
+    const config2 = loadConfig10();
     const workspacePath = getWorkspacePath4(config2.agents.defaults.workspace);
     const serviceStatePath = resolve8(getDataDir5(), "run", "service.json");
     const fixActions = [];
@@ -3483,72 +3458,36 @@ var DiagnosticsCommands = class {
     const managedApiUrl = serviceState?.apiUrl ?? null;
     const managedHealth = running && managedApiUrl ? await this.probeApiHealth(`${managedApiUrl}/health`) : { state: "unreachable", detail: "service not running" };
     const configuredHealth = await this.probeApiHealth(`${configuredApiUrl}/health`, 900);
+    const remote = resolveNextclawRemoteStatusSnapshot(config2);
     const orphanSuspected = !running && configuredHealth.state === "ok";
-    const providers = listBuiltinProviders().map((spec) => {
-      const provider = config2.providers[spec.name];
-      const apiKeyRefSet = hasSecretRef(config2, `providers.${spec.name}.apiKey`);
-      if (!provider) {
-        return { name: spec.displayName ?? spec.name, configured: false, detail: "missing config" };
-      }
-      if (spec.isLocal) {
-        return {
-          name: spec.displayName ?? spec.name,
-          configured: Boolean(provider.apiBase),
-          detail: provider.apiBase ? provider.apiBase : "apiBase not set"
-        };
-      }
-      return {
-        name: spec.displayName ?? spec.name,
-        configured: Boolean(provider.apiKey) || apiKeyRefSet,
-        detail: provider.apiKey ? "apiKey set" : apiKeyRefSet ? "apiKey ref set" : "apiKey not set"
-      };
-    });
+    const providers = this.listProviderStatuses(config2);
     const issues = [];
     const recommendations = [];
-    if (!existsSync7(configPath)) {
-      issues.push("Config file is missing.");
-      recommendations.push(`Run ${APP_NAME} init to create config files.`);
-    }
-    if (!existsSync7(workspacePath)) {
-      issues.push("Workspace directory does not exist.");
-      recommendations.push(`Run ${APP_NAME} init to create workspace templates.`);
-    }
-    if (staleState) {
-      issues.push("Service state is stale (state exists but process is not running).");
-      recommendations.push(`Run ${APP_NAME} status --fix to clean stale state.`);
-    }
-    if (running && managedHealth.state !== "ok") {
-      issues.push(`Managed service health check failed: ${managedHealth.detail}`);
-      recommendations.push(`Check logs at ${serviceState?.logPath ?? resolveServiceLogPath()}.`);
-    }
-    if (running && serviceState?.startupState === "degraded" && managedHealth.state !== "ok") {
-      const startupHint = serviceState.startupLastProbeError ? ` (${serviceState.startupLastProbeError})` : "";
-      issues.push(`Service is in degraded startup state${startupHint}.`);
-      recommendations.push(`Wait and re-check ${APP_NAME} status; if it does not recover, inspect logs and restart.`);
-    }
-    if (!running) {
-      recommendations.push(`Run ${APP_NAME} start to launch the service.`);
-    }
-    if (orphanSuspected) {
-      issues.push("A service appears healthy on configured API endpoint, but state is missing/stale.");
-      recommendations.push("Another process may be occupying the UI port; stop it or use --ui-port with a free port.");
-    }
-    if (!providers.some((provider) => provider.configured)) {
-      recommendations.push("Configure at least one provider API key in UI or config before expecting agent replies.");
-    }
+    this.collectRuntimeIssues({
+      configPath,
+      workspacePath,
+      staleState,
+      running,
+      managedHealth,
+      serviceState,
+      orphanSuspected,
+      providers,
+      issues,
+      recommendations
+    });
     const logTail = params.verbose ? this.readLogTail(serviceState?.logPath ?? resolveServiceLogPath(), 25) : [];
     const level = running ? managedHealth.state === "ok" ? issues.length > 0 ? "degraded" : "healthy" : "degraded" : "stopped";
     const exitCode = 0;
     return {
       generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
       configPath,
-      configExists: existsSync7(configPath),
+      configExists: existsSync6(configPath),
       workspacePath,
-      workspaceExists: existsSync7(workspacePath),
+      workspaceExists: existsSync6(workspacePath),
       model: config2.agents.defaults.model,
       providers,
       serviceStatePath,
-      serviceStateExists: existsSync7(serviceStatePath),
+      serviceStateExists: existsSync6(serviceStatePath),
       fixActions,
       process: {
         managedByState,
@@ -3571,6 +3510,7 @@ var DiagnosticsCommands = class {
       issues,
       recommendations,
       logTail,
+      remote,
       level,
       exitCode
     };
@@ -3597,12 +3537,66 @@ var DiagnosticsCommands = class {
       clearTimeout(timer);
     }
   }
+  listProviderStatuses(config2) {
+    return listBuiltinProviders().map((spec) => {
+      const provider = config2.providers[spec.name];
+      const apiKeyRefSet = hasSecretRef(config2, `providers.${spec.name}.apiKey`);
+      if (!provider) {
+        return { name: spec.displayName ?? spec.name, configured: false, detail: "missing config" };
+      }
+      if (spec.isLocal) {
+        return {
+          name: spec.displayName ?? spec.name,
+          configured: Boolean(provider.apiBase),
+          detail: provider.apiBase ? provider.apiBase : "apiBase not set"
+        };
+      }
+      return {
+        name: spec.displayName ?? spec.name,
+        configured: Boolean(provider.apiKey) || apiKeyRefSet,
+        detail: provider.apiKey ? "apiKey set" : apiKeyRefSet ? "apiKey ref set" : "apiKey not set"
+      };
+    });
+  }
+  collectRuntimeIssues(params) {
+    if (!existsSync6(params.configPath)) {
+      params.issues.push("Config file is missing.");
+      params.recommendations.push(`Run ${APP_NAME2} init to create config files.`);
+    }
+    if (!existsSync6(params.workspacePath)) {
+      params.issues.push("Workspace directory does not exist.");
+      params.recommendations.push(`Run ${APP_NAME2} init to create workspace templates.`);
+    }
+    if (params.staleState) {
+      params.issues.push("Service state is stale (state exists but process is not running).");
+      params.recommendations.push(`Run ${APP_NAME2} status --fix to clean stale state.`);
+    }
+    if (params.running && params.managedHealth.state !== "ok") {
+      params.issues.push(`Managed service health check failed: ${params.managedHealth.detail}`);
+      params.recommendations.push(`Check logs at ${params.serviceState?.logPath ?? resolveServiceLogPath()}.`);
+    }
+    if (params.running && params.serviceState?.startupState === "degraded" && params.managedHealth.state !== "ok") {
+      const startupHint = params.serviceState.startupLastProbeError ? ` (${params.serviceState.startupLastProbeError})` : "";
+      params.issues.push(`Service is in degraded startup state${startupHint}.`);
+      params.recommendations.push(`Wait and re-check ${APP_NAME2} status; if it does not recover, inspect logs and restart.`);
+    }
+    if (!params.running) {
+      params.recommendations.push(`Run ${APP_NAME2} start to launch the service.`);
+    }
+    if (params.orphanSuspected) {
+      params.issues.push("A service appears healthy on configured API endpoint, but state is missing/stale.");
+      params.recommendations.push("Another process may be occupying the UI port; stop it or use --ui-port with a free port.");
+    }
+    if (!params.providers.some((provider) => provider.configured)) {
+      params.recommendations.push("Configure at least one provider API key in UI or config before expecting agent replies.");
+    }
+  }
   readLogTail(path2, maxLines = 25) {
-    if (!existsSync7(path2)) {
+    if (!existsSync6(path2)) {
       return [];
     }
     try {
-      const lines = readFileSync7(path2, "utf-8").split(/\r?\n/).filter(Boolean);
+      const lines = readFileSync6(path2, "utf-8").split(/\r?\n/).filter(Boolean);
       if (lines.length <= maxLines) {
         return lines;
       }
@@ -3642,8 +3636,8 @@ import {
   stopPluginChannelGateways as stopPluginChannelGateways2
 } from "@nextclaw/openclaw-compat";
 import { startUiServer } from "@nextclaw/server";
-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 { 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";
@@ -3652,7 +3646,7 @@ import chokidar from "chokidar";
 
 // src/cli/gateway/controller.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
 import {
   buildConfigSchema,
   ConfigSchema,
@@ -3660,12 +3654,12 @@ import {
   redactConfigObject
 } from "@nextclaw/core";
 var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
-var readConfigSnapshot = (getConfigPath7) => {
-  const path2 = getConfigPath7();
+var readConfigSnapshot = (getConfigPath8) => {
+  const path2 = getConfigPath8();
   let raw = "";
   let parsed = {};
-  if (existsSync8(path2)) {
-    raw = readFileSync8(path2, "utf-8");
+  if (existsSync7(path2)) {
+    raw = readFileSync7(path2, "utf-8");
     try {
       parsed = JSON.parse(raw);
     } catch {
@@ -3772,11 +3766,11 @@ var GatewayControllerImpl = class {
       await this.deps.requestRestart(options);
       return;
     }
-    const delay2 = typeof options?.delayMs === "number" && Number.isFinite(options.delayMs) ? Math.max(0, options.delayMs) : 100;
+    const delay = 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);
-    }, delay2);
+    }, delay);
   }
   status() {
     return {
@@ -4122,9 +4116,9 @@ var MissingProvider = class extends LLMProvider {
 };
 
 // src/cli/commands/service-marketplace-installer.ts
-import { getWorkspacePath as getWorkspacePath5, loadConfig as loadConfig11 } from "@nextclaw/core";
-import { existsSync as existsSync9, rmSync as rmSync4 } from "fs";
-import { join as join5 } from "path";
+import { getWorkspacePath as getWorkspacePath5, loadConfig as loadConfig12 } 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) => {
@@ -4172,7 +4166,7 @@ var buildMarketplaceSkillInstallArgs = (params) => {
 };
 
 // src/cli/commands/service-mcp-marketplace-ops.ts
-import { loadConfig as loadConfig10, saveConfig as saveConfig7 } from "@nextclaw/core";
+import { loadConfig as loadConfig11, saveConfig as saveConfig8 } from "@nextclaw/core";
 import { McpDoctorFacade as McpDoctorFacade2, McpMutationService as McpMutationService2 } from "@nextclaw/mcp";
 var ServiceMcpMarketplaceOps = class {
   constructor(options) {
@@ -4240,13 +4234,13 @@ var ServiceMcpMarketplaceOps = class {
   }
   createMutationService() {
     return new McpMutationService2({
-      getConfig: () => loadConfig10(),
-      saveConfig: (config2) => saveConfig7(config2)
+      getConfig: () => loadConfig11(),
+      saveConfig: (config2) => saveConfig8(config2)
     });
   }
   createDoctorFacade() {
     return new McpDoctorFacade2({
-      getConfig: () => loadConfig10()
+      getConfig: () => loadConfig11()
     });
   }
 };
@@ -4287,7 +4281,7 @@ var ServiceMarketplaceInstaller = class {
     if (params.kind && params.kind !== "marketplace") {
       throw new Error(`Unsupported marketplace skill kind: ${params.kind}`);
     }
-    const workspace = getWorkspacePath5(loadConfig11().agents.defaults.workspace);
+    const workspace = getWorkspacePath5(loadConfig12().agents.defaults.workspace);
     const args = buildMarketplaceSkillInstallArgs({
       slug: params.slug,
       workspace,
@@ -4326,9 +4320,9 @@ var ServiceMarketplaceInstaller = class {
     return { message: result.message };
   }
   async uninstallSkill(slug) {
-    const workspace = getWorkspacePath5(loadConfig11().agents.defaults.workspace);
-    const targetDir = join5(workspace, "skills", slug);
-    if (!existsSync9(targetDir)) {
+    const workspace = getWorkspacePath5(loadConfig12().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 });
@@ -4453,6 +4447,35 @@ async function reloadServicePlugins(params) {
   };
 }
 
+// src/cli/commands/service-startup-support.ts
+var pluginGatewayLogger = {
+  info: (message) => console.log(`[plugins] ${message}`),
+  warn: (message) => console.warn(`[plugins] ${message}`),
+  error: (message) => console.error(`[plugins] ${message}`),
+  debug: (message) => console.debug(`[plugins] ${message}`)
+};
+function logPluginGatewayDiagnostics(diagnostics) {
+  for (const diag of diagnostics) {
+    const prefix = diag.pluginId ? `${diag.pluginId}: ` : "";
+    const text = `${prefix}${diag.message}`;
+    if (diag.level === "error") {
+      console.error(`[plugins] ${text}`);
+    } else {
+      console.warn(`[plugins] ${text}`);
+    }
+  }
+}
+async function startGatewaySupportServices(params) {
+  if (params.cronJobs > 0) {
+    console.log(`\u2713 Cron: ${params.cronJobs} scheduled jobs`);
+  }
+  console.log("\u2713 Heartbeat: every 30m");
+  params.remoteModule?.start();
+  params.watchConfigFile();
+  await params.startCron();
+  await params.startHeartbeat();
+}
+
 // src/cli/commands/agent-runtime-pool.ts
 import {
   NativeAgentEngine,
@@ -5432,7 +5455,7 @@ function resolveRequestedToolNames(metadata) {
     )
   );
 }
-function normalizeOptionalString3(value) {
+function normalizeOptionalString4(value) {
   return normalizeString(value) ?? void 0;
 }
 function readMetadataModel(metadata) {
@@ -5552,7 +5575,7 @@ var NextclawNcpContextBuilder = class {
     if (inboundModel) {
       session.metadata.preferred_model = inboundModel;
     }
-    const effectiveModel = normalizeOptionalString3(session.metadata.preferred_model) ?? profile.model;
+    const effectiveModel = normalizeOptionalString4(session.metadata.preferred_model) ?? profile.model;
     const clearThinking = requestMetadata.clear_thinking === true || requestMetadata.reset_thinking === true;
     if (clearThinking) {
       delete session.metadata.preferred_thinking;
@@ -5569,8 +5592,8 @@ var NextclawNcpContextBuilder = class {
       model: effectiveModel,
       sessionThinkingLevel: parseThinkingLevel(session.metadata.preferred_thinking) ?? null
     });
-    const channel = normalizeOptionalString3(requestMetadata.channel) ?? normalizeOptionalString3(session.metadata.last_channel) ?? "ui";
-    const chatId = normalizeOptionalString3(requestMetadata.chatId) ?? normalizeOptionalString3(requestMetadata.chat_id) ?? normalizeOptionalString3(session.metadata.last_to) ?? "web-ui";
+    const channel = normalizeOptionalString4(requestMetadata.channel) ?? normalizeOptionalString4(session.metadata.last_channel) ?? "ui";
+    const chatId = normalizeOptionalString4(requestMetadata.chatId) ?? normalizeOptionalString4(requestMetadata.chat_id) ?? normalizeOptionalString4(session.metadata.last_to) ?? "web-ui";
     session.metadata.last_channel = channel;
     session.metadata.last_to = chatId;
     const requestedSkillNames = resolveRequestedSkillNames(requestMetadata);
@@ -6288,15 +6311,68 @@ async function createUiNcpAgent(params) {
   };
 }
 
+// src/cli/commands/service-remote-runtime.ts
+import { RemoteServiceModule } from "@nextclaw/remote";
+function createManagedRemoteModule(params) {
+  if (!params.config.ui.enabled) {
+    return null;
+  }
+  return new RemoteServiceModule({
+    config: params.config,
+    localOrigin: params.localOrigin,
+    statusStore: createNextclawRemoteStatusStore("service"),
+    createConnector: (logger) => createNextclawRemoteConnector({ logger }),
+    logger: {
+      info: (message) => console.log(`[remote] ${message}`),
+      warn: (message) => console.warn(`[remote] ${message}`),
+      error: (message) => console.error(`[remote] ${message}`)
+    }
+  });
+}
+function writeInitialManagedServiceState(params) {
+  writeServiceState({
+    pid: params.snapshot.pid,
+    startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    uiUrl: params.snapshot.uiUrl,
+    apiUrl: params.snapshot.apiUrl,
+    uiHost: params.snapshot.uiHost,
+    uiPort: params.snapshot.uiPort,
+    logPath: params.snapshot.logPath,
+    startupLastProbeError: null,
+    startupTimeoutMs: params.readinessTimeoutMs,
+    startupCheckedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    ...params.config.remote.enabled ? { remote: buildNextclawConfiguredRemoteState(params.config) } : {}
+  });
+}
+function writeReadyManagedServiceState(params) {
+  const currentState = readServiceState();
+  const state = {
+    pid: params.snapshot.pid,
+    startedAt: currentState?.startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+    uiUrl: params.snapshot.uiUrl,
+    apiUrl: params.snapshot.apiUrl,
+    uiHost: params.snapshot.uiHost,
+    uiPort: params.snapshot.uiPort,
+    logPath: params.snapshot.logPath,
+    startupState: params.readiness.ready ? "ready" : "degraded",
+    startupLastProbeError: params.readiness.lastProbeError,
+    startupTimeoutMs: params.readinessTimeoutMs,
+    startupCheckedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    ...currentState?.remote ? { remote: currentState.remote } : {}
+  };
+  writeServiceState(state);
+  return state;
+}
+
 // src/cli/commands/ui-chat-run-coordinator.ts
-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 { 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 getDataDir6,
   parseAgentScopedSessionKey as parseAgentScopedSessionKey2,
   safeFilename
 } from "@nextclaw/core";
-var RUNS_DIR = join6(getDataDir6(), "runs");
+var RUNS_DIR = join5(getDataDir6(), "runs");
 var NON_TERMINAL_STATES = /* @__PURE__ */ new Set(["queued", "running"]);
 var DEFAULT_SESSION_TYPE = "native";
 var SESSION_TYPE_METADATA_KEY = "session_type";
@@ -6355,7 +6431,7 @@ function hasToolSessionEvent(run) {
 var UiChatRunCoordinator = class {
   constructor(options) {
     this.options = options;
-    mkdirSync5(RUNS_DIR, { recursive: true });
+    mkdirSync4(RUNS_DIR, { recursive: true });
     this.loadPersistedRuns();
   }
   runs = /* @__PURE__ */ new Map();
@@ -6822,7 +6898,7 @@ var UiChatRunCoordinator = class {
     };
   }
   getRunPath(runId) {
-    return join6(RUNS_DIR, `${safeFilename(runId)}.json`);
+    return join5(RUNS_DIR, `${safeFilename(runId)}.json`);
   }
   persistRun(run) {
     const persisted = {
@@ -6840,20 +6916,20 @@ var UiChatRunCoordinator = class {
       ...typeof run.reply === "string" ? { reply: run.reply } : {},
       events: run.events
     };
-    writeFileSync5(this.getRunPath(run.runId), `${JSON.stringify(persisted, null, 2)}
+    writeFileSync4(this.getRunPath(run.runId), `${JSON.stringify(persisted, null, 2)}
 `);
   }
   loadPersistedRuns() {
-    if (!existsSync10(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 = join6(RUNS_DIR, entry.name);
+      const path2 = join5(RUNS_DIR, entry.name);
       try {
-        const parsed = JSON.parse(readFileSync9(path2, "utf-8"));
+        const parsed = JSON.parse(readFileSync8(path2, "utf-8"));
         const runId = readOptionalString(parsed.runId);
         const sessionKey = readOptionalString(parsed.sessionKey);
         if (!runId || !sessionKey) {
@@ -6908,22 +6984,22 @@ var UiChatRunCoordinator = class {
 
 // src/cli/commands/service.ts
 var {
-  APP_NAME: APP_NAME2,
+  APP_NAME: APP_NAME3,
   ChannelManager: ChannelManager2,
   CronService: CronService2,
   getApiBase,
-  getConfigPath: getConfigPath5,
+  getConfigPath: getConfigPath6,
   getDataDir: getDataDir7,
   getProvider,
   getProviderName,
   getWorkspacePath: getWorkspacePath9,
   HeartbeatService,
   LiteLLMProvider,
-  loadConfig: loadConfig12,
+  loadConfig: loadConfig13,
   MessageBus,
   ProviderManager,
   resolveConfigSecrets: resolveConfigSecrets2,
-  saveConfig: saveConfig8,
+  saveConfig: saveConfig9,
   SessionManager,
   parseAgentScopedSessionKey: parseAgentScopedSessionKey3
 } = NextclawCore;
@@ -6943,8 +7019,8 @@ var ServiceCommands = class {
   async startGateway(options = {}) {
     this.applyLiveConfigReload = null;
     this.liveUiNcpAgent = null;
-    const runtimeConfigPath = getConfigPath5();
-    const config2 = resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath });
+    const runtimeConfigPath = getConfigPath6();
+    const config2 = resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath });
     const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
     let pluginRegistry = loadPluginRegistry(config2, workspace);
     let extensionRegistry = toExtensionRegistry(pluginRegistry);
@@ -6957,27 +7033,11 @@ var ServiceCommands = class {
     });
     const sessionManager = new SessionManager(workspace);
     let pluginGatewayHandles = [];
-    const pluginGatewayLogger = {
-      info: (message) => console.log(`[plugins] ${message}`),
-      warn: (message) => console.warn(`[plugins] ${message}`),
-      error: (message) => console.error(`[plugins] ${message}`),
-      debug: (message) => console.debug(`[plugins] ${message}`)
-    };
-    const logPluginGatewayDiagnostics = (diagnostics) => {
-      for (const diag of diagnostics) {
-        const prefix = diag.pluginId ? `${diag.pluginId}: ` : "";
-        const text = `${prefix}${diag.message}`;
-        if (diag.level === "error") {
-          console.error(`[plugins] ${text}`);
-        } else {
-          console.warn(`[plugins] ${text}`);
-        }
-      }
-    };
-    const cronStorePath = join7(getDataDir7(), "cron", "jobs.json");
+    const cronStorePath = join6(getDataDir7(), "cron", "jobs.json");
     const cron2 = new CronService2(cronStorePath);
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiStaticDir = options.uiStaticDir === void 0 ? resolveUiStaticDir() : options.uiStaticDir;
+    const localOrigin = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (!provider) {
       console.warn("Warning: No API key configured. The gateway is running, but agent replies are disabled until provider config is set.");
     }
@@ -6989,7 +7049,7 @@ var ServiceCommands = class {
       sessionManager,
       providerManager,
       makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }) ?? this.makeMissingProvider(nextConfig),
-      loadConfig: () => resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }),
+      loadConfig: () => resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }),
       getExtensionChannels: () => extensionRegistry.channels,
       onRestartRequired: (paths) => {
         void this.deps.requestRestart({
@@ -7000,14 +7060,14 @@ var ServiceCommands = class {
       }
     });
     this.applyLiveConfigReload = async () => {
-      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }));
+      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }));
     };
     const gatewayController = new GatewayControllerImpl({
       reloader,
       cron: cron2,
       sessionManager,
-      getConfigPath: getConfigPath5,
-      saveConfig: saveConfig8,
+      getConfigPath: getConfigPath6,
+      saveConfig: saveConfig9,
       requestRestart: async (options2) => {
         await this.deps.requestRestart({
           reason: options2?.reason ?? "gateway tool restart",
@@ -7033,7 +7093,7 @@ var ServiceCommands = class {
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }),
         accountId
       })
     });
@@ -7066,14 +7126,14 @@ var ServiceCommands = class {
     });
     let pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
     setPluginRuntimeBridge({
-      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }), pluginChannelBindings),
+      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig13(), { 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 = loadConfig12();
+        const current = loadConfig13();
         const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
-        saveConfig8(next);
+        saveConfig9(next);
       },
       dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
         const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
@@ -7147,23 +7207,23 @@ var ServiceCommands = class {
       providerManager,
       bus,
       gatewayController,
-      () => resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }),
+      () => resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }),
       () => extensionRegistry,
       ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }),
         accountId
       })
     );
-    const cronStatus = cron2.status();
-    if (cronStatus.jobs > 0) {
-      console.log(`\u2713 Cron: ${cronStatus.jobs} scheduled jobs`);
-    }
-    console.log("\u2713 Heartbeat: every 30m");
-    this.watchConfigFile(reloader);
-    await cron2.start();
-    await heartbeat.start();
+    const remoteModule = createManagedRemoteModule({ config: config2, localOrigin });
+    await startGatewaySupportServices({
+      cronJobs: cron2.status().jobs,
+      remoteModule,
+      watchConfigFile: () => this.watchConfigFile(reloader),
+      startCron: () => cron2.start(),
+      startHeartbeat: () => heartbeat.start()
+    });
     try {
       const startedPluginGateways = await startPluginChannelGateways2({
         registry: pluginRegistry,
@@ -7177,6 +7237,7 @@ var ServiceCommands = class {
     } finally {
       this.applyLiveConfigReload = null;
       this.liveUiNcpAgent = null;
+      await remoteModule?.stop();
       await stopPluginChannelGateways2(pluginGatewayHandles);
       setPluginRuntimeBridge(null);
     }
@@ -7189,7 +7250,7 @@ var ServiceCommands = class {
     return trimmed || void 0;
   }
   watchConfigFile(reloader) {
-    const configPath = resolve10(getConfigPath5());
+    const configPath = resolve10(getConfigPath6());
     const watcher = chokidar.watch(configPath, {
       ignoreInitial: true,
       awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 50 }
@@ -7310,7 +7371,7 @@ var ServiceCommands = class {
     });
   }
   async runForeground(options) {
-    const config2 = loadConfig12();
+    const config2 = loadConfig13();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (options.open) {
@@ -7323,14 +7384,14 @@ var ServiceCommands = class {
     });
   }
   async startService(options) {
-    const config2 = loadConfig12();
+    const config2 = loadConfig13();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     const apiUrl = `${uiUrl}/api`;
     const staticDir = resolveUiStaticDir();
     const existing = readServiceState();
     if (existing && isProcessRunning(existing.pid)) {
-      console.log(`\u2713 ${APP_NAME2} is already running (PID ${existing.pid})`);
+      console.log(`\u2713 ${APP_NAME3} is already running (PID ${existing.pid})`);
       console.log(`UI: ${existing.uiUrl}`);
       console.log(`API: ${existing.apiUrl}`);
       const parsedUi = (() => {
@@ -7378,13 +7439,13 @@ var ServiceCommands = class {
       healthUrl
     });
     if (!portPreflight.ok) {
-      console.error(`Error: Cannot start ${APP_NAME2} because UI port ${uiConfig.port} is already occupied.`);
+      console.error(`Error: Cannot start ${APP_NAME3} because UI port ${uiConfig.port} is already occupied.`);
       console.error(portPreflight.message);
       return;
     }
     const logPath = resolveServiceLogPath();
     const logDir = resolve10(logPath, "..");
-    mkdirSync6(logDir, { recursive: true });
+    mkdirSync5(logDir, { recursive: true });
     const logFd = openSync(logPath, "a");
     const readinessTimeoutMs = this.resolveStartupTimeoutMs(options.startupTimeoutMs);
     const quickPhaseTimeoutMs = Math.min(8e3, readinessTimeoutMs);
@@ -7393,10 +7454,8 @@ var ServiceCommands = class {
       logPath,
       `start requested: ui=${uiConfig.host}:${uiConfig.port}, readinessTimeoutMs=${readinessTimeoutMs}`
     );
-    console.log(`Starting ${APP_NAME2} background service (readiness timeout ${Math.ceil(readinessTimeoutMs / 1e3)}s)...`);
-    const serveArgs = buildServeArgs({
-      uiPort: uiConfig.port
-    });
+    console.log(`Starting ${APP_NAME3} background service (readiness timeout ${Math.ceil(readinessTimeoutMs / 1e3)}s)...`);
+    const serveArgs = buildServeArgs({ uiPort: uiConfig.port });
     this.appendStartupStage(logPath, `spawning background process: ${process.execPath} ${[...process.execArgv, ...serveArgs].join(" ")}`);
     const child = spawn2(process.execPath, [...process.execArgv, ...serveArgs], {
       env: process.env,
@@ -7417,6 +7476,11 @@ var ServiceCommands = class {
       });
       return;
     }
+    writeInitialManagedServiceState({
+      config: config2,
+      readinessTimeoutMs,
+      snapshot: { pid: child.pid, uiUrl, apiUrl, uiHost: uiConfig.host, uiPort: uiConfig.port, logPath }
+    });
     this.appendStartupStage(logPath, `health probe started: ${healthUrl} (phase=quick, timeoutMs=${quickPhaseTimeoutMs})`);
     let readiness = await this.waitForBackgroundServiceReady({
       pid: child.pid,
@@ -7458,28 +7522,19 @@ var ServiceCommands = class {
       );
     }
     child.unref();
-    const state = {
-      pid: child.pid,
-      startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      uiUrl,
-      apiUrl,
-      uiHost: uiConfig.host,
-      uiPort: uiConfig.port,
-      logPath,
-      startupState: readiness.ready ? "ready" : "degraded",
-      startupLastProbeError: readiness.lastProbeError,
-      startupTimeoutMs: readinessTimeoutMs,
-      startupCheckedAt: (/* @__PURE__ */ new Date()).toISOString()
-    };
-    writeServiceState(state);
+    const state = writeReadyManagedServiceState({
+      readinessTimeoutMs,
+      readiness,
+      snapshot: { pid: child.pid, uiUrl, apiUrl, uiHost: uiConfig.host, uiPort: uiConfig.port, logPath }
+    });
     if (!readiness.ready) {
       const hint = readiness.lastProbeError ? ` Last probe error: ${readiness.lastProbeError}` : "";
       console.warn(
-        `Warning: ${APP_NAME2} is running (PID ${state.pid}) but not healthy yet after ${Math.ceil(readinessTimeoutMs / 1e3)}s. Marked as degraded.${hint}`
+        `Warning: ${APP_NAME3} is running (PID ${state.pid}) but not healthy yet after ${Math.ceil(readinessTimeoutMs / 1e3)}s. Marked as degraded.${hint}`
       );
-      console.warn(`Tip: Run "${APP_NAME2} status --json" and check logs: ${logPath}`);
+      console.warn(`Tip: Run "${APP_NAME3} status --json" and check logs: ${logPath}`);
     } else {
-      console.log(`\u2713 ${APP_NAME2} started in background (PID ${state.pid})`);
+      console.log(`\u2713 ${APP_NAME3} started in background (PID ${state.pid})`);
     }
     console.log(`UI: ${uiUrl}`);
     console.log(`API: ${apiUrl}`);
@@ -7501,7 +7556,7 @@ var ServiceCommands = class {
       clearServiceState();
       return;
     }
-    console.log(`Stopping ${APP_NAME2} (PID ${state.pid})...`);
+    console.log(`Stopping ${APP_NAME3} (PID ${state.pid})...`);
     try {
       process.kill(state.pid, "SIGTERM");
     } catch (error) {
@@ -7519,7 +7574,7 @@ var ServiceCommands = class {
       await waitForExit(state.pid, 2e3);
     }
     clearServiceState();
-    console.log(`\u2713 ${APP_NAME2} stopped`);
+    console.log(`\u2713 ${APP_NAME3} stopped`);
   }
   async waitForBackgroundServiceReady(params) {
     const startedAt = Date.now();
@@ -7737,7 +7792,7 @@ var ServiceCommands = class {
         return null;
       }
       console.error("Error: No API key configured.");
-      console.error(`Set one in ${getConfigPath5()} under providers section`);
+      console.error(`Set one in ${getConfigPath6()} under providers section`);
       process.exit(1);
     }
     return new LiteLLMProvider({
@@ -7774,8 +7829,8 @@ var ServiceCommands = class {
   }
   printServiceControlHints() {
     console.log("Service controls:");
-    console.log(`  - Check status: ${APP_NAME2} status`);
-    console.log(`  - If you need to stop the service, run: ${APP_NAME2} stop`);
+    console.log(`  - Check status: ${APP_NAME3} status`);
+    console.log(`  - If you need to stop the service, run: ${APP_NAME3} stop`);
   }
   async startUiIfEnabled(uiConfig, uiStaticDir, cronService, runtimePool, sessionManager, providerManager, bus, gatewayController, getConfig, getExtensionRegistry, resolveMessageToolHints) {
     if (!uiConfig.enabled) {
@@ -7864,7 +7919,7 @@ var ServiceCommands = class {
     const uiServer = startUiServer({
       host: uiConfig.host,
       port: uiConfig.port,
-      configPath: getConfigPath5(),
+      configPath: getConfigPath6(),
       productVersion: getPackageVersion(),
       staticDir: uiStaticDir ?? void 0,
       cronService,
@@ -7952,10 +8007,10 @@ var ServiceCommands = class {
     }
   }
   installBuiltinMarketplaceSkill(slug, force) {
-    const workspace = getWorkspacePath9(loadConfig12().agents.defaults.workspace);
-    const destination = join7(workspace, "skills", slug);
-    const destinationSkillFile = join7(destination, "SKILL.md");
-    if (existsSync11(destinationSkillFile) && !force) {
+    const workspace = getWorkspacePath9(loadConfig13().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`
       };
@@ -7963,15 +8018,15 @@ var ServiceCommands = class {
     const loader = createSkillsLoader(workspace);
     const builtin = (loader?.listSkills(false) ?? []).find((skill) => skill.name === slug && skill.source === "builtin");
     if (!builtin) {
-      if (existsSync11(destinationSkillFile)) {
+      if (existsSync10(destinationSkillFile)) {
         return {
           message: `${slug} is already installed`
         };
       }
       return null;
     }
-    mkdirSync6(join7(workspace, "skills"), { recursive: true });
-    cpSync2(dirname3(builtin.path), destination, { recursive: true, force: true });
+    mkdirSync5(join6(workspace, "skills"), { recursive: true });
+    cpSync2(dirname2(builtin.path), destination, { recursive: true, force: true });
     return {
       message: `Installed skill: ${slug}`
     };
@@ -8030,11 +8085,11 @@ ${stderr}`.trim();
 };
 
 // src/cli/workspace.ts
-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 { 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 dirname4, join as join8, resolve as resolve11 } from "path";
+import { dirname as dirname3, join as join7, resolve as resolve11 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
-import { APP_NAME as APP_NAME3, getDataDir as getDataDir8 } from "@nextclaw/core";
+import { APP_NAME as APP_NAME4, getDataDir as getDataDir8 } from "@nextclaw/core";
 import { spawnSync as spawnSync3 } from "child_process";
 var WorkspaceManager = class {
   constructor(logo) {
@@ -8062,30 +8117,30 @@ var WorkspaceManager = class {
       { source: "memory/MEMORY.md", target: "memory/MEMORY.md" }
     ];
     for (const entry of templateFiles) {
-      const filePath = join8(workspace, entry.target);
-      if (!force && existsSync12(filePath)) {
+      const filePath = join7(workspace, entry.target);
+      if (!force && existsSync11(filePath)) {
         continue;
       }
-      const templatePath = join8(templateDir, entry.source);
-      if (!existsSync12(templatePath)) {
+      const templatePath = join7(templateDir, entry.source);
+      if (!existsSync11(templatePath)) {
         console.warn(`Warning: Template file missing: ${templatePath}`);
         continue;
       }
-      const raw = readFileSync10(templatePath, "utf-8");
-      const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME3);
-      mkdirSync7(dirname4(filePath), { recursive: true });
-      writeFileSync6(filePath, content);
+      const raw = readFileSync9(templatePath, "utf-8");
+      const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME4);
+      mkdirSync6(dirname3(filePath), { recursive: true });
+      writeFileSync5(filePath, content);
       created.push(entry.target);
     }
-    const memoryDir = join8(workspace, "memory");
-    if (!existsSync12(memoryDir)) {
-      mkdirSync7(memoryDir, { recursive: true });
-      created.push(join8("memory", ""));
+    const memoryDir = join7(workspace, "memory");
+    if (!existsSync11(memoryDir)) {
+      mkdirSync6(memoryDir, { recursive: true });
+      created.push(join7("memory", ""));
     }
-    const skillsDir = join8(workspace, "skills");
-    if (!existsSync12(skillsDir)) {
-      mkdirSync7(skillsDir, { recursive: true });
-      created.push(join8("skills", ""));
+    const skillsDir = join7(workspace, "skills");
+    if (!existsSync11(skillsDir)) {
+      mkdirSync6(skillsDir, { recursive: true });
+      created.push(join7("skills", ""));
     }
     const seeded = this.seedBuiltinSkills(skillsDir, { force });
     if (seeded > 0) {
@@ -8104,12 +8159,12 @@ var WorkspaceManager = class {
       if (!entry.isDirectory()) {
         continue;
       }
-      const src = join8(sourceDir, entry.name);
-      if (!existsSync12(join8(src, "SKILL.md"))) {
+      const src = join7(sourceDir, entry.name);
+      if (!existsSync11(join7(src, "SKILL.md"))) {
         continue;
       }
-      const dest = join8(targetDir, entry.name);
-      if (!force && existsSync12(dest)) {
+      const dest = join7(targetDir, entry.name);
+      if (!force && existsSync11(dest)) {
         continue;
       }
       try {
@@ -8126,13 +8181,13 @@ var WorkspaceManager = class {
     try {
       const require3 = createRequire2(import.meta.url);
       const entry = require3.resolve("@nextclaw/core");
-      const pkgRoot = resolve11(dirname4(entry), "..");
-      const distSkills = join8(pkgRoot, "dist", "skills");
-      if (existsSync12(distSkills)) {
+      const pkgRoot = resolve11(dirname3(entry), "..");
+      const distSkills = join7(pkgRoot, "dist", "skills");
+      if (existsSync11(distSkills)) {
         return distSkills;
       }
-      const srcSkills = join8(pkgRoot, "src", "agent", "skills");
-      if (existsSync12(srcSkills)) {
+      const srcSkills = join7(pkgRoot, "src", "agent", "skills");
+      if (existsSync11(srcSkills)) {
         return srcSkills;
       }
       return null;
@@ -8147,17 +8202,17 @@ var WorkspaceManager = class {
     }
     const cliDir = resolve11(fileURLToPath4(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
-    const candidates = [join8(pkgRoot, "templates")];
+    const candidates = [join7(pkgRoot, "templates")];
     for (const candidate of candidates) {
-      if (existsSync12(candidate)) {
+      if (existsSync11(candidate)) {
         return candidate;
       }
     }
     return null;
   }
   getBridgeDir() {
-    const userBridge = join8(getDataDir8(), "bridge");
-    if (existsSync12(join8(userBridge, "dist", "index.js"))) {
+    const userBridge = join7(getDataDir8(), "bridge");
+    if (existsSync11(join7(userBridge, "dist", "index.js"))) {
       return userBridge;
     }
     if (!which("npm")) {
@@ -8166,21 +8221,21 @@ var WorkspaceManager = class {
     }
     const cliDir = resolve11(fileURLToPath4(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
-    const pkgBridge = join8(pkgRoot, "bridge");
-    const srcBridge = join8(pkgRoot, "..", "..", "bridge");
+    const pkgBridge = join7(pkgRoot, "bridge");
+    const srcBridge = join7(pkgRoot, "..", "..", "bridge");
     let source = null;
-    if (existsSync12(join8(pkgBridge, "package.json"))) {
+    if (existsSync11(join7(pkgBridge, "package.json"))) {
       source = pkgBridge;
-    } else if (existsSync12(join8(srcBridge, "package.json"))) {
+    } else if (existsSync11(join7(srcBridge, "package.json"))) {
       source = srcBridge;
     }
     if (!source) {
-      console.error(`Bridge source not found. Try reinstalling ${APP_NAME3}.`);
+      console.error(`Bridge source not found. Try reinstalling ${APP_NAME4}.`);
       process.exit(1);
     }
     console.log(`${this.logo} Setting up bridge...`);
-    mkdirSync7(resolve11(userBridge, ".."), { recursive: true });
-    if (existsSync12(userBridge)) {
+    mkdirSync6(resolve11(userBridge, ".."), { recursive: true });
+    if (existsSync11(userBridge)) {
       rmSync5(userBridge, { recursive: true, force: true });
     }
     cpSync3(source, userBridge, {
@@ -8233,6 +8288,7 @@ var CliRuntime = class {
   cronCommands;
   platformAuthCommands;
   remoteCommands;
+  remote;
   diagnosticsCommands;
   constructor(options = {}) {
     this.logo = options.logo ?? LOGO;
@@ -8256,6 +8312,16 @@ var CliRuntime = class {
     this.cronCommands = new CronCommands();
     this.platformAuthCommands = new PlatformAuthCommands();
     this.remoteCommands = new RemoteCommands();
+    this.remote = new RemoteRuntimeActions({
+      appName: APP_NAME5,
+      initAuto: (source) => this.init({ source, auto: true }),
+      remoteCommands: this.remoteCommands,
+      restartBackgroundService: (reason) => this.restartBackgroundService(reason),
+      hasRunningManagedService: () => {
+        const state = readServiceState();
+        return Boolean(state && isProcessRunning(state.pid));
+      }
+    });
     this.diagnosticsCommands = new DiagnosticsCommands({ logo: this.logo });
     this.restartCoordinator = new RestartCoordinator({
       readServiceState,
@@ -8286,7 +8352,7 @@ var CliRuntime = class {
       const uiHost = FORCED_PUBLIC_UI_HOST;
       const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
       console.log(
-        `Applying changes (${reason}): restarting ${APP_NAME4} background service...`
+        `Applying changes (${reason}): restarting ${APP_NAME5} background service...`
       );
       await this.serviceCommands.stopService();
       await this.serviceCommands.startService({
@@ -8441,7 +8507,7 @@ var CliRuntime = class {
   }
   async onboard() {
     console.warn(
-      `Warning: ${APP_NAME4} onboard is deprecated. Use "${APP_NAME4} init" instead.`
+      `Warning: ${APP_NAME5} onboard is deprecated. Use "${APP_NAME5} init" instead.`
     );
     await this.init({ source: "onboard" });
   }
@@ -8449,18 +8515,18 @@ var CliRuntime = class {
     const source = options.source ?? "init";
     const prefix = options.auto ? "Auto init" : "Init";
     const force = Boolean(options.force);
-    const configPath = getConfigPath6();
+    const configPath = getConfigPath7();
     let createdConfig = false;
-    if (!existsSync13(configPath)) {
+    if (!existsSync12(configPath)) {
       const config3 = ConfigSchema2.parse({});
-      saveConfig9(config3);
+      saveConfig10(config3);
       createdConfig = true;
     }
-    const config2 = loadConfig13();
+    const config2 = loadConfig14();
     const workspaceSetting = config2.agents.defaults.workspace;
-    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join9(getDataDir9(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
-    const workspaceExisted = existsSync13(workspacePath);
-    mkdirSync8(workspacePath, { recursive: true });
+    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join8(getDataDir9(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
+    const workspaceExisted = existsSync12(workspacePath);
+    mkdirSync7(workspacePath, { recursive: true });
     const templateResult = this.workspaceManager.createWorkspaceTemplates(
       workspacePath,
       { force }
@@ -8479,13 +8545,13 @@ var CliRuntime = class {
     }
     if (!options.auto) {
       console.log(`
-${this.logo} ${APP_NAME4} is ready! (${source})`);
+${this.logo} ${APP_NAME5} is ready! (${source})`);
       console.log("\nNext steps:");
       console.log(`  1. Add your API key to ${configPath}`);
-      console.log(`  2. Chat: ${APP_NAME4} agent -m "Hello!"`);
+      console.log(`  2. Chat: ${APP_NAME5} agent -m "Hello!"`);
     } else {
       console.log(
-        `Tip: Run "${APP_NAME4} init${force ? " --force" : ""}" to re-run initialization if needed.`
+        `Tip: Run "${APP_NAME5} init${force ? " --force" : ""}" to re-run initialization if needed.`
       );
     }
   }
@@ -8493,9 +8559,6 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.init({ source: "login", auto: true });
     await this.platformAuthCommands.login(opts);
   }
-  async remoteConnect(opts = {}) {
-    await this.remoteCommands.connect(opts);
-  }
   async gateway(opts) {
     const uiOverrides = {
       host: FORCED_PUBLIC_UI_HOST
@@ -8546,7 +8609,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.writeRestartSentinelFromExecContext("cli.restart");
     const state = readServiceState();
     if (state && isProcessRunning(state.pid)) {
-      console.log(`Restarting ${APP_NAME4}...`);
+      console.log(`Restarting ${APP_NAME5}...`);
       await this.serviceCommands.stopService();
     } else if (state) {
       clearServiceState();
@@ -8585,8 +8648,8 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.serviceCommands.stopService();
   }
   async agent(opts) {
-    const configPath = getConfigPath6();
-    const config2 = resolveConfigSecrets3(loadConfig13(), { configPath });
+    const configPath = getConfigPath7();
+    const config2 = resolveConfigSecrets3(loadConfig14(), { configPath });
     const workspace = getWorkspacePath10(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
@@ -8594,7 +8657,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     const pluginChannelBindings = getPluginChannelBindings4(pluginRegistry);
     setPluginRuntimeBridge2({
       loadConfig: () => toPluginConfigView(
-        resolveConfigSecrets3(loadConfig13(), { configPath }),
+        resolveConfigSecrets3(loadConfig14(), { configPath }),
         pluginChannelBindings
       ),
       writeConfigFile: async (nextConfigView) => {
@@ -8603,13 +8666,13 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
             "plugin runtime writeConfigFile expects an object config"
           );
         }
-        const current = loadConfig13();
+        const current = loadConfig14();
         const next = mergePluginConfigView(
           current,
           nextConfigView,
           pluginChannelBindings
         );
-        saveConfig9(next);
+        saveConfig10(next);
       }
     });
     try {
@@ -8635,7 +8698,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
           registry: pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets3(loadConfig13(), { configPath }),
+          cfg: resolveConfigSecrets3(loadConfig14(), { configPath }),
           accountId
         })
       });
@@ -8654,10 +8717,10 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         `${this.logo} Interactive mode (type exit or Ctrl+C to quit)
 `
       );
-      const historyFile = join9(getDataDir9(), "history", "cli_history");
+      const historyFile = join8(getDataDir9(), "history", "cli_history");
       const historyDir = resolve12(historyFile, "..");
-      mkdirSync8(historyDir, { recursive: true });
-      const history = existsSync13(historyFile) ? readFileSync11(historyFile, "utf-8").split("\n").filter(Boolean) : [];
+      mkdirSync7(historyDir, { recursive: true });
+      const history = existsSync12(historyFile) ? readFileSync10(historyFile, "utf-8").split("\n").filter(Boolean) : [];
       const rl = createInterface3({
         input: process.stdin,
         output: process.stdout
@@ -8666,7 +8729,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         const merged = history.concat(
           rl.history ?? []
         );
-        writeFileSync7(historyFile, merged.join("\n"));
+        writeFileSync6(historyFile, merged.join("\n"));
         process.exit(0);
       });
       let running = true;
@@ -8736,7 +8799,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     }
     const state = readServiceState();
     if (state && isProcessRunning(state.pid)) {
-      console.log(`Tip: restart ${APP_NAME4} to apply the update.`);
+      console.log(`Tip: restart ${APP_NAME5} to apply the update.`);
     }
   }
   pluginsList(opts = {}) {
@@ -8830,7 +8893,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const config2 = loadConfig13();
+    const config2 = loadConfig14();
     const workdir = resolveSkillsInstallWorkdir({
       explicitWorkdir: options.workdir,
       configuredWorkspace: config2.agents.defaults.workspace
@@ -8894,20 +8957,19 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
 // src/cli/index.ts
 var program = new Command();
 var runtime = new CliRuntime({ logo: LOGO });
-program.name(APP_NAME5).description(`${LOGO} ${APP_NAME5} - ${APP_TAGLINE}`).version(getPackageVersion(), "-v, --version", "show version");
-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.name(APP_NAME6).description(`${LOGO} ${APP_NAME6} - ${APP_TAGLINE}`).version(getPackageVersion(), "-v, --version", "show version");
+program.command("onboard").description(`Initialize ${APP_NAME6} configuration and workspace`).action(async () => runtime.onboard());
+program.command("init").description(`Initialize ${APP_NAME6} 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));
-program.command("restart").description(`Restart the ${APP_NAME5} background service`).option("--ui-port <port>", "UI port").option("--start-timeout <ms>", "Maximum wait time for startup readiness in milliseconds").option("--open", "Open browser after restart", false).action(async (opts) => runtime.restart(opts));
-program.command("serve").description(`Run the ${APP_NAME5} gateway + UI in the foreground`).option("--ui-port <port>", "UI port").option("--open", "Open browser after start", false).action(async (opts) => runtime.serve(opts));
-program.command("stop").description(`Stop the ${APP_NAME5} background service`).action(async () => runtime.stop());
+registerRemoteCommands(program, runtime.remote);
+program.command("gateway").description(`Start the ${APP_NAME6} 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_NAME6} 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_NAME6} 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));
+program.command("restart").description(`Restart the ${APP_NAME6} background service`).option("--ui-port <port>", "UI port").option("--start-timeout <ms>", "Maximum wait time for startup readiness in milliseconds").option("--open", "Open browser after restart", false).action(async (opts) => runtime.restart(opts));
+program.command("serve").description(`Run the ${APP_NAME6} gateway + UI in the foreground`).option("--ui-port <port>", "UI port").option("--open", "Open browser after start", false).action(async (opts) => runtime.serve(opts));
+program.command("stop").description(`Stop the ${APP_NAME6} background service`).action(async () => runtime.stop());
 program.command("agent").description("Interact with the agent directly").option("-m, --message <message>", "Message to send to the agent").option("-s, --session <session>", "Session ID", "cli:default").option("--model <model>", "Session model override for this run").option("--no-markdown", "Disable Markdown rendering").action(async (opts) => runtime.agent(opts));
-program.command("update").description(`Update ${APP_NAME5}`).option("--timeout <ms>", "Update command timeout in milliseconds").action(async (opts) => runtime.update(opts));
+program.command("update").description(`Update ${APP_NAME6}`).option("--timeout <ms>", "Update command timeout in milliseconds").action(async (opts) => runtime.update(opts));
 var skills = program.command("skills").description("Manage skills");
 skills.command("install <slug>").description("Install a skill from NextClaw marketplace").option("--api-base <url>", "Marketplace API base URL").option("--workdir <dir>", "Workspace directory to install into").option("--dir <dir>", "Skills directory name (default: skills)").option("-f, --force", "Overwrite existing skill files", false).action(async (slug, opts) => runtime.skillsInstall({ slug, ...opts, apiBaseUrl: opts.apiBase }));
 var withRepeatableTag = (value, previous = []) => [...previous, value];
@@ -8952,6 +9014,6 @@ cron.command("add").requiredOption("-n, --name <name>", "Job name").requiredOpti
 cron.command("remove <jobId>").action((jobId) => runtime.cronRemove(jobId));
 cron.command("enable <jobId>").option("--disable", "Disable instead of enable").action((jobId, opts) => runtime.cronEnable(jobId, opts));
 cron.command("run <jobId>").option("-f, --force", "Run even if disabled").action(async (jobId, opts) => runtime.cronRun(jobId, opts));
-program.command("status").description(`Show ${APP_NAME5} status`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.status(opts));
-program.command("doctor").description(`Run ${APP_NAME5} diagnostics`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.doctor(opts));
+program.command("status").description(`Show ${APP_NAME6} status`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.status(opts));
+program.command("doctor").description(`Run ${APP_NAME6} diagnostics`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.doctor(opts));
 program.parseAsync(process.argv);