nextclaw 0.13.4 → 0.13.6

package/dist/cli/index.js

@@ -2,11 +2,12 @@
 
 // src/cli/index.ts
 import { Command } from "commander";
-import { APP_NAME as APP_NAME7, APP_TAGLINE } from "@nextclaw/core";
+import { APP_NAME as APP_NAME6, APP_TAGLINE } from "@nextclaw/core";
+import { registerRemoteCommands } from "@nextclaw/remote";
 
 // src/cli/runtime.ts
 import {
-  loadConfig as loadConfig15,
+  loadConfig as loadConfig14,
   saveConfig as saveConfig10,
   getConfigPath as getConfigPath7,
   getDataDir as getDataDir9,
@@ -17,17 +18,18 @@ import {
   AgentLoop,
   ProviderManager as ProviderManager2,
   resolveConfigSecrets as resolveConfigSecrets3,
-  APP_NAME as APP_NAME6,
+  APP_NAME as APP_NAME5,
   DEFAULT_WORKSPACE_DIR,
   DEFAULT_WORKSPACE_PATH
 } from "@nextclaw/core";
+import { RemoteRuntimeActions } from "@nextclaw/remote";
 import {
   getPluginChannelBindings as getPluginChannelBindings4,
   resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints2,
   setPluginRuntimeBridge as setPluginRuntimeBridge2
 } from "@nextclaw/openclaw-compat";
-import { existsSync as existsSync13, mkdirSync as mkdirSync8, readFileSync as readFileSync11, writeFileSync as writeFileSync7 } from "fs";
-import { join as join9, resolve as resolve12 } from "path";
+import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "fs";
+import { join as join8, resolve as resolve12 } from "path";
 import { createInterface as createInterface3 } from "readline";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import { spawn as spawn3 } from "child_process";
@@ -74,9 +76,9 @@ var RestartCoordinator = class {
           message: "Restart already scheduled; skipping duplicate request."
         };
       }
-      const delay2 = typeof request.delayMs === "number" && Number.isFinite(request.delayMs) ? Math.max(0, Math.floor(request.delayMs)) : 100;
+      const delay = typeof request.delayMs === "number" && Number.isFinite(request.delayMs) ? Math.max(0, Math.floor(request.delayMs)) : 100;
       this.exitScheduled = true;
-      this.deps.scheduleProcessExit(delay2, reason);
+      this.deps.scheduleProcessExit(delay, reason);
       return {
         status: "exit-scheduled",
         message: `Restart scheduled (${reason}).`
@@ -3034,541 +3036,72 @@ var PlatformAuthCommands = class {
 };
 
 // src/cli/commands/remote.ts
-import { getConfigPath as getConfigPath4, loadConfig as loadConfig10, saveConfig as saveConfig7 } from "@nextclaw/core";
-import { hostname as hostname3 } from "os";
+import { getConfigPath as getConfigPath4, loadConfig as loadConfig9, saveConfig as saveConfig7 } from "@nextclaw/core";
+import "@nextclaw/remote";
+import { hostname } from "os";
 
-// src/cli/remote/remote-relay-bridge.ts
-import { ensureUiBridgeSecret } from "@nextclaw/server";
-function encodeBase64(bytes) {
-  return Buffer.from(bytes).toString("base64");
-}
-function decodeBase64(base64) {
-  if (!base64) {
-    return new Uint8Array();
-  }
-  return new Uint8Array(Buffer.from(base64, "base64"));
-}
-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
+// src/cli/commands/remote-runtime-support.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 });
-}
-function readJsonFile2(path2) {
-  if (!existsSync6(path2)) {
-    return null;
-  }
-  try {
-    return JSON.parse(readFileSync6(path2, "utf-8"));
-  } catch {
-    return null;
-  }
-}
-function writeJsonFile(path2, value) {
-  ensureDir(dirname2(path2));
-  writeFileSync4(path2, `${JSON.stringify(value, null, 2)}
-`, "utf-8");
-}
-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;
+import {
+  RemoteConnector,
+  RemotePlatformClient,
+  RemoteStatusStore,
+  buildConfiguredRemoteState,
+  resolveRemoteStatusSnapshot
+} from "@nextclaw/remote";
+function createNextclawRemotePlatformClient() {
+  return new RemotePlatformClient({
+    loadConfig: () => loadConfig8(getConfigPath3()),
+    getDataDir: getDataDir4,
+    getPackageVersion,
+    resolvePlatformBase: (rawApiBase) => resolvePlatformApiBase({
+      explicitApiBase: rawApiBase,
+      requireConfigured: true
+    }).platformBase,
+    readManagedServiceState: () => {
+      const state = readServiceState();
+      if (!state) {
+        return null;
+      }
+      return {
+        pid: state.pid,
+        uiPort: state.uiPort
+      };
+    },
+    isProcessRunning
+  });
 }
-function 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 createNextclawRemoteConnector(params = {}) {
+  return new RemoteConnector({
+    platformClient: createNextclawRemotePlatformClient(),
+    logger: params.logger
   });
 }
-function redactWsUrl(url) {
-  try {
-    const parsed = new URL(url);
-    const token = parsed.searchParams.get("token");
-    if (token) {
-      parsed.searchParams.set("token", maskToken(token));
+function createNextclawRemoteStatusStore(mode) {
+  return new RemoteStatusStore(mode, {
+    writeRemoteState: (next) => {
+      updateServiceState((state) => ({
+        ...state,
+        remote: next
+      }));
     }
-    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()) {
-      return existing.deviceInstallId.trim();
-    }
-    const deviceInstallId = crypto.randomUUID();
-    ensureDir(this.remoteDir);
-    writeJsonFile(this.devicePath, { deviceInstallId });
-    return deviceInstallId;
-  }
-  resolvePlatformAccess(opts) {
-    const config2 = loadConfig8(getConfigPath3());
-    const providers = config2.providers;
-    const nextclawProvider = providers.nextclaw;
-    const token = typeof nextclawProvider?.apiKey === "string" ? nextclawProvider.apiKey.trim() : "";
-    if (!token) {
-      throw new Error('NextClaw platform token is missing. Run "nextclaw login" first.');
-    }
-    const configuredApiBase = 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, run nextclaw login, or set remote.platformApiBase.");
-    }
-    const { platformBase } = resolvePlatformApiBase({
-      explicitApiBase: rawApiBase,
-      requireConfigured: true
-    });
-    return { platformBase, token, config: config2 };
-  }
-  resolveLocalOrigin(config2, opts) {
-    const explicitOrigin = normalizeOptionalString3(opts.localOrigin);
-    if (explicitOrigin) {
-      return explicitOrigin.replace(/\/$/, "");
-    }
-    const state = readServiceState();
-    if (state && isProcessRunning(state.pid) && Number.isFinite(state.uiPort)) {
-      return `http://127.0.0.1:${state.uiPort}`;
-    }
-    const configuredPort = typeof config2.ui?.port === "number" && Number.isFinite(config2.ui.port) ? config2.ui.port : 18791;
-    return `http://127.0.0.1:${configuredPort}`;
-  }
-  resolveDisplayName(config2, opts) {
-    return normalizeOptionalString3(opts.name) ?? normalizeOptionalString3(config2.remote.deviceName) ?? hostname();
-  }
-};
-
-// src/cli/remote/remote-connector.ts
-var RemoteConnector = class {
-  constructor(logger = console) {
-    this.logger = logger;
-  }
-  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."));
-      });
-    });
-  }
-  handleSocketMessage(params) {
-    void (async () => {
-      const frame = this.parseRelayFrame(params.data);
-      if (!frame) {
-        return;
-      }
-      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;
-    }
-  }
-  async ensureDevice(params) {
-    if (params.device) {
-      return params.device;
-    }
-    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
-    });
-    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 {
-        await delay(3e3, opts.signal);
-      } catch {
-        break;
-      }
-    }
-    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 buildNextclawConfiguredRemoteState(config2) {
+  return buildConfiguredRemoteState(config2);
 }
-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 readCurrentNextclawRemoteRuntimeState() {
+  return readServiceState()?.remote ?? null;
 }
-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
-  };
+function resolveNextclawRemoteStatusSnapshot(config2) {
+  return resolveRemoteStatusSnapshot({
+    config: config2,
+    currentRemoteState: readCurrentNextclawRemoteRuntimeState()
+  });
 }
-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()
-      }
-    }));
-  }
-};
 
 // src/cli/commands/remote.ts
-function normalizeOptionalString5(value) {
+function normalizeOptionalString3(value) {
   if (typeof value !== "string") {
     return void 0;
   }
@@ -3599,14 +3132,14 @@ async function probeLocalUi(localOrigin) {
 }
 var RemoteCommands = class {
   enableConfig(opts = {}) {
-    const config2 = loadConfig10(getConfigPath4());
+    const config2 = loadConfig9(getConfigPath4());
     const next = {
       ...config2,
       remote: {
         ...config2.remote,
         enabled: true,
-        ...normalizeOptionalString5(opts.apiBase) ? { platformApiBase: normalizeOptionalString5(opts.apiBase) ?? "" } : {},
-        ...normalizeOptionalString5(opts.name) ? { deviceName: normalizeOptionalString5(opts.name) ?? "" } : {}
+        ...normalizeOptionalString3(opts.apiBase) ? { platformApiBase: normalizeOptionalString3(opts.apiBase) ?? "" } : {},
+        ...normalizeOptionalString3(opts.name) ? { deviceName: normalizeOptionalString3(opts.name) ?? "" } : {}
       }
     };
     saveConfig7(next);
@@ -3616,7 +3149,7 @@ var RemoteCommands = class {
     };
   }
   disableConfig() {
-    const config2 = loadConfig10(getConfigPath4());
+    const config2 = loadConfig9(getConfigPath4());
     const next = {
       ...config2,
       remote: {
@@ -3631,15 +3164,15 @@ var RemoteCommands = class {
     };
   }
   async connect(opts = {}) {
-    const connector = new RemoteConnector();
+    const connector = createNextclawRemoteConnector();
     await connector.run({
       ...opts,
       mode: "foreground"
     });
   }
   async status(opts = {}) {
-    const config2 = loadConfig10(getConfigPath4());
-    const snapshot = resolveRemoteStatusSnapshot(config2);
+    const config2 = loadConfig9(getConfigPath4());
+    const snapshot = resolveNextclawRemoteStatusSnapshot(config2);
     if (opts.json) {
       console.log(JSON.stringify(snapshot, null, 2));
       return;
@@ -3649,9 +3182,9 @@ var RemoteCommands = class {
     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(`Device: ${runtime2?.deviceName ?? normalizeOptionalString3(config2.remote.deviceName) ?? hostname()}`);
     console.log(
-      `Platform: ${runtime2?.platformBase ?? normalizeOptionalString5(config2.remote.platformApiBase) ?? normalizeOptionalString5(config2.providers.nextclaw?.apiBase) ?? "not set"}`
+      `Platform: ${runtime2?.platformBase ?? normalizeOptionalString3(config2.remote.platformApiBase) ?? normalizeOptionalString3(config2.providers.nextclaw?.apiBase) ?? "not set"}`
     );
     console.log(`Local origin: ${runtime2?.localOrigin ?? resolveConfiguredLocalOrigin(config2)}`);
     if (runtime2?.deviceId) {
@@ -3665,12 +3198,12 @@ var RemoteCommands = class {
     }
   }
   async doctor(opts = {}) {
-    const config2 = loadConfig10(getConfigPath4());
-    const snapshot = resolveRemoteStatusSnapshot(config2);
+    const config2 = loadConfig9(getConfigPath4());
+    const snapshot = resolveNextclawRemoteStatusSnapshot(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 token = normalizeOptionalString3(config2.providers.nextclaw?.apiKey);
+    const platformApiBase = normalizeOptionalString3(config2.remote.platformApiBase) ?? normalizeOptionalString3(config2.providers.nextclaw?.apiBase);
     const checks = [
       {
         name: "remote-enabled",
@@ -3711,7 +3244,7 @@ var RemoteCommands = class {
 
 // src/cli/commands/diagnostics.ts
 import { createServer as createNetServer } from "net";
-import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
 import { resolve as resolve8 } from "path";
 import {
   APP_NAME as APP_NAME2,
@@ -3719,7 +3252,7 @@ import {
   getDataDir as getDataDir5,
   getWorkspacePath as getWorkspacePath4,
   hasSecretRef,
-  loadConfig as loadConfig11
+  loadConfig as loadConfig10
 } from "@nextclaw/core";
 import { listBuiltinProviders } from "@nextclaw/runtime";
 
@@ -3905,7 +3438,7 @@ var DiagnosticsCommands = class {
   }
   async collectRuntimeStatus(params) {
     const configPath = getConfigPath5();
-    const config2 = loadConfig11();
+    const config2 = loadConfig10();
     const workspacePath = getWorkspacePath4(config2.agents.defaults.workspace);
     const serviceStatePath = resolve8(getDataDir5(), "run", "service.json");
     const fixActions = [];
@@ -3925,7 +3458,7 @@ 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 remote = resolveNextclawRemoteStatusSnapshot(config2);
     const orphanSuspected = !running && configuredHealth.state === "ok";
     const providers = this.listProviderStatuses(config2);
     const issues = [];
@@ -3948,13 +3481,13 @@ var DiagnosticsCommands = class {
     return {
       generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
       configPath,
-      configExists: existsSync7(configPath),
+      configExists: existsSync6(configPath),
       workspacePath,
-      workspaceExists: existsSync7(workspacePath),
+      workspaceExists: existsSync6(workspacePath),
       model: config2.agents.defaults.model,
       providers,
       serviceStatePath,
-      serviceStateExists: existsSync7(serviceStatePath),
+      serviceStateExists: existsSync6(serviceStatePath),
       fixActions,
       process: {
         managedByState,
@@ -4026,11 +3559,11 @@ var DiagnosticsCommands = class {
     });
   }
   collectRuntimeIssues(params) {
-    if (!existsSync7(params.configPath)) {
+    if (!existsSync6(params.configPath)) {
       params.issues.push("Config file is missing.");
       params.recommendations.push(`Run ${APP_NAME2} init to create config files.`);
     }
-    if (!existsSync7(params.workspacePath)) {
+    if (!existsSync6(params.workspacePath)) {
       params.issues.push("Workspace directory does not exist.");
       params.recommendations.push(`Run ${APP_NAME2} init to create workspace templates.`);
     }
@@ -4059,11 +3592,11 @@ var DiagnosticsCommands = class {
     }
   }
   readLogTail(path2, maxLines = 25) {
-    if (!existsSync7(path2)) {
+    if (!existsSync6(path2)) {
       return [];
     }
     try {
-      const lines = readFileSync7(path2, "utf-8").split(/\r?\n/).filter(Boolean);
+      const lines = readFileSync6(path2, "utf-8").split(/\r?\n/).filter(Boolean);
       if (lines.length <= maxLines) {
         return lines;
       }
@@ -4103,8 +3636,8 @@ import {
   stopPluginChannelGateways as stopPluginChannelGateways2
 } from "@nextclaw/openclaw-compat";
 import { startUiServer } from "@nextclaw/server";
-import { appendFileSync, closeSync, cpSync as cpSync2, existsSync as existsSync11, mkdirSync as mkdirSync6, openSync } from "fs";
-import { dirname as dirname3, join as join7, resolve as resolve10 } from "path";
+import { appendFileSync, closeSync, cpSync as cpSync2, existsSync as existsSync10, mkdirSync as mkdirSync5, openSync } from "fs";
+import { dirname as dirname2, join as join6, resolve as resolve10 } from "path";
 import { spawn as spawn2 } from "child_process";
 import { request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
@@ -4113,7 +3646,7 @@ import chokidar from "chokidar";
 
 // src/cli/gateway/controller.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
 import {
   buildConfigSchema,
   ConfigSchema,
@@ -4125,8 +3658,8 @@ var readConfigSnapshot = (getConfigPath8) => {
   const path2 = getConfigPath8();
   let raw = "";
   let parsed = {};
-  if (existsSync8(path2)) {
-    raw = readFileSync8(path2, "utf-8");
+  if (existsSync7(path2)) {
+    raw = readFileSync7(path2, "utf-8");
     try {
       parsed = JSON.parse(raw);
     } catch {
@@ -4233,11 +3766,11 @@ var GatewayControllerImpl = class {
       await this.deps.requestRestart(options);
       return;
     }
-    const delay2 = typeof options?.delayMs === "number" && Number.isFinite(options.delayMs) ? Math.max(0, options.delayMs) : 100;
+    const delay = typeof options?.delayMs === "number" && Number.isFinite(options.delayMs) ? Math.max(0, options.delayMs) : 100;
     console.log(`Gateway restart requested via tool${options?.reason ? ` (${options.reason})` : ""}.`);
     setTimeout(() => {
       process.exit(0);
-    }, delay2);
+    }, delay);
   }
   status() {
     return {
@@ -4583,9 +4116,9 @@ var MissingProvider = class extends LLMProvider {
 };
 
 // src/cli/commands/service-marketplace-installer.ts
-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";
+import { getWorkspacePath as getWorkspacePath5, loadConfig as loadConfig12 } from "@nextclaw/core";
+import { existsSync as existsSync8, rmSync as rmSync4 } from "fs";
+import { join as join4 } from "path";
 
 // src/cli/commands/service-marketplace-helpers.ts
 var containsAbsoluteFsPath = (line) => {
@@ -4633,7 +4166,7 @@ var buildMarketplaceSkillInstallArgs = (params) => {
 };
 
 // src/cli/commands/service-mcp-marketplace-ops.ts
-import { loadConfig as loadConfig12, saveConfig as saveConfig8 } from "@nextclaw/core";
+import { loadConfig as loadConfig11, saveConfig as saveConfig8 } from "@nextclaw/core";
 import { McpDoctorFacade as McpDoctorFacade2, McpMutationService as McpMutationService2 } from "@nextclaw/mcp";
 var ServiceMcpMarketplaceOps = class {
   constructor(options) {
@@ -4701,13 +4234,13 @@ var ServiceMcpMarketplaceOps = class {
   }
   createMutationService() {
     return new McpMutationService2({
-      getConfig: () => loadConfig12(),
+      getConfig: () => loadConfig11(),
       saveConfig: (config2) => saveConfig8(config2)
     });
   }
   createDoctorFacade() {
     return new McpDoctorFacade2({
-      getConfig: () => loadConfig12()
+      getConfig: () => loadConfig11()
     });
   }
 };
@@ -4748,7 +4281,7 @@ var ServiceMarketplaceInstaller = class {
     if (params.kind && params.kind !== "marketplace") {
       throw new Error(`Unsupported marketplace skill kind: ${params.kind}`);
     }
-    const workspace = getWorkspacePath5(loadConfig13().agents.defaults.workspace);
+    const workspace = getWorkspacePath5(loadConfig12().agents.defaults.workspace);
     const args = buildMarketplaceSkillInstallArgs({
       slug: params.slug,
       workspace,
@@ -4787,9 +4320,9 @@ var ServiceMarketplaceInstaller = class {
     return { message: result.message };
   }
   async uninstallSkill(slug) {
-    const workspace = getWorkspacePath5(loadConfig13().agents.defaults.workspace);
-    const targetDir = join5(workspace, "skills", slug);
-    if (!existsSync9(targetDir)) {
+    const workspace = getWorkspacePath5(loadConfig12().agents.defaults.workspace);
+    const targetDir = join4(workspace, "skills", slug);
+    if (!existsSync8(targetDir)) {
       throw new Error(`Skill not installed in workspace: ${slug}`);
     }
     rmSync4(targetDir, { recursive: true, force: true });
@@ -5922,7 +5455,7 @@ function resolveRequestedToolNames(metadata) {
     )
   );
 }
-function normalizeOptionalString6(value) {
+function normalizeOptionalString4(value) {
   return normalizeString(value) ?? void 0;
 }
 function readMetadataModel(metadata) {
@@ -6042,7 +5575,7 @@ var NextclawNcpContextBuilder = class {
     if (inboundModel) {
       session.metadata.preferred_model = inboundModel;
     }
-    const effectiveModel = normalizeOptionalString6(session.metadata.preferred_model) ?? profile.model;
+    const effectiveModel = normalizeOptionalString4(session.metadata.preferred_model) ?? profile.model;
     const clearThinking = requestMetadata.clear_thinking === true || requestMetadata.reset_thinking === true;
     if (clearThinking) {
       delete session.metadata.preferred_thinking;
@@ -6059,8 +5592,8 @@ var NextclawNcpContextBuilder = class {
       model: effectiveModel,
       sessionThinkingLevel: parseThinkingLevel(session.metadata.preferred_thinking) ?? null
     });
-    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";
+    const channel = normalizeOptionalString4(requestMetadata.channel) ?? normalizeOptionalString4(session.metadata.last_channel) ?? "ui";
+    const chatId = normalizeOptionalString4(requestMetadata.chatId) ?? normalizeOptionalString4(requestMetadata.chat_id) ?? normalizeOptionalString4(session.metadata.last_to) ?? "web-ui";
     session.metadata.last_channel = channel;
     session.metadata.last_to = chatId;
     const requestedSkillNames = resolveRequestedSkillNames(requestMetadata);
@@ -6778,70 +6311,8 @@ 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
+import { RemoteServiceModule } from "@nextclaw/remote";
 function createManagedRemoteModule(params) {
   if (!params.config.ui.enabled) {
     return null;
@@ -6849,6 +6320,8 @@ function createManagedRemoteModule(params) {
   return new RemoteServiceModule({
     config: params.config,
     localOrigin: params.localOrigin,
+    statusStore: createNextclawRemoteStatusStore("service"),
+    createConnector: (logger) => createNextclawRemoteConnector({ logger }),
     logger: {
       info: (message) => console.log(`[remote] ${message}`),
       warn: (message) => console.warn(`[remote] ${message}`),
@@ -6868,7 +6341,7 @@ function writeInitialManagedServiceState(params) {
     startupLastProbeError: null,
     startupTimeoutMs: params.readinessTimeoutMs,
     startupCheckedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    ...params.config.remote.enabled ? { remote: buildConfiguredRemoteState(params.config) } : {}
+    ...params.config.remote.enabled ? { remote: buildNextclawConfiguredRemoteState(params.config) } : {}
   });
 }
 function writeReadyManagedServiceState(params) {
@@ -6892,14 +6365,14 @@ function writeReadyManagedServiceState(params) {
 }
 
 // src/cli/commands/ui-chat-run-coordinator.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync5, readdirSync as readdirSync2, readFileSync as readFileSync9, writeFileSync as writeFileSync5 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync4, readdirSync as readdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync4 } from "fs";
+import { join as join5 } from "path";
 import {
   getDataDir as getDataDir6,
   parseAgentScopedSessionKey as parseAgentScopedSessionKey2,
   safeFilename
 } from "@nextclaw/core";
-var RUNS_DIR = join6(getDataDir6(), "runs");
+var RUNS_DIR = join5(getDataDir6(), "runs");
 var NON_TERMINAL_STATES = /* @__PURE__ */ new Set(["queued", "running"]);
 var DEFAULT_SESSION_TYPE = "native";
 var SESSION_TYPE_METADATA_KEY = "session_type";
@@ -6958,7 +6431,7 @@ function hasToolSessionEvent(run) {
 var UiChatRunCoordinator = class {
   constructor(options) {
     this.options = options;
-    mkdirSync5(RUNS_DIR, { recursive: true });
+    mkdirSync4(RUNS_DIR, { recursive: true });
     this.loadPersistedRuns();
   }
   runs = /* @__PURE__ */ new Map();
@@ -7425,7 +6898,7 @@ var UiChatRunCoordinator = class {
     };
   }
   getRunPath(runId) {
-    return join6(RUNS_DIR, `${safeFilename(runId)}.json`);
+    return join5(RUNS_DIR, `${safeFilename(runId)}.json`);
   }
   persistRun(run) {
     const persisted = {
@@ -7443,20 +6916,20 @@ var UiChatRunCoordinator = class {
       ...typeof run.reply === "string" ? { reply: run.reply } : {},
       events: run.events
     };
-    writeFileSync5(this.getRunPath(run.runId), `${JSON.stringify(persisted, null, 2)}
+    writeFileSync4(this.getRunPath(run.runId), `${JSON.stringify(persisted, null, 2)}
 `);
   }
   loadPersistedRuns() {
-    if (!existsSync10(RUNS_DIR)) {
+    if (!existsSync9(RUNS_DIR)) {
       return;
     }
     for (const entry of readdirSync2(RUNS_DIR, { withFileTypes: true })) {
       if (!entry.isFile() || !entry.name.endsWith(".json")) {
         continue;
       }
-      const path2 = join6(RUNS_DIR, entry.name);
+      const path2 = join5(RUNS_DIR, entry.name);
       try {
-        const parsed = JSON.parse(readFileSync9(path2, "utf-8"));
+        const parsed = JSON.parse(readFileSync8(path2, "utf-8"));
         const runId = readOptionalString(parsed.runId);
         const sessionKey = readOptionalString(parsed.sessionKey);
         if (!runId || !sessionKey) {
@@ -7522,7 +6995,7 @@ var {
   getWorkspacePath: getWorkspacePath9,
   HeartbeatService,
   LiteLLMProvider,
-  loadConfig: loadConfig14,
+  loadConfig: loadConfig13,
   MessageBus,
   ProviderManager,
   resolveConfigSecrets: resolveConfigSecrets2,
@@ -7547,7 +7020,7 @@ var ServiceCommands = class {
     this.applyLiveConfigReload = null;
     this.liveUiNcpAgent = null;
     const runtimeConfigPath = getConfigPath6();
-    const config2 = resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath });
+    const config2 = resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath });
     const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
     let pluginRegistry = loadPluginRegistry(config2, workspace);
     let extensionRegistry = toExtensionRegistry(pluginRegistry);
@@ -7560,7 +7033,7 @@ var ServiceCommands = class {
     });
     const sessionManager = new SessionManager(workspace);
     let pluginGatewayHandles = [];
-    const cronStorePath = join7(getDataDir7(), "cron", "jobs.json");
+    const cronStorePath = join6(getDataDir7(), "cron", "jobs.json");
     const cron2 = new CronService2(cronStorePath);
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiStaticDir = options.uiStaticDir === void 0 ? resolveUiStaticDir() : options.uiStaticDir;
@@ -7576,7 +7049,7 @@ var ServiceCommands = class {
       sessionManager,
       providerManager,
       makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }) ?? this.makeMissingProvider(nextConfig),
-      loadConfig: () => resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
+      loadConfig: () => resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }),
       getExtensionChannels: () => extensionRegistry.channels,
       onRestartRequired: (paths) => {
         void this.deps.requestRestart({
@@ -7587,7 +7060,7 @@ var ServiceCommands = class {
       }
     });
     this.applyLiveConfigReload = async () => {
-      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }));
+      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }));
     };
     const gatewayController = new GatewayControllerImpl({
       reloader,
@@ -7620,7 +7093,7 @@ var ServiceCommands = class {
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }),
         accountId
       })
     });
@@ -7653,12 +7126,12 @@ var ServiceCommands = class {
     });
     let pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
     setPluginRuntimeBridge({
-      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }), pluginChannelBindings),
+      loadConfig: () => toPluginConfigView(resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }), pluginChannelBindings),
       writeConfigFile: async (nextConfigView) => {
         if (!nextConfigView || typeof nextConfigView !== "object" || Array.isArray(nextConfigView)) {
           throw new Error("plugin runtime writeConfigFile expects an object config");
         }
-        const current = loadConfig14();
+        const current = loadConfig13();
         const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
         saveConfig9(next);
       },
@@ -7734,12 +7207,12 @@ var ServiceCommands = class {
       providerManager,
       bus,
       gatewayController,
-      () => resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
+      () => resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }),
       () => extensionRegistry,
       ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets2(loadConfig13(), { configPath: runtimeConfigPath }),
         accountId
       })
     );
@@ -7898,7 +7371,7 @@ var ServiceCommands = class {
     });
   }
   async runForeground(options) {
-    const config2 = loadConfig14();
+    const config2 = loadConfig13();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (options.open) {
@@ -7911,7 +7384,7 @@ var ServiceCommands = class {
     });
   }
   async startService(options) {
-    const config2 = loadConfig14();
+    const config2 = loadConfig13();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     const apiUrl = `${uiUrl}/api`;
@@ -7972,7 +7445,7 @@ var ServiceCommands = class {
     }
     const logPath = resolveServiceLogPath();
     const logDir = resolve10(logPath, "..");
-    mkdirSync6(logDir, { recursive: true });
+    mkdirSync5(logDir, { recursive: true });
     const logFd = openSync(logPath, "a");
     const readinessTimeoutMs = this.resolveStartupTimeoutMs(options.startupTimeoutMs);
     const quickPhaseTimeoutMs = Math.min(8e3, readinessTimeoutMs);
@@ -8534,10 +8007,10 @@ var ServiceCommands = class {
     }
   }
   installBuiltinMarketplaceSkill(slug, force) {
-    const workspace = getWorkspacePath9(loadConfig14().agents.defaults.workspace);
-    const destination = join7(workspace, "skills", slug);
-    const destinationSkillFile = join7(destination, "SKILL.md");
-    if (existsSync11(destinationSkillFile) && !force) {
+    const workspace = getWorkspacePath9(loadConfig13().agents.defaults.workspace);
+    const destination = join6(workspace, "skills", slug);
+    const destinationSkillFile = join6(destination, "SKILL.md");
+    if (existsSync10(destinationSkillFile) && !force) {
       return {
         message: `${slug} is already installed`
       };
@@ -8545,15 +8018,15 @@ var ServiceCommands = class {
     const loader = createSkillsLoader(workspace);
     const builtin = (loader?.listSkills(false) ?? []).find((skill) => skill.name === slug && skill.source === "builtin");
     if (!builtin) {
-      if (existsSync11(destinationSkillFile)) {
+      if (existsSync10(destinationSkillFile)) {
         return {
           message: `${slug} is already installed`
         };
       }
       return null;
     }
-    mkdirSync6(join7(workspace, "skills"), { recursive: true });
-    cpSync2(dirname3(builtin.path), destination, { recursive: true, force: true });
+    mkdirSync5(join6(workspace, "skills"), { recursive: true });
+    cpSync2(dirname2(builtin.path), destination, { recursive: true, force: true });
     return {
       message: `Installed skill: ${slug}`
     };
@@ -8611,58 +8084,12 @@ ${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 { cpSync as cpSync3, existsSync as existsSync11, mkdirSync as mkdirSync6, readFileSync as readFileSync9, readdirSync as readdirSync3, rmSync as rmSync5, writeFileSync as writeFileSync5 } from "fs";
 import { createRequire as createRequire2 } from "module";
-import { dirname as dirname4, join as join8, resolve as resolve11 } from "path";
+import { dirname as dirname3, join as join7, resolve as resolve11 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
-import { APP_NAME as APP_NAME5, getDataDir as getDataDir8 } from "@nextclaw/core";
+import { APP_NAME as APP_NAME4, getDataDir as getDataDir8 } from "@nextclaw/core";
 import { spawnSync as spawnSync3 } from "child_process";
 var WorkspaceManager = class {
   constructor(logo) {
@@ -8690,30 +8117,30 @@ var WorkspaceManager = class {
       { source: "memory/MEMORY.md", target: "memory/MEMORY.md" }
     ];
     for (const entry of templateFiles) {
-      const filePath = join8(workspace, entry.target);
-      if (!force && existsSync12(filePath)) {
+      const filePath = join7(workspace, entry.target);
+      if (!force && existsSync11(filePath)) {
         continue;
       }
-      const templatePath = join8(templateDir, entry.source);
-      if (!existsSync12(templatePath)) {
+      const templatePath = join7(templateDir, entry.source);
+      if (!existsSync11(templatePath)) {
         console.warn(`Warning: Template file missing: ${templatePath}`);
         continue;
       }
-      const raw = readFileSync10(templatePath, "utf-8");
-      const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME5);
-      mkdirSync7(dirname4(filePath), { recursive: true });
-      writeFileSync6(filePath, content);
+      const raw = readFileSync9(templatePath, "utf-8");
+      const content = raw.replace(/\$\{APP_NAME\}/g, APP_NAME4);
+      mkdirSync6(dirname3(filePath), { recursive: true });
+      writeFileSync5(filePath, content);
       created.push(entry.target);
     }
-    const memoryDir = join8(workspace, "memory");
-    if (!existsSync12(memoryDir)) {
-      mkdirSync7(memoryDir, { recursive: true });
-      created.push(join8("memory", ""));
+    const memoryDir = join7(workspace, "memory");
+    if (!existsSync11(memoryDir)) {
+      mkdirSync6(memoryDir, { recursive: true });
+      created.push(join7("memory", ""));
     }
-    const skillsDir = join8(workspace, "skills");
-    if (!existsSync12(skillsDir)) {
-      mkdirSync7(skillsDir, { recursive: true });
-      created.push(join8("skills", ""));
+    const skillsDir = join7(workspace, "skills");
+    if (!existsSync11(skillsDir)) {
+      mkdirSync6(skillsDir, { recursive: true });
+      created.push(join7("skills", ""));
     }
     const seeded = this.seedBuiltinSkills(skillsDir, { force });
     if (seeded > 0) {
@@ -8732,12 +8159,12 @@ var WorkspaceManager = class {
       if (!entry.isDirectory()) {
         continue;
       }
-      const src = join8(sourceDir, entry.name);
-      if (!existsSync12(join8(src, "SKILL.md"))) {
+      const src = join7(sourceDir, entry.name);
+      if (!existsSync11(join7(src, "SKILL.md"))) {
         continue;
       }
-      const dest = join8(targetDir, entry.name);
-      if (!force && existsSync12(dest)) {
+      const dest = join7(targetDir, entry.name);
+      if (!force && existsSync11(dest)) {
         continue;
       }
       try {
@@ -8754,13 +8181,13 @@ var WorkspaceManager = class {
     try {
       const require3 = createRequire2(import.meta.url);
       const entry = require3.resolve("@nextclaw/core");
-      const pkgRoot = resolve11(dirname4(entry), "..");
-      const distSkills = join8(pkgRoot, "dist", "skills");
-      if (existsSync12(distSkills)) {
+      const pkgRoot = resolve11(dirname3(entry), "..");
+      const distSkills = join7(pkgRoot, "dist", "skills");
+      if (existsSync11(distSkills)) {
         return distSkills;
       }
-      const srcSkills = join8(pkgRoot, "src", "agent", "skills");
-      if (existsSync12(srcSkills)) {
+      const srcSkills = join7(pkgRoot, "src", "agent", "skills");
+      if (existsSync11(srcSkills)) {
         return srcSkills;
       }
       return null;
@@ -8775,17 +8202,17 @@ var WorkspaceManager = class {
     }
     const cliDir = resolve11(fileURLToPath4(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
-    const candidates = [join8(pkgRoot, "templates")];
+    const candidates = [join7(pkgRoot, "templates")];
     for (const candidate of candidates) {
-      if (existsSync12(candidate)) {
+      if (existsSync11(candidate)) {
         return candidate;
       }
     }
     return null;
   }
   getBridgeDir() {
-    const userBridge = join8(getDataDir8(), "bridge");
-    if (existsSync12(join8(userBridge, "dist", "index.js"))) {
+    const userBridge = join7(getDataDir8(), "bridge");
+    if (existsSync11(join7(userBridge, "dist", "index.js"))) {
       return userBridge;
     }
     if (!which("npm")) {
@@ -8794,21 +8221,21 @@ var WorkspaceManager = class {
     }
     const cliDir = resolve11(fileURLToPath4(new URL(".", import.meta.url)));
     const pkgRoot = resolve11(cliDir, "..", "..");
-    const pkgBridge = join8(pkgRoot, "bridge");
-    const srcBridge = join8(pkgRoot, "..", "..", "bridge");
+    const pkgBridge = join7(pkgRoot, "bridge");
+    const srcBridge = join7(pkgRoot, "..", "..", "bridge");
     let source = null;
-    if (existsSync12(join8(pkgBridge, "package.json"))) {
+    if (existsSync11(join7(pkgBridge, "package.json"))) {
       source = pkgBridge;
-    } else if (existsSync12(join8(srcBridge, "package.json"))) {
+    } else if (existsSync11(join7(srcBridge, "package.json"))) {
       source = srcBridge;
     }
     if (!source) {
-      console.error(`Bridge source not found. Try reinstalling ${APP_NAME5}.`);
+      console.error(`Bridge source not found. Try reinstalling ${APP_NAME4}.`);
       process.exit(1);
     }
     console.log(`${this.logo} Setting up bridge...`);
-    mkdirSync7(resolve11(userBridge, ".."), { recursive: true });
-    if (existsSync12(userBridge)) {
+    mkdirSync6(resolve11(userBridge, ".."), { recursive: true });
+    if (existsSync11(userBridge)) {
       rmSync5(userBridge, { recursive: true, force: true });
     }
     cpSync3(source, userBridge, {
@@ -8886,9 +8313,14 @@ var CliRuntime = class {
     this.platformAuthCommands = new PlatformAuthCommands();
     this.remoteCommands = new RemoteCommands();
     this.remote = new RemoteRuntimeActions({
+      appName: APP_NAME5,
       initAuto: (source) => this.init({ source, auto: true }),
       remoteCommands: this.remoteCommands,
-      restartBackgroundService: (reason) => this.restartBackgroundService(reason)
+      restartBackgroundService: (reason) => this.restartBackgroundService(reason),
+      hasRunningManagedService: () => {
+        const state = readServiceState();
+        return Boolean(state && isProcessRunning(state.pid));
+      }
     });
     this.diagnosticsCommands = new DiagnosticsCommands({ logo: this.logo });
     this.restartCoordinator = new RestartCoordinator({
@@ -8920,7 +8352,7 @@ var CliRuntime = class {
       const uiHost = FORCED_PUBLIC_UI_HOST;
       const uiPort = typeof state.uiPort === "number" && Number.isFinite(state.uiPort) ? state.uiPort : 18791;
       console.log(
-        `Applying changes (${reason}): restarting ${APP_NAME6} background service...`
+        `Applying changes (${reason}): restarting ${APP_NAME5} background service...`
       );
       await this.serviceCommands.stopService();
       await this.serviceCommands.startService({
@@ -9075,7 +8507,7 @@ var CliRuntime = class {
   }
   async onboard() {
     console.warn(
-      `Warning: ${APP_NAME6} onboard is deprecated. Use "${APP_NAME6} init" instead.`
+      `Warning: ${APP_NAME5} onboard is deprecated. Use "${APP_NAME5} init" instead.`
     );
     await this.init({ source: "onboard" });
   }
@@ -9085,16 +8517,16 @@ var CliRuntime = class {
     const force = Boolean(options.force);
     const configPath = getConfigPath7();
     let createdConfig = false;
-    if (!existsSync13(configPath)) {
+    if (!existsSync12(configPath)) {
       const config3 = ConfigSchema2.parse({});
       saveConfig10(config3);
       createdConfig = true;
     }
-    const config2 = loadConfig15();
+    const config2 = loadConfig14();
     const workspaceSetting = config2.agents.defaults.workspace;
-    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join9(getDataDir9(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
-    const workspaceExisted = existsSync13(workspacePath);
-    mkdirSync8(workspacePath, { recursive: true });
+    const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join8(getDataDir9(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
+    const workspaceExisted = existsSync12(workspacePath);
+    mkdirSync7(workspacePath, { recursive: true });
     const templateResult = this.workspaceManager.createWorkspaceTemplates(
       workspacePath,
       { force }
@@ -9113,13 +8545,13 @@ var CliRuntime = class {
     }
     if (!options.auto) {
       console.log(`
-${this.logo} ${APP_NAME6} is ready! (${source})`);
+${this.logo} ${APP_NAME5} is ready! (${source})`);
       console.log("\nNext steps:");
       console.log(`  1. Add your API key to ${configPath}`);
-      console.log(`  2. Chat: ${APP_NAME6} agent -m "Hello!"`);
+      console.log(`  2. Chat: ${APP_NAME5} agent -m "Hello!"`);
     } else {
       console.log(
-        `Tip: Run "${APP_NAME6} init${force ? " --force" : ""}" to re-run initialization if needed.`
+        `Tip: Run "${APP_NAME5} init${force ? " --force" : ""}" to re-run initialization if needed.`
       );
     }
   }
@@ -9177,7 +8609,7 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
     await this.writeRestartSentinelFromExecContext("cli.restart");
     const state = readServiceState();
     if (state && isProcessRunning(state.pid)) {
-      console.log(`Restarting ${APP_NAME6}...`);
+      console.log(`Restarting ${APP_NAME5}...`);
       await this.serviceCommands.stopService();
     } else if (state) {
       clearServiceState();
@@ -9217,7 +8649,7 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
   }
   async agent(opts) {
     const configPath = getConfigPath7();
-    const config2 = resolveConfigSecrets3(loadConfig15(), { configPath });
+    const config2 = resolveConfigSecrets3(loadConfig14(), { configPath });
     const workspace = getWorkspacePath10(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
@@ -9225,7 +8657,7 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
     const pluginChannelBindings = getPluginChannelBindings4(pluginRegistry);
     setPluginRuntimeBridge2({
       loadConfig: () => toPluginConfigView(
-        resolveConfigSecrets3(loadConfig15(), { configPath }),
+        resolveConfigSecrets3(loadConfig14(), { configPath }),
         pluginChannelBindings
       ),
       writeConfigFile: async (nextConfigView) => {
@@ -9234,7 +8666,7 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
             "plugin runtime writeConfigFile expects an object config"
           );
         }
-        const current = loadConfig15();
+        const current = loadConfig14();
         const next = mergePluginConfigView(
           current,
           nextConfigView,
@@ -9266,7 +8698,7 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
           registry: pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets3(loadConfig15(), { configPath }),
+          cfg: resolveConfigSecrets3(loadConfig14(), { configPath }),
           accountId
         })
       });
@@ -9285,10 +8717,10 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
         `${this.logo} Interactive mode (type exit or Ctrl+C to quit)
 `
       );
-      const historyFile = join9(getDataDir9(), "history", "cli_history");
+      const historyFile = join8(getDataDir9(), "history", "cli_history");
       const historyDir = resolve12(historyFile, "..");
-      mkdirSync8(historyDir, { recursive: true });
-      const history = existsSync13(historyFile) ? readFileSync11(historyFile, "utf-8").split("\n").filter(Boolean) : [];
+      mkdirSync7(historyDir, { recursive: true });
+      const history = existsSync12(historyFile) ? readFileSync10(historyFile, "utf-8").split("\n").filter(Boolean) : [];
       const rl = createInterface3({
         input: process.stdin,
         output: process.stdout
@@ -9297,7 +8729,7 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
         const merged = history.concat(
           rl.history ?? []
         );
-        writeFileSync7(historyFile, merged.join("\n"));
+        writeFileSync6(historyFile, merged.join("\n"));
         process.exit(0);
       });
       let running = true;
@@ -9367,7 +8799,7 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
     }
     const state = readServiceState();
     if (state && isProcessRunning(state.pid)) {
-      console.log(`Tip: restart ${APP_NAME6} to apply the update.`);
+      console.log(`Tip: restart ${APP_NAME5} to apply the update.`);
     }
   }
   pluginsList(opts = {}) {
@@ -9461,7 +8893,7 @@ ${this.logo} ${APP_NAME6} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const config2 = loadConfig15();
+    const config2 = loadConfig14();
     const workdir = resolveSkillsInstallWorkdir({
       explicitWorkdir: options.workdir,
       configuredWorkspace: config2.agents.defaults.workspace
@@ -9522,32 +8954,22 @@ ${this.logo} ${APP_NAME6} 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_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.name(APP_NAME6).description(`${LOGO} ${APP_NAME6} - ${APP_TAGLINE}`).version(getPackageVersion(), "-v, --version", "show version");
+program.command("onboard").description(`Initialize ${APP_NAME6} configuration and workspace`).action(async () => runtime.onboard());
+program.command("init").description(`Initialize ${APP_NAME6} configuration and workspace`).option("-f, --force", "Overwrite existing template files").action(async (opts) => runtime.init({ force: Boolean(opts.force) }));
 program.command("login").description("Login to NextClaw platform and save token into providers.nextclaw.apiKey").option("--api-base <url>", "Platform API base (supports /v1 suffix)").option("--email <email>", "Login email").option("--password <password>", "Login password").option("--register", "Register first, then login", false).action(async (opts) => runtime.login(opts));
 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("gateway").description(`Start the ${APP_NAME6} gateway`).option("-p, --port <port>", "Gateway port", "18790").option("-v, --verbose", "Verbose output", false).option("--ui", "Enable UI server", false).option("--ui-port <port>", "UI port").option("--ui-open", "Open browser when UI starts", false).action(async (opts) => runtime.gateway(opts));
+program.command("ui").description(`Start the ${APP_NAME6} UI with gateway`).option("--port <port>", "UI port").option("--no-open", "Disable opening browser").action(async (opts) => runtime.ui(opts));
+program.command("start").description(`Start the ${APP_NAME6} gateway + UI in the background`).option("--ui-port <port>", "UI port").option("--start-timeout <ms>", "Maximum wait time for startup readiness in milliseconds").option("--open", "Open browser after start", false).action(async (opts) => runtime.start(opts));
+program.command("restart").description(`Restart the ${APP_NAME6} background service`).option("--ui-port <port>", "UI port").option("--start-timeout <ms>", "Maximum wait time for startup readiness in milliseconds").option("--open", "Open browser after restart", false).action(async (opts) => runtime.restart(opts));
+program.command("serve").description(`Run the ${APP_NAME6} gateway + UI in the foreground`).option("--ui-port <port>", "UI port").option("--open", "Open browser after start", false).action(async (opts) => runtime.serve(opts));
+program.command("stop").description(`Stop the ${APP_NAME6} background service`).action(async () => runtime.stop());
 program.command("agent").description("Interact with the agent directly").option("-m, --message <message>", "Message to send to the agent").option("-s, --session <session>", "Session ID", "cli:default").option("--model <model>", "Session model override for this run").option("--no-markdown", "Disable Markdown rendering").action(async (opts) => runtime.agent(opts));
-program.command("update").description(`Update ${APP_NAME7}`).option("--timeout <ms>", "Update command timeout in milliseconds").action(async (opts) => runtime.update(opts));
+program.command("update").description(`Update ${APP_NAME6}`).option("--timeout <ms>", "Update command timeout in milliseconds").action(async (opts) => runtime.update(opts));
 var skills = program.command("skills").description("Manage skills");
 skills.command("install <slug>").description("Install a skill from NextClaw marketplace").option("--api-base <url>", "Marketplace API base URL").option("--workdir <dir>", "Workspace directory to install into").option("--dir <dir>", "Skills directory name (default: skills)").option("-f, --force", "Overwrite existing skill files", false).action(async (slug, opts) => runtime.skillsInstall({ slug, ...opts, apiBaseUrl: opts.apiBase }));
 var withRepeatableTag = (value, previous = []) => [...previous, value];
@@ -9592,6 +9014,6 @@ cron.command("add").requiredOption("-n, --name <name>", "Job name").requiredOpti
 cron.command("remove <jobId>").action((jobId) => runtime.cronRemove(jobId));
 cron.command("enable <jobId>").option("--disable", "Disable instead of enable").action((jobId, opts) => runtime.cronEnable(jobId, opts));
 cron.command("run <jobId>").option("-f, --force", "Run even if disabled").action(async (jobId, opts) => runtime.cronRun(jobId, opts));
-program.command("status").description(`Show ${APP_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.command("status").description(`Show ${APP_NAME6} status`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.status(opts));
+program.command("doctor").description(`Run ${APP_NAME6} diagnostics`).option("--json", "Output JSON", false).option("--verbose", "Show extra diagnostics", false).option("--fix", "Fix stale service state when safe", false).action(async (opts) => runtime.doctor(opts));
 program.parseAsync(process.argv);