nextclaw 0.13.2 → 0.13.4

package/dist/cli/index.js

@@ -2,13 +2,13 @@
 
 // src/cli/index.ts
 import { Command } from "commander";
-import { APP_NAME as APP_NAME5, APP_TAGLINE } from "@nextclaw/core";
+import { APP_NAME as APP_NAME7, APP_TAGLINE } from "@nextclaw/core";
 
 // src/cli/runtime.ts
 import {
-  loadConfig as loadConfig13,
-  saveConfig as saveConfig9,
-  getConfigPath as getConfigPath6,
+  loadConfig as loadConfig15,
+  saveConfig as saveConfig10,
+  getConfigPath as getConfigPath7,
   getDataDir as getDataDir9,
   ConfigSchema as ConfigSchema2,
   getWorkspacePath as getWorkspacePath10,
@@ -17,7 +17,7 @@ import {
   AgentLoop,
   ProviderManager as ProviderManager2,
   resolveConfigSecrets as resolveConfigSecrets3,
-  APP_NAME as APP_NAME4,
+  APP_NAME as APP_NAME6,
   DEFAULT_WORKSPACE_DIR,
   DEFAULT_WORKSPACE_PATH
 } from "@nextclaw/core";
@@ -29,7 +29,7 @@ import {
 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 createInterface3 } from "readline";
-import { fileURLToPath as fileURLToPath4 } from "url";
+import { fileURLToPath as fileURLToPath5 } from "url";
 import { spawn as spawn3 } from "child_process";
 
 // src/cli/restart-coordinator.ts
@@ -822,6 +822,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)) {
@@ -1101,6 +1110,7 @@ function appendPluginCapabilityLines(lines, plugin) {
 // src/cli/commands/dev-first-party-plugin-load-paths.ts
 import fs from "fs";
 import path from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 var readJsonFile = (filePath) => {
   try {
     const raw = fs.readFileSync(filePath, "utf-8");
@@ -1117,6 +1127,14 @@ var readString = (value) => {
   const trimmed = value.trim();
   return trimmed || void 0;
 };
+var resolveDevFirstPartyPluginDir = (explicitDir, moduleDir = path.dirname(fileURLToPath2(import.meta.url))) => {
+  const configured = explicitDir?.trim();
+  if (configured) {
+    return configured;
+  }
+  const inferred = path.resolve(moduleDir, "../../../../extensions");
+  return fs.existsSync(inferred) ? inferred : void 0;
+};
 var hasOpenClawExtensions = (pkg) => {
   const openclaw = pkg.openclaw;
   if (!openclaw || typeof openclaw !== "object" || Array.isArray(openclaw)) {
@@ -1168,7 +1186,7 @@ var readWorkspacePluginPackages = (workspaceExtensionsDir) => {
   return packages;
 };
 var resolveDevFirstPartyPluginLoadPaths = (config2, workspaceExtensionsDir) => {
-  const rootDir = workspaceExtensionsDir?.trim();
+  const rootDir = resolveDevFirstPartyPluginDir(workspaceExtensionsDir);
   if (!rootDir) {
     return [];
   }
@@ -1193,7 +1211,7 @@ var resolveDevFirstPartyPluginLoadPaths = (config2, workspaceExtensionsDir) => {
   return loadPaths;
 };
 var resolveDevFirstPartyPluginInstallRoots = (config2, workspaceExtensionsDir) => {
-  const rootDir = workspaceExtensionsDir?.trim();
+  const rootDir = resolveDevFirstPartyPluginDir(workspaceExtensionsDir);
   if (!rootDir) {
     return [];
   }
@@ -1480,7 +1498,7 @@ function toExtensionRegistry(pluginRegistry) {
 
 // src/cli/commands/plugins.ts
 function loadPluginRegistry(config2, workspaceDir) {
-  const workspaceExtensionsDir = process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR;
+  const workspaceExtensionsDir = resolveDevFirstPartyPluginDir(process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR);
   const configWithDevPluginPaths = applyDevFirstPartyPluginLoadPaths(
     config2,
     workspaceExtensionsDir
@@ -3016,11 +3034,11 @@ var PlatformAuthCommands = class {
 };
 
 // src/cli/commands/remote.ts
-import { getConfigPath as getConfigPath3, getDataDir as getDataDir4, loadConfig as loadConfig8 } from "@nextclaw/core";
+import { getConfigPath as getConfigPath4, loadConfig as loadConfig10, saveConfig as saveConfig7 } from "@nextclaw/core";
+import { hostname as hostname3 } from "os";
+
+// src/cli/remote/remote-relay-bridge.ts
 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");
 }
@@ -3030,9 +3048,122 @@ function decodeBase64(base64) {
   }
   return new Uint8Array(Buffer.from(base64, "base64"));
 }
-function delay(ms) {
-  return new Promise((resolveDelay) => setTimeout(resolveDelay, ms));
-}
+var RemoteRelayBridge = class {
+  constructor(localOrigin) {
+    this.localOrigin = localOrigin;
+  }
+  async ensureLocalUiHealthy() {
+    const response = await fetch(`${this.localOrigin}/api/health`);
+    if (!response.ok) {
+      throw new Error(`Local UI is not healthy at ${this.localOrigin}. Start NextClaw first.`);
+    }
+  }
+  async forward(frame, socket) {
+    const bridgeCookie = await this.requestBridgeCookie();
+    const url = new URL(frame.path, this.localOrigin);
+    const headers = this.createForwardHeaders(frame.headers, bridgeCookie);
+    const response = await fetch(url, {
+      method: frame.method,
+      headers,
+      body: frame.method === "GET" || frame.method === "HEAD" ? void 0 : decodeBase64(frame.bodyBase64)
+    });
+    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")) {
+      await this.sendStreamingResponse({ frame, response, responseHeaders, socket });
+      return;
+    }
+    const responseBody = response.body ? new Uint8Array(await response.arrayBuffer()) : new Uint8Array();
+    socket.send(JSON.stringify({
+      type: "response",
+      requestId: frame.requestId,
+      status: response.status,
+      headers: responseHeaders,
+      bodyBase64: encodeBase64(responseBody)
+    }));
+  }
+  createForwardHeaders(headersList, bridgeCookie) {
+    const headers = new Headers();
+    for (const [key, value] of headersList) {
+      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);
+    }
+    return headers;
+  }
+  async requestBridgeCookie() {
+    const response = await fetch(`${this.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 sendStreamingResponse(params) {
+    params.socket.send(JSON.stringify({
+      type: "response.start",
+      requestId: params.frame.requestId,
+      status: params.response.status,
+      headers: params.responseHeaders
+    }));
+    const reader = params.response.body?.getReader();
+    if (!reader) {
+      params.socket.send(JSON.stringify({
+        type: "response.end",
+        requestId: params.frame.requestId
+      }));
+      return;
+    }
+    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
+    }));
+  }
+};
+
+// src/cli/remote/remote-platform-client.ts
+import { getConfigPath as getConfigPath3, getDataDir as getDataDir4, loadConfig as loadConfig8 } from "@nextclaw/core";
+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 ensureDir(path2) {
   mkdirSync4(path2, { recursive: true });
 }
@@ -3051,9 +3182,82 @@ function writeJsonFile(path2, value) {
   writeFileSync4(path2, `${JSON.stringify(value, null, 2)}
 `, "utf-8");
 }
-var RemoteCommands = class {
+function maskToken(value) {
+  if (value.length <= 12) {
+    return "<redacted>";
+  }
+  return `${value.slice(0, 6)}...${value.slice(-4)}`;
+}
+function normalizeOptionalString3(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+function delay(ms, signal) {
+  return new Promise((resolveDelay, rejectDelay) => {
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolveDelay();
+    }, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      rejectDelay(new Error("Remote connector aborted."));
+    };
+    if (signal) {
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+  });
+}
+function redactWsUrl(url) {
+  try {
+    const parsed = new URL(url);
+    const token = parsed.searchParams.get("token");
+    if (token) {
+      parsed.searchParams.set("token", maskToken(token));
+    }
+    return parsed.toString();
+  } catch {
+    return url;
+  }
+}
+var RemotePlatformClient = class {
   remoteDir = join4(getDataDir4(), "remote");
   devicePath = join4(this.remoteDir, "device.json");
+  resolveRunContext(opts) {
+    const { platformBase, token, config: config2 } = this.resolvePlatformAccess(opts);
+    return {
+      config: config2,
+      platformBase,
+      token,
+      localOrigin: this.resolveLocalOrigin(config2, opts),
+      displayName: this.resolveDisplayName(config2, opts),
+      deviceInstallId: this.ensureDeviceInstallId(),
+      autoReconnect: opts.once ? false : opts.autoReconnect ?? config2.remote.autoReconnect
+    };
+  }
+  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;
+  }
   ensureDeviceInstallId() {
     const existing = readJsonFile2(this.devicePath);
     if (existing?.deviceInstallId?.trim()) {
@@ -3072,10 +3276,10 @@ var RemoteCommands = class {
     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;
+    const configuredApiBase = normalizeOptionalString3(config2.remote.platformApiBase) ?? (typeof nextclawProvider?.apiBase === "string" ? nextclawProvider.apiBase.trim() : "");
+    const rawApiBase = normalizeOptionalString3(opts.apiBase) ?? configuredApiBase;
     if (!rawApiBase) {
-      throw new Error("Platform API base is missing. Pass --api-base or run nextclaw login.");
+      throw new Error("Platform API base is missing. Pass --api-base, run nextclaw login, or set remote.platformApiBase.");
     }
     const { platformBase } = resolvePlatformApiBase({
       explicitApiBase: rawApiBase,
@@ -3084,8 +3288,9 @@ var RemoteCommands = class {
     return { platformBase, token, config: config2 };
   }
   resolveLocalOrigin(config2, opts) {
-    if (typeof opts.localOrigin === "string" && opts.localOrigin.trim().length > 0) {
-      return opts.localOrigin.trim().replace(/\/$/, "");
+    const explicitOrigin = normalizeOptionalString3(opts.localOrigin);
+    if (explicitOrigin) {
+      return explicitOrigin.replace(/\/$/, "");
     }
     const state = readServiceState();
     if (state && isProcessRunning(state.pid) && Number.isFinite(state.uiPort)) {
@@ -3094,191 +3299,413 @@ var RemoteCommands = class {
     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.`);
-    }
+  resolveDisplayName(config2, opts) {
+    return normalizeOptionalString3(opts.name) ?? normalizeOptionalString3(config2.remote.deviceName) ?? hostname();
   }
-  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;
+};
+
+// src/cli/remote/remote-connector.ts
+var RemoteConnector = class {
+  constructor(logger = console) {
+    this.logger = logger;
   }
-  async requestBridgeCookie(localOrigin) {
-    const response = await fetch(`${localOrigin}/api/auth/bridge`, {
-      method: "POST",
-      headers: {
-        "x-nextclaw-ui-bridge-secret": ensureUiBridgeSecret()
+  platformClient = new RemotePlatformClient();
+  async connectOnce(params) {
+    return await new Promise((resolve13, reject) => {
+      const socket = new WebSocket(params.wsUrl);
+      let settled = false;
+      let aborted = false;
+      const pingTimer = setInterval(() => {
+        if (socket.readyState === WebSocket.OPEN) {
+          socket.send(JSON.stringify({ type: "ping", at: (/* @__PURE__ */ new Date()).toISOString() }));
+        }
+      }, 15e3);
+      const cleanup = () => {
+        clearInterval(pingTimer);
+        params.signal?.removeEventListener("abort", onAbort);
+      };
+      const finishResolve = (value) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        cleanup();
+        resolve13(value);
+      };
+      const finishReject = (error) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        cleanup();
+        reject(error);
+      };
+      const onAbort = () => {
+        aborted = true;
+        try {
+          socket.close(1e3, "Remote connector aborted");
+        } catch {
+          finishResolve("aborted");
+        }
+      };
+      if (params.signal) {
+        if (params.signal.aborted) {
+          onAbort();
+        } else {
+          params.signal.addEventListener("abort", onAbort, { once: true });
+        }
       }
+      socket.addEventListener("open", () => {
+        params.statusStore?.write({
+          enabled: true,
+          state: "connected",
+          deviceId: params.deviceId,
+          deviceName: params.displayName,
+          platformBase: params.platformBase,
+          localOrigin: params.localOrigin,
+          lastConnectedAt: (/* @__PURE__ */ new Date()).toISOString(),
+          lastError: null
+        });
+        this.logger.info(`\u2713 Remote connector connected: ${redactWsUrl(params.wsUrl)}`);
+      });
+      socket.addEventListener("message", (event) => {
+        this.handleSocketMessage({ data: event.data, relayBridge: params.relayBridge, socket });
+      });
+      socket.addEventListener("close", () => {
+        finishResolve(aborted ? "aborted" : "closed");
+      });
+      socket.addEventListener("error", () => {
+        if (aborted) {
+          finishResolve("aborted");
+          return;
+        }
+        finishReject(new Error("Remote connector websocket failed."));
+      });
     });
-    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;
+  handleSocketMessage(params) {
+    void (async () => {
+      const frame = this.parseRelayFrame(params.data);
+      if (!frame) {
+        return;
       }
-      headers.set(key, value);
+      try {
+        await params.relayBridge.forward(frame, params.socket);
+      } catch (error) {
+        params.socket.send(JSON.stringify({
+          type: "response.error",
+          requestId: frame.requestId,
+          message: error instanceof Error ? error.message : String(error)
+        }));
+      }
+    })();
+  }
+  parseRelayFrame(data) {
+    try {
+      const frame = JSON.parse(String(data ?? ""));
+      return frame.type === "request" ? frame : null;
+    } catch {
+      return null;
     }
-    if (bridgeCookie) {
-      headers.set("cookie", bridgeCookie);
+  }
+  async ensureDevice(params) {
+    if (params.device) {
+      return params.device;
     }
-    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 device = await this.platformClient.registerDevice({
+      platformBase: params.context.platformBase,
+      token: params.context.token,
+      deviceInstallId: params.context.deviceInstallId,
+      displayName: params.context.displayName,
+      localOrigin: params.context.localOrigin
     });
-    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();
+    this.logger.info(`\u2713 Remote device registered: ${device.displayName} (${device.id})`);
+    this.logger.info(`\u2713 Local origin: ${params.context.localOrigin}`);
+    this.logger.info(`\u2713 Platform: ${params.context.platformBase}`);
+    return device;
+  }
+  writeRemoteState(statusStore, next) {
+    statusStore?.write(next);
+  }
+  async runCycle(params) {
+    try {
+      this.writeRemoteState(params.opts.statusStore, {
+        enabled: true,
+        state: "connecting",
+        deviceId: params.device?.id,
+        deviceName: params.context.displayName,
+        platformBase: params.context.platformBase,
+        localOrigin: params.context.localOrigin,
+        lastError: null
+      });
+      const device = await this.ensureDevice({ device: params.device, context: params.context });
+      const wsUrl = `${params.context.platformBase.replace(/^http/i, "ws")}/platform/remote/connect?deviceId=${encodeURIComponent(device.id)}&token=${encodeURIComponent(params.context.token)}`;
+      const outcome = await this.connectOnce({
+        wsUrl,
+        relayBridge: params.relayBridge,
+        signal: params.opts.signal,
+        statusStore: params.opts.statusStore,
+        displayName: params.context.displayName,
+        deviceId: device.id,
+        platformBase: params.context.platformBase,
+        localOrigin: params.context.localOrigin
+      });
+      if (outcome !== "aborted") {
+        this.writeRemoteState(params.opts.statusStore, {
+          enabled: true,
+          state: "disconnected",
+          deviceId: device.id,
+          deviceName: params.context.displayName,
+          platformBase: params.context.platformBase,
+          localOrigin: params.context.localOrigin,
+          lastError: null
+        });
+      }
+      return { device, aborted: outcome === "aborted" };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      this.writeRemoteState(params.opts.statusStore, {
+        enabled: true,
+        state: "error",
+        deviceId: params.device?.id,
+        deviceName: params.context.displayName,
+        platformBase: params.context.platformBase,
+        localOrigin: params.context.localOrigin,
+        lastError: message
+      });
+      this.logger.error(`Remote connector error: ${message}`);
+      return { device: params.device, aborted: false };
+    }
+  }
+  async run(opts = {}) {
+    const context = this.platformClient.resolveRunContext(opts);
+    const relayBridge = new RemoteRelayBridge(context.localOrigin);
+    await relayBridge.ensureLocalUiHealthy();
+    let device = null;
+    while (!opts.signal?.aborted) {
+      const cycle = await this.runCycle({ device, context, relayBridge, opts });
+      device = cycle.device;
+      if (cycle.aborted || !context.autoReconnect || opts.signal?.aborted) {
+        break;
+      }
+      this.logger.warn("Remote connector disconnected. Reconnecting in 3s...");
       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();
+        await delay(3e3, opts.signal);
+      } catch {
+        break;
       }
-      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)
+    this.writeRemoteState(opts.statusStore, {
+      enabled: opts.mode === "service" ? true : Boolean(context.config.remote.enabled),
+      state: opts.signal?.aborted ? "disconnected" : "disabled",
+      deviceId: device?.id,
+      deviceName: context.displayName,
+      platformBase: context.platformBase,
+      localOrigin: context.localOrigin,
+      lastError: null
+    });
+  }
+};
+
+// src/cli/remote/remote-status-store.ts
+import { hostname as hostname2 } from "os";
+import { loadConfig as loadConfig9 } from "@nextclaw/core";
+function normalizeOptionalString4(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
+function buildConfiguredRemoteState(config2 = loadConfig9()) {
+  const remote = config2.remote;
+  return {
+    enabled: Boolean(remote.enabled),
+    mode: "service",
+    state: remote.enabled ? "disconnected" : "disabled",
+    ...normalizeOptionalString4(remote.deviceName) ? { deviceName: normalizeOptionalString4(remote.deviceName) } : {},
+    ...normalizeOptionalString4(remote.platformApiBase) ? { platformBase: normalizeOptionalString4(remote.platformApiBase) } : {},
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+}
+function resolveRemoteStatusSnapshot(config2 = loadConfig9()) {
+  const serviceState = readServiceState();
+  if (serviceState?.remote) {
+    return {
+      configuredEnabled: Boolean(config2.remote.enabled),
+      runtime: serviceState.remote
+    };
+  }
+  if (config2.remote.enabled) {
+    return {
+      configuredEnabled: true,
+      runtime: {
+        ...buildConfiguredRemoteState(config2),
+        deviceName: normalizeOptionalString4(config2.remote.deviceName) ?? hostname2()
+      }
+    };
+  }
+  return {
+    configuredEnabled: false,
+    runtime: null
+  };
+}
+var RemoteStatusStore = class {
+  constructor(mode) {
+    this.mode = mode;
+  }
+  write(next) {
+    updateServiceState((state) => ({
+      ...state,
+      remote: {
+        ...state.remote,
+        ...next,
+        mode: this.mode,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      }
     }));
   }
-  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."));
-      });
+};
+
+// src/cli/commands/remote.ts
+function normalizeOptionalString5(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  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}`;
+  }
+  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) {
+      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)
+    };
+  }
+}
+var RemoteCommands = class {
+  enableConfig(opts = {}) {
+    const config2 = loadConfig10(getConfigPath4());
+    const next = {
+      ...config2,
+      remote: {
+        ...config2.remote,
+        enabled: true,
+        ...normalizeOptionalString5(opts.apiBase) ? { platformApiBase: normalizeOptionalString5(opts.apiBase) ?? "" } : {},
+        ...normalizeOptionalString5(opts.name) ? { deviceName: normalizeOptionalString5(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
+    };
+  }
+  disableConfig() {
+    const config2 = loadConfig10(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 = new RemoteConnector();
+    await connector.run({
+      ...opts,
+      mode: "foreground"
     });
   }
-  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 status(opts = {}) {
+    const config2 = loadConfig10(getConfigPath4());
+    const snapshot = resolveRemoteStatusSnapshot(config2);
+    if (opts.json) {
+      console.log(JSON.stringify(snapshot, null, 2));
+      return;
+    }
+    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 ?? normalizeOptionalString5(config2.remote.deviceName) ?? hostname3()}`);
+    console.log(
+      `Platform: ${runtime2?.platformBase ?? normalizeOptionalString5(config2.remote.platformApiBase) ?? normalizeOptionalString5(config2.providers.nextclaw?.apiBase) ?? "not set"}`
+    );
+    console.log(`Local origin: ${runtime2?.localOrigin ?? resolveConfiguredLocalOrigin(config2)}`);
+    if (runtime2?.deviceId) {
+      console.log(`Device ID: ${runtime2.deviceId}`);
+    }
+    if (runtime2?.lastConnectedAt) {
+      console.log(`Last connected: ${runtime2.lastConnectedAt}`);
+    }
+    if (runtime2?.lastError) {
+      console.log(`Last error: ${runtime2.lastError}`);
+    }
+  }
+  async doctor(opts = {}) {
+    const config2 = loadConfig10(getConfigPath4());
+    const snapshot = resolveRemoteStatusSnapshot(config2);
+    const localOrigin = resolveConfiguredLocalOrigin(config2);
+    const localUi = await probeLocalUi(localOrigin);
+    const token = normalizeOptionalString5(config2.providers.nextclaw?.apiKey);
+    const platformApiBase = normalizeOptionalString5(config2.remote.platformApiBase) ?? normalizeOptionalString5(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}`);
+    }
   }
 };
 
@@ -3287,14 +3714,100 @@ import { createServer as createNetServer } from "net";
 import { existsSync as existsSync7, readFileSync as readFileSync7 } 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 loadConfig11
 } 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;
@@ -3309,56 +3822,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 = {}) {
@@ -3429,32 +3893,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 = loadConfig11();
     const workspacePath = getWorkspacePath4(config2.agents.defaults.workspace);
     const serviceStatePath = resolve8(getDataDir5(), "run", "service.json");
     const fixActions = [];
@@ -3474,59 +3925,23 @@ 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 = resolveRemoteStatusSnapshot(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;
@@ -3562,6 +3977,7 @@ var DiagnosticsCommands = class {
       issues,
       recommendations,
       logTail,
+      remote,
       level,
       exitCode
     };
@@ -3588,6 +4004,60 @@ 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 (!existsSync7(params.configPath)) {
+      params.issues.push("Config file is missing.");
+      params.recommendations.push(`Run ${APP_NAME2} init to create config files.`);
+    }
+    if (!existsSync7(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)) {
       return [];
@@ -3651,8 +4121,8 @@ 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)) {
@@ -4113,7 +4583,7 @@ var MissingProvider = class extends LLMProvider {
 };
 
 // src/cli/commands/service-marketplace-installer.ts
-import { getWorkspacePath as getWorkspacePath5, loadConfig as loadConfig11 } from "@nextclaw/core";
+import { getWorkspacePath as getWorkspacePath5, loadConfig as loadConfig13 } from "@nextclaw/core";
 import { existsSync as existsSync9, rmSync as rmSync4 } from "fs";
 import { join as join5 } from "path";
 
@@ -4163,7 +4633,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 loadConfig12, saveConfig as saveConfig8 } from "@nextclaw/core";
 import { McpDoctorFacade as McpDoctorFacade2, McpMutationService as McpMutationService2 } from "@nextclaw/mcp";
 var ServiceMcpMarketplaceOps = class {
   constructor(options) {
@@ -4231,13 +4701,13 @@ var ServiceMcpMarketplaceOps = class {
   }
   createMutationService() {
     return new McpMutationService2({
-      getConfig: () => loadConfig10(),
-      saveConfig: (config2) => saveConfig7(config2)
+      getConfig: () => loadConfig12(),
+      saveConfig: (config2) => saveConfig8(config2)
     });
   }
   createDoctorFacade() {
     return new McpDoctorFacade2({
-      getConfig: () => loadConfig10()
+      getConfig: () => loadConfig12()
     });
   }
 };
@@ -4278,7 +4748,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(loadConfig13().agents.defaults.workspace);
     const args = buildMarketplaceSkillInstallArgs({
       slug: params.slug,
       workspace,
@@ -4317,7 +4787,7 @@ var ServiceMarketplaceInstaller = class {
     return { message: result.message };
   }
   async uninstallSkill(slug) {
-    const workspace = getWorkspacePath5(loadConfig11().agents.defaults.workspace);
+    const workspace = getWorkspacePath5(loadConfig13().agents.defaults.workspace);
     const targetDir = join5(workspace, "skills", slug);
     if (!existsSync9(targetDir)) {
       throw new Error(`Skill not installed in workspace: ${slug}`);
@@ -4444,6 +4914,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,
@@ -4941,14 +5440,14 @@ function formatUserFacingError(error, maxChars = 320) {
 // src/cli/commands/cli-subcommand-launch.ts
 import { createRequire } from "module";
 import { extname, resolve as resolve9 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath as fileURLToPath3 } from "url";
 var require2 = createRequire(import.meta.url);
 var resolveCliSubcommandEntry = (params) => {
   const argvEntry = params.argvEntry?.trim();
   if (argvEntry) {
     return resolve9(argvEntry);
   }
-  return fileURLToPath2(new URL("../index.js", params.importMetaUrl));
+  return fileURLToPath3(new URL("../index.js", params.importMetaUrl));
 };
 
 // src/cli/commands/ncp/create-ui-ncp-agent.ts
@@ -5423,7 +5922,7 @@ function resolveRequestedToolNames(metadata) {
     )
   );
 }
-function normalizeOptionalString3(value) {
+function normalizeOptionalString6(value) {
   return normalizeString(value) ?? void 0;
 }
 function readMetadataModel(metadata) {
@@ -5543,7 +6042,7 @@ var NextclawNcpContextBuilder = class {
     if (inboundModel) {
       session.metadata.preferred_model = inboundModel;
     }
-    const effectiveModel = normalizeOptionalString3(session.metadata.preferred_model) ?? profile.model;
+    const effectiveModel = normalizeOptionalString6(session.metadata.preferred_model) ?? profile.model;
     const clearThinking = requestMetadata.clear_thinking === true || requestMetadata.reset_thinking === true;
     if (clearThinking) {
       delete session.metadata.preferred_thinking;
@@ -5560,8 +6059,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 = normalizeOptionalString6(requestMetadata.channel) ?? normalizeOptionalString6(session.metadata.last_channel) ?? "ui";
+    const chatId = normalizeOptionalString6(requestMetadata.chatId) ?? normalizeOptionalString6(requestMetadata.chat_id) ?? normalizeOptionalString6(session.metadata.last_to) ?? "web-ui";
     session.metadata.last_channel = channel;
     session.metadata.last_to = chatId;
     const requestedSkillNames = resolveRequestedSkillNames(requestMetadata);
@@ -6279,6 +6778,119 @@ async function createUiNcpAgent(params) {
   };
 }
 
+// src/cli/remote/remote-service-module.ts
+var RemoteServiceModule = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  abortController = null;
+  runTask = null;
+  statusStore = new RemoteStatusStore("service");
+  start() {
+    if (!this.deps.config.remote.enabled) {
+      this.statusStore.write({
+        enabled: false,
+        state: "disabled",
+        deviceName: void 0,
+        deviceId: void 0,
+        platformBase: void 0,
+        localOrigin: this.deps.localOrigin,
+        lastError: null,
+        lastConnectedAt: null
+      });
+      return null;
+    }
+    const logger = this.deps.logger ?? {
+      info: (message) => console.log(`[remote] ${message}`),
+      warn: (message) => console.warn(`[remote] ${message}`),
+      error: (message) => console.error(`[remote] ${message}`)
+    };
+    this.abortController = new AbortController();
+    const connector = new RemoteConnector(logger);
+    this.runTask = connector.run({
+      mode: "service",
+      signal: this.abortController.signal,
+      autoReconnect: this.deps.config.remote.autoReconnect,
+      localOrigin: this.deps.localOrigin,
+      statusStore: this.statusStore
+    });
+    void this.runTask.catch((error) => {
+      const message = error instanceof Error ? error.message : String(error);
+      this.statusStore.write({
+        enabled: true,
+        state: "error",
+        deviceName: this.deps.config.remote.deviceName || void 0,
+        deviceId: void 0,
+        platformBase: this.deps.config.remote.platformApiBase || void 0,
+        localOrigin: this.deps.localOrigin,
+        lastError: message
+      });
+      logger.error(message);
+    });
+    return this.runTask;
+  }
+  async stop() {
+    this.abortController?.abort();
+    try {
+      await this.runTask;
+    } catch {
+    } finally {
+      this.abortController = null;
+      this.runTask = null;
+    }
+  }
+};
+
+// src/cli/commands/service-remote-runtime.ts
+function createManagedRemoteModule(params) {
+  if (!params.config.ui.enabled) {
+    return null;
+  }
+  return new RemoteServiceModule({
+    config: params.config,
+    localOrigin: params.localOrigin,
+    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: buildConfiguredRemoteState(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";
@@ -6899,22 +7511,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: loadConfig14,
   MessageBus,
   ProviderManager,
   resolveConfigSecrets: resolveConfigSecrets2,
-  saveConfig: saveConfig8,
+  saveConfig: saveConfig9,
   SessionManager,
   parseAgentScopedSessionKey: parseAgentScopedSessionKey3
 } = NextclawCore;
@@ -6934,8 +7546,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(loadConfig14(), { configPath: runtimeConfigPath });
     const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
     let pluginRegistry = loadPluginRegistry(config2, workspace);
     let extensionRegistry = toExtensionRegistry(pluginRegistry);
@@ -6948,27 +7560,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 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.");
     }
@@ -6980,7 +7576,7 @@ var ServiceCommands = class {
       sessionManager,
       providerManager,
       makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }) ?? this.makeMissingProvider(nextConfig),
-      loadConfig: () => resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }),
+      loadConfig: () => resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
       getExtensionChannels: () => extensionRegistry.channels,
       onRestartRequired: (paths) => {
         void this.deps.requestRestart({
@@ -6991,14 +7587,14 @@ var ServiceCommands = class {
       }
     });
     this.applyLiveConfigReload = async () => {
-      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }));
+      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig14(), { 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",
@@ -7024,7 +7620,7 @@ var ServiceCommands = class {
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
         accountId
       })
     });
@@ -7057,14 +7653,14 @@ var ServiceCommands = class {
     });
     let pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
     setPluginRuntimeBridge({
-      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }), pluginChannelBindings),
+      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig14(), { 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 = loadConfig14();
         const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
-        saveConfig8(next);
+        saveConfig9(next);
       },
       dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
         const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
@@ -7138,23 +7734,23 @@ var ServiceCommands = class {
       providerManager,
       bus,
       gatewayController,
-      () => resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }),
+      () => resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
       () => extensionRegistry,
       ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig12(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig14(), { 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,
@@ -7168,6 +7764,7 @@ var ServiceCommands = class {
     } finally {
       this.applyLiveConfigReload = null;
       this.liveUiNcpAgent = null;
+      await remoteModule?.stop();
       await stopPluginChannelGateways2(pluginGatewayHandles);
       setPluginRuntimeBridge(null);
     }
@@ -7180,7 +7777,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 }
@@ -7301,7 +7898,7 @@ var ServiceCommands = class {
     });
   }
   async runForeground(options) {
-    const config2 = loadConfig12();
+    const config2 = loadConfig14();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (options.open) {
@@ -7314,14 +7911,14 @@ var ServiceCommands = class {
     });
   }
   async startService(options) {
-    const config2 = loadConfig12();
+    const config2 = loadConfig14();
     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 = (() => {
@@ -7369,7 +7966,7 @@ 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;
     }
@@ -7384,10 +7981,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,
@@ -7408,6 +8003,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,
@@ -7449,28 +8049,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}`);
@@ -7492,7 +8083,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) {
@@ -7510,7 +8101,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();
@@ -7728,7 +8319,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({
@@ -7765,8 +8356,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) {
@@ -7855,7 +8446,7 @@ var ServiceCommands = class {
     const uiServer = startUiServer({
       host: uiConfig.host,
       port: uiConfig.port,
-      configPath: getConfigPath5(),
+      configPath: getConfigPath6(),
       productVersion: getPackageVersion(),
       staticDir: uiStaticDir ?? void 0,
       cronService,
@@ -7943,7 +8534,7 @@ var ServiceCommands = class {
     }
   }
   installBuiltinMarketplaceSkill(slug, force) {
-    const workspace = getWorkspacePath9(loadConfig12().agents.defaults.workspace);
+    const workspace = getWorkspacePath9(loadConfig14().agents.defaults.workspace);
     const destination = join7(workspace, "skills", slug);
     const destinationSkillFile = join7(destination, "SKILL.md");
     if (existsSync11(destinationSkillFile) && !force) {
@@ -8020,12 +8611,58 @@ ${stderr}`.trim();
   }
 };
 
+// src/cli/remote/remote-runtime-actions.ts
+import { APP_NAME as APP_NAME4 } from "@nextclaw/core";
+var RemoteRuntimeActions = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  async connect(opts = {}) {
+    await this.deps.remoteCommands.connect(opts);
+  }
+  async enable(opts = {}) {
+    await this.deps.initAuto("remote enable");
+    const result = this.deps.remoteCommands.enableConfig(opts);
+    console.log("\u2713 Remote access enabled");
+    if (result.config.remote.deviceName.trim()) {
+      console.log(`Device: ${result.config.remote.deviceName.trim()}`);
+    }
+    if (result.config.remote.platformApiBase.trim()) {
+      console.log(`Platform: ${result.config.remote.platformApiBase.trim()}`);
+    }
+    if (this.hasRunningManagedService()) {
+      await this.deps.restartBackgroundService("remote configuration updated");
+      console.log("\u2713 Applied remote settings to running background service");
+      return;
+    }
+    console.log(`Tip: Run "${APP_NAME4} start" to bring the managed remote connector online.`);
+  }
+  async disable() {
+    const result = this.deps.remoteCommands.disableConfig();
+    console.log(result.changed ? "\u2713 Remote access disabled" : "Remote access was already disabled");
+    if (this.hasRunningManagedService()) {
+      await this.deps.restartBackgroundService("remote access disabled");
+      console.log("\u2713 Running background service restarted without remote access");
+    }
+  }
+  async status(opts = {}) {
+    await this.deps.remoteCommands.status(opts);
+  }
+  async doctor(opts = {}) {
+    await this.deps.remoteCommands.doctor(opts);
+  }
+  hasRunningManagedService() {
+    const state = readServiceState();
+    return Boolean(state && isProcessRunning(state.pid));
+  }
+};
+
 // 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 { createRequire as createRequire2 } from "module";
 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 getDataDir8 } from "@nextclaw/core";
+import { fileURLToPath as fileURLToPath4 } from "url";
+import { APP_NAME as APP_NAME5, getDataDir as getDataDir8 } from "@nextclaw/core";
 import { spawnSync as spawnSync3 } from "child_process";
 var WorkspaceManager = class {
   constructor(logo) {
@@ -8063,7 +8700,7 @@ var WorkspaceManager = class {
         continue;
       }
       const raw = readFileSync10(templatePath, "utf-8");
-      const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME3);
+      const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME5);
       mkdirSync7(dirname4(filePath), { recursive: true });
       writeFileSync6(filePath, content);
       created.push(entry.target);
@@ -8136,7 +8773,7 @@ var WorkspaceManager = class {
     if (override) {
       return override;
     }
-    const cliDir = resolve11(fileURLToPath3(new URL(".", import.meta.url)));
+    const cliDir = resolve11(fileURLToPath4(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
     const candidates = [join8(pkgRoot, "templates")];
     for (const candidate of candidates) {
@@ -8155,7 +8792,7 @@ var WorkspaceManager = class {
       console.error("npm not found. Please install Node.js >= 18.");
       process.exit(1);
     }
-    const cliDir = resolve11(fileURLToPath3(new URL(".", import.meta.url)));
+    const cliDir = resolve11(fileURLToPath4(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
     const pkgBridge = join8(pkgRoot, "bridge");
     const srcBridge = join8(pkgRoot, "..", "..", "bridge");
@@ -8166,7 +8803,7 @@ var WorkspaceManager = class {
       source = srcBridge;
     }
     if (!source) {
-      console.error(`Bridge source not found. Try reinstalling ${APP_NAME3}.`);
+      console.error(`Bridge source not found. Try reinstalling ${APP_NAME5}.`);
       process.exit(1);
     }
     console.log(`${this.logo} Setting up bridge...`);
@@ -8224,6 +8861,7 @@ var CliRuntime = class {
   cronCommands;
   platformAuthCommands;
   remoteCommands;
+  remote;
   diagnosticsCommands;
   constructor(options = {}) {
     this.logo = options.logo ?? LOGO;
@@ -8247,6 +8885,11 @@ var CliRuntime = class {
     this.cronCommands = new CronCommands();
     this.platformAuthCommands = new PlatformAuthCommands();
     this.remoteCommands = new RemoteCommands();
+    this.remote = new RemoteRuntimeActions({
+      initAuto: (source) => this.init({ source, auto: true }),
+      remoteCommands: this.remoteCommands,
+      restartBackgroundService: (reason) => this.restartBackgroundService(reason)
+    });
     this.diagnosticsCommands = new DiagnosticsCommands({ logo: this.logo });
     this.restartCoordinator = new RestartCoordinator({
       readServiceState,
@@ -8277,7 +8920,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_NAME6} background service...`
       );
       await this.serviceCommands.stopService();
       await this.serviceCommands.startService({
@@ -8310,7 +8953,7 @@ var CliRuntime = class {
     }
     const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
     const delayMs = typeof params.delayMs === "number" && Number.isFinite(params.delayMs) ? Math.max(0, Math.floor(params.delayMs)) : 100;
-    const cliPath = process.env.NEXTCLAW_SELF_RELAUNCH_CLI?.trim() || fileURLToPath4(new URL("./index.js", import.meta.url));
+    const cliPath = process.env.NEXTCLAW_SELF_RELAUNCH_CLI?.trim() || fileURLToPath5(new URL("./index.js", import.meta.url));
     const startArgs = [cliPath, "start", "--ui-port", String(uiPort)];
     const serviceStatePath = resolve12(getDataDir9(), "run", "service.json");
     const helperScript = [
@@ -8432,7 +9075,7 @@ var CliRuntime = class {
   }
   async onboard() {
     console.warn(
-      `Warning: ${APP_NAME4} onboard is deprecated. Use "${APP_NAME4} init" instead.`
+      `Warning: ${APP_NAME6} onboard is deprecated. Use "${APP_NAME6} init" instead.`
     );
     await this.init({ source: "onboard" });
   }
@@ -8440,14 +9083,14 @@ 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)) {
       const config3 = ConfigSchema2.parse({});
-      saveConfig9(config3);
+      saveConfig10(config3);
       createdConfig = true;
     }
-    const config2 = loadConfig13();
+    const config2 = loadConfig15();
     const workspaceSetting = config2.agents.defaults.workspace;
     const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join9(getDataDir9(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
     const workspaceExisted = existsSync13(workspacePath);
@@ -8470,13 +9113,13 @@ var CliRuntime = class {
     }
     if (!options.auto) {
       console.log(`
-${this.logo} ${APP_NAME4} is ready! (${source})`);
+${this.logo} ${APP_NAME6} 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_NAME6} agent -m "Hello!"`);
     } else {
       console.log(
-        `Tip: Run "${APP_NAME4} init${force ? " --force" : ""}" to re-run initialization if needed.`
+        `Tip: Run "${APP_NAME6} init${force ? " --force" : ""}" to re-run initialization if needed.`
       );
     }
   }
@@ -8484,9 +9127,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
@@ -8537,7 +9177,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_NAME6}...`);
       await this.serviceCommands.stopService();
     } else if (state) {
       clearServiceState();
@@ -8576,8 +9216,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(loadConfig15(), { configPath });
     const workspace = getWorkspacePath10(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
@@ -8585,7 +9225,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     const pluginChannelBindings = getPluginChannelBindings4(pluginRegistry);
     setPluginRuntimeBridge2({
       loadConfig: () => toPluginConfigView(
-        resolveConfigSecrets3(loadConfig13(), { configPath }),
+        resolveConfigSecrets3(loadConfig15(), { configPath }),
         pluginChannelBindings
       ),
       writeConfigFile: async (nextConfigView) => {
@@ -8594,13 +9234,13 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
             "plugin runtime writeConfigFile expects an object config"
           );
         }
-        const current = loadConfig13();
+        const current = loadConfig15();
         const next = mergePluginConfigView(
           current,
           nextConfigView,
           pluginChannelBindings
         );
-        saveConfig9(next);
+        saveConfig10(next);
       }
     });
     try {
@@ -8626,7 +9266,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
           registry: pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets3(loadConfig13(), { configPath }),
+          cfg: resolveConfigSecrets3(loadConfig15(), { configPath }),
           accountId
         })
       });
@@ -8727,7 +9367,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_NAME6} to apply the update.`);
     }
   }
   pluginsList(opts = {}) {
@@ -8821,7 +9461,7 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const config2 = loadConfig13();
+    const config2 = loadConfig15();
     const workdir = resolveSkillsInstallWorkdir({
       explicitWorkdir: options.workdir,
       configuredWorkspace: config2.agents.defaults.workspace
@@ -8882,23 +9522,32 @@ ${this.logo} ${APP_NAME4} is ready! (${source})`);
   }
 };
 
+// src/cli/remote/register-remote-commands.ts
+function registerRemoteCommands(program2, runtime2) {
+  const remote = program2.command("remote").description("Manage remote access");
+  remote.command("enable").description("Enable service-managed remote access").option("--api-base <url>", "Platform API base (supports /v1 suffix)").option("--name <name>", "Device display name").action(async (opts) => runtime2.enable(opts));
+  remote.command("disable").description("Disable service-managed remote access").action(async () => runtime2.disable());
+  remote.command("status").description("Show remote access status").option("--json", "Print JSON").action(async (opts) => runtime2.status(opts));
+  remote.command("doctor").description("Run remote access diagnostics").option("--json", "Print JSON").action(async (opts) => runtime2.doctor(opts));
+  remote.command("connect").description("Foreground debug mode: register this machine 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) => runtime2.connect(opts));
+}
+
 // 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_NAME7).description(`${LOGO} ${APP_NAME7} - ${APP_TAGLINE}`).version(getPackageVersion(), "-v, --version", "show version");
+program.command("onboard").description(`Initialize ${APP_NAME7} configuration and workspace`).action(async () => runtime.onboard());
+program.command("init").description(`Initialize ${APP_NAME7} 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_NAME7} 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_NAME7} 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_NAME7} 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_NAME7} 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_NAME7} 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_NAME7} 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_NAME7}`).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];
@@ -8943,6 +9592,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_NAME7} 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_NAME7} 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);