nextclaw 0.13.17 → 0.13.20

package/dist/cli/index.js

@@ -7,9 +7,9 @@ import { registerRemoteCommands } from "@nextclaw/remote";
 
 // src/cli/runtime.ts
 import {
-  loadConfig as loadConfig15,
-  saveConfig as saveConfig10,
-  getConfigPath as getConfigPath8,
+  loadConfig as loadConfig17,
+  saveConfig as saveConfig11,
+  getConfigPath as getConfigPath9,
   getDataDir as getDataDir9,
   ConfigSchema as ConfigSchema2,
   getWorkspacePath as getWorkspacePath10,
@@ -17,7 +17,7 @@ import {
   MessageBus as MessageBus2,
   AgentLoop,
   ProviderManager as ProviderManager2,
-  resolveConfigSecrets as resolveConfigSecrets3,
+  resolveConfigSecrets as resolveConfigSecrets4,
   APP_NAME as APP_NAME5,
   DEFAULT_WORKSPACE_DIR,
   DEFAULT_WORKSPACE_PATH
@@ -26,7 +26,7 @@ import { RemoteRuntimeActions } from "@nextclaw/remote";
 import {
   getPluginChannelBindings as getPluginChannelBindings4,
   resolvePluginChannelMessageToolHints as resolvePluginChannelMessageToolHints2,
-  setPluginRuntimeBridge as setPluginRuntimeBridge2
+  setPluginRuntimeBridge as setPluginRuntimeBridge3
 } from "@nextclaw/openclaw-compat";
 import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync6 } from "fs";
 import { join as join8, resolve as resolve12 } from "path";
@@ -3183,6 +3183,7 @@ import {
   buildConfiguredRemoteState,
   resolveRemoteStatusSnapshot
 } from "@nextclaw/remote";
+var currentProcessRemoteRuntimeState = null;
 function hasRunningNextclawManagedService() {
   const state = readServiceState();
   return Boolean(state && isProcessRunning(state.pid));
@@ -3218,6 +3219,11 @@ function createNextclawRemoteConnector(params = {}) {
 function createNextclawRemoteStatusStore(mode) {
   return new RemoteStatusStore(mode, {
     writeRemoteState: (next) => {
+      currentProcessRemoteRuntimeState = next;
+      const serviceState = readServiceState();
+      if (!serviceState || serviceState.pid !== process.pid) {
+        return;
+      }
       updateServiceState((state) => ({
         ...state,
         remote: next
@@ -3229,7 +3235,7 @@ function buildNextclawConfiguredRemoteState(config2) {
   return buildConfiguredRemoteState(config2);
 }
 function readCurrentNextclawRemoteRuntimeState() {
-  return readServiceState()?.remote ?? null;
+  return currentProcessRemoteRuntimeState ?? readServiceState()?.remote ?? null;
 }
 function resolveNextclawRemoteStatusSnapshot(config2) {
   return resolveRemoteStatusSnapshot({
@@ -3272,6 +3278,9 @@ async function probeLocalUi(localOrigin) {
   }
 }
 var RemoteCommands = class {
+  constructor(deps = {}) {
+    this.deps = deps;
+  }
   updateConfig(params = {}) {
     const config2 = loadConfig9(getConfigPath4());
     const nextEnabled = typeof params.enabled === "boolean" ? params.enabled : config2.remote.enabled;
@@ -3312,10 +3321,11 @@ var RemoteCommands = class {
   getStatusView() {
     const config2 = loadConfig9(getConfigPath4());
     const snapshot = resolveNextclawRemoteStatusSnapshot(config2);
+    const resolvedLocalOrigin = snapshot.runtime?.localOrigin ?? this.deps.currentLocalOrigin ?? resolveConfiguredLocalOrigin(config2);
     return {
       configuredEnabled: snapshot.configuredEnabled,
       runtime: snapshot.runtime,
-      localOrigin: resolveConfiguredLocalOrigin(config2),
+      localOrigin: resolvedLocalOrigin,
       deviceName: snapshot.runtime?.deviceName ?? normalizeOptionalString3(config2.remote.deviceName) ?? hostname(),
       platformBase: snapshot.runtime?.platformBase ?? normalizeOptionalString3(config2.remote.platformApiBase) ?? normalizeOptionalString3(config2.providers.nextclaw?.apiBase) ?? null
     };
@@ -3347,7 +3357,7 @@ var RemoteCommands = class {
   async getDoctorView() {
     const config2 = loadConfig9(getConfigPath4());
     const snapshot = resolveNextclawRemoteStatusSnapshot(config2);
-    const localOrigin = resolveConfiguredLocalOrigin(config2);
+    const localOrigin = snapshot.runtime?.localOrigin ?? this.deps.currentLocalOrigin ?? resolveConfiguredLocalOrigin(config2);
     const localUi = await probeLocalUi(localOrigin);
     const token = normalizeOptionalString3(config2.providers.nextclaw?.apiKey);
     const platformApiBase = normalizeOptionalString3(config2.remote.platformApiBase) ?? normalizeOptionalString3(config2.providers.nextclaw?.apiBase);
@@ -3699,6 +3709,9 @@ var DiagnosticsCommands = class {
       if (!provider) {
         return { name: spec.displayName ?? spec.name, configured: false, detail: "missing config" };
       }
+      if (provider.enabled === false) {
+        return { name: spec.displayName ?? spec.name, configured: false, detail: "disabled" };
+      }
       if (spec.isLocal) {
         return {
           name: spec.displayName ?? spec.name,
@@ -3786,7 +3799,7 @@ import * as NextclawCore from "@nextclaw/core";
 import {
   getPluginChannelBindings as getPluginChannelBindings3,
   resolvePluginChannelMessageToolHints,
-  setPluginRuntimeBridge,
+  setPluginRuntimeBridge as setPluginRuntimeBridge2,
   startPluginChannelGateways as startPluginChannelGateways2,
   stopPluginChannelGateways as stopPluginChannelGateways2
 } from "@nextclaw/openclaw-compat";
@@ -3809,8 +3822,8 @@ import {
   redactConfigObject
 } from "@nextclaw/core";
 var hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
-var readConfigSnapshot = (getConfigPath9) => {
-  const path2 = getConfigPath9();
+var readConfigSnapshot = (getConfigPath10) => {
+  const path2 = getConfigPath10();
   let raw = "";
   let parsed = {};
   if (existsSync7(path2)) {
@@ -4504,6 +4517,74 @@ var ServiceMarketplaceInstaller = class {
   }
 };
 
+// src/cli/commands/service-plugin-runtime-bridge.ts
+import { loadConfig as loadConfig13, resolveConfigSecrets as resolveConfigSecrets2, saveConfig as saveConfig9 } from "@nextclaw/core";
+import { setPluginRuntimeBridge } from "@nextclaw/openclaw-compat";
+function installPluginRuntimeBridge(params) {
+  const { runtimePool, runtimeConfigPath, pluginChannelBindings } = params;
+  setPluginRuntimeBridge({
+    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 = loadConfig13();
+      const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
+      saveConfig9(next);
+    },
+    dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
+      const request = resolvePluginRuntimeRequest(ctx);
+      if (!request) {
+        return;
+      }
+      try {
+        const response = await runtimePool.processDirect(request);
+        const replyText = typeof response === "string" ? response : String(response ?? "");
+        if (replyText.trim()) {
+          await dispatcherOptions.deliver({ text: replyText }, { kind: "final" });
+        }
+      } catch (error) {
+        dispatcherOptions.onError?.(error);
+        throw error;
+      }
+    }
+  });
+}
+function resolvePluginRuntimeRequest(ctx) {
+  const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
+  const body = typeof ctx.Body === "string" ? ctx.Body : "";
+  const content = (bodyForAgent || body).trim();
+  if (!content) {
+    return null;
+  }
+  const sessionKey = typeof ctx.SessionKey === "string" && ctx.SessionKey.trim().length > 0 ? ctx.SessionKey : void 0;
+  const channel = typeof ctx.OriginatingChannel === "string" && ctx.OriginatingChannel.trim().length > 0 ? ctx.OriginatingChannel : "cli";
+  const chatId = typeof ctx.OriginatingTo === "string" && ctx.OriginatingTo.trim().length > 0 ? ctx.OriginatingTo : typeof ctx.SenderId === "string" && ctx.SenderId.trim().length > 0 ? ctx.SenderId : "direct";
+  const agentId = typeof ctx.AgentId === "string" ? ctx.AgentId : void 0;
+  const modelOverride = resolveModelOverride(ctx);
+  const accountId = typeof ctx.AccountId === "string" && ctx.AccountId.trim().length > 0 ? ctx.AccountId : void 0;
+  return {
+    content,
+    sessionKey,
+    channel,
+    chatId,
+    agentId,
+    metadata: {
+      ...accountId ? { account_id: accountId } : {},
+      ...modelOverride ? { model: modelOverride } : {}
+    }
+  };
+}
+function resolveModelOverride(ctx) {
+  if (typeof ctx.Model === "string" && ctx.Model.trim().length > 0) {
+    return ctx.Model.trim();
+  }
+  if (typeof ctx.AgentModel === "string" && ctx.AgentModel.trim().length > 0) {
+    return ctx.AgentModel.trim();
+  }
+  return void 0;
+}
+
 // src/cli/commands/service-plugin-reload.ts
 import { getWorkspacePath as getWorkspacePath6 } from "@nextclaw/core";
 import {
@@ -6469,11 +6550,12 @@ async function createUiNcpAgent(params) {
 // src/cli/commands/service-remote-runtime.ts
 import { RemoteServiceModule } from "@nextclaw/remote";
 function createManagedRemoteModule(params) {
-  if (!params.config.ui.enabled) {
+  if (!params.uiEnabled) {
     return null;
   }
   return new RemoteServiceModule({
-    config: params.config,
+    loadConfig: params.loadConfig,
+    uiEnabled: params.uiEnabled,
     localOrigin: params.localOrigin,
     statusStore: createNextclawRemoteStatusStore("service"),
     createConnector: (logger) => createNextclawRemoteConnector({ logger }),
@@ -6484,6 +6566,13 @@ function createManagedRemoteModule(params) {
     }
   });
 }
+function createManagedRemoteModuleForUi(params) {
+  return createManagedRemoteModule({
+    loadConfig: params.loadConfig,
+    uiEnabled: params.uiConfig.enabled,
+    localOrigin: resolveUiApiBase(params.uiConfig.host, params.uiConfig.port)
+  });
+}
 function writeInitialManagedServiceState(params) {
   writeServiceState({
     pid: params.snapshot.pid,
@@ -6520,9 +6609,169 @@ function writeReadyManagedServiceState(params) {
 }
 
 // src/cli/commands/remote-access-host.ts
-import { getConfigPath as getConfigPath6, loadConfig as loadConfig13 } from "@nextclaw/core";
+import { getConfigPath as getConfigPath7, loadConfig as loadConfig15 } from "@nextclaw/core";
+
+// src/cli/commands/remote-access-service-control.ts
+import { getConfigPath as getConfigPath6, loadConfig as loadConfig14 } from "@nextclaw/core";
 import { spawn as spawn2 } from "child_process";
 var FORCED_PUBLIC_UI_HOST = "0.0.0.0";
+function resolveRemoteServiceView(currentUi) {
+  if (currentUi) {
+    return {
+      running: true,
+      currentProcess: true,
+      pid: process.pid,
+      uiUrl: resolveUiApiBase(currentUi.host, currentUi.port),
+      uiPort: currentUi.port
+    };
+  }
+  const serviceState = readServiceState();
+  const serviceRunning = Boolean(serviceState && isProcessRunning(serviceState.pid));
+  return {
+    running: serviceRunning,
+    currentProcess: Boolean(serviceRunning && serviceState?.pid === process.pid),
+    ...serviceState?.pid ? { pid: serviceState.pid } : {},
+    ...serviceState?.uiUrl ? { uiUrl: serviceState.uiUrl } : {},
+    ...typeof serviceState?.uiPort === "number" ? { uiPort: serviceState.uiPort } : {}
+  };
+}
+async function controlRemoteService(action, deps) {
+  if (deps.remoteRuntimeController) {
+    return controlCurrentProcessRuntime(action, deps.remoteRuntimeController);
+  }
+  return controlManagedService(action, deps);
+}
+async function controlCurrentProcessRuntime(action, controller) {
+  if (action === "start") {
+    await controller.start();
+    return { accepted: true, action, message: "Remote runtime started." };
+  }
+  if (action === "stop") {
+    await controller.stop();
+    return { accepted: true, action, message: "Remote runtime stopped." };
+  }
+  await controller.restart();
+  return { accepted: true, action, message: "Remote runtime restarted." };
+}
+async function controlManagedService(action, deps) {
+  const state = readServiceState();
+  const running = Boolean(state && isProcessRunning(state.pid));
+  const currentProcess = Boolean(running && state?.pid === process.pid);
+  const uiOverrides = resolveManagedUiOverrides();
+  if (action === "start") {
+    if (running) {
+      return {
+        accepted: true,
+        action,
+        message: currentProcess ? "Managed service is already running for this UI." : "Managed service is already running."
+      };
+    }
+    await deps.serviceCommands.startService({ uiOverrides, open: false });
+    return { accepted: true, action, message: "Managed service started." };
+  }
+  if (!running) {
+    if (action === "restart") {
+      await deps.serviceCommands.startService({ uiOverrides, open: false });
+      return {
+        accepted: true,
+        action,
+        message: "Managed service was not running and has been started."
+      };
+    }
+    return { accepted: true, action, message: "No managed service is currently running." };
+  }
+  if (currentProcess) {
+    if (action === "restart") {
+      await deps.requestManagedServiceRestart({ uiPort: uiOverrides.port ?? 18791 });
+    } else {
+      scheduleManagedSelfStop();
+    }
+    return {
+      accepted: true,
+      action,
+      message: action === "restart" ? "Restart scheduled. This page may disconnect for a few seconds." : "Stop scheduled. This page will disconnect shortly."
+    };
+  }
+  if (action === "stop") {
+    await deps.serviceCommands.stopService();
+    return { accepted: true, action, message: "Managed service stopped." };
+  }
+  await deps.serviceCommands.stopService();
+  await deps.serviceCommands.startService({ uiOverrides, open: false });
+  return { accepted: true, action, message: "Managed service restarted." };
+}
+function resolveManagedUiOverrides() {
+  const config2 = loadConfig14(getConfigPath6());
+  const resolved = resolveUiConfig(config2, {
+    enabled: true,
+    host: FORCED_PUBLIC_UI_HOST,
+    open: false
+  });
+  return {
+    enabled: true,
+    host: FORCED_PUBLIC_UI_HOST,
+    open: false,
+    port: resolved.port
+  };
+}
+function scheduleManagedSelfStop() {
+  launchManagedSelfControl();
+}
+function launchManagedSelfControl(params = {}) {
+  const script = [
+    'const { spawn } = require("node:child_process");',
+    'const { rmSync } = require("node:fs");',
+    `const parentPid = ${process.pid};`,
+    `const serviceStatePath = ${JSON.stringify(resolveServiceStatePath())};`,
+    `const command = ${JSON.stringify(params.command ?? null)};`,
+    `const args = ${JSON.stringify(params.args ?? [])};`,
+    `const cwd = ${JSON.stringify(process.cwd())};`,
+    "const env = process.env;",
+    "function isRunning(pid) {",
+    "  try {",
+    "    process.kill(pid, 0);",
+    "    return true;",
+    "  } catch {",
+    "    return false;",
+    "  }",
+    "}",
+    "setTimeout(() => {",
+    "  try {",
+    "    process.kill(parentPid, 'SIGTERM');",
+    "  } catch {}",
+    "}, 150);",
+    "const startedAt = Date.now();",
+    "const maxWaitMs = 30000;",
+    "const timer = setInterval(() => {",
+    "  if (isRunning(parentPid)) {",
+    "    if (Date.now() - startedAt > maxWaitMs) {",
+    "      try {",
+    "        process.kill(parentPid, 'SIGKILL');",
+    "      } catch {}",
+    "    }",
+    "    return;",
+    "  }",
+    "  clearInterval(timer);",
+    "  try {",
+    "    rmSync(serviceStatePath, { force: true });",
+    "  } catch {}",
+    "  if (command) {",
+    "    const child = spawn(command, args, { detached: true, stdio: 'ignore', cwd, env });",
+    "    child.unref();",
+    "  }",
+    "  process.exit(0);",
+    "}, 250);"
+  ].join("");
+  const helper = spawn2(process.execPath, ["-e", script], {
+    detached: true,
+    stdio: "ignore",
+    env: process.env,
+    cwd: process.cwd()
+  });
+  helper.unref();
+}
+
+// src/cli/commands/remote-access-host.ts
 function normalizeOptionalString5(value) {
   if (typeof value !== "string") {
     return null;
@@ -6568,22 +6817,13 @@ var RemoteAccessHost = class {
     this.deps = deps;
   }
   getStatus() {
-    const config2 = loadConfig13(getConfigPath6());
+    const config2 = loadConfig15(getConfigPath7());
     const status = this.deps.remoteCommands.getStatusView();
-    const serviceState = readServiceState();
-    const serviceRunning = Boolean(serviceState && isProcessRunning(serviceState.pid));
     const account = this.readAccountView({
       token: normalizeOptionalString5(config2.providers.nextclaw?.apiKey),
       apiBase: normalizeOptionalString5(config2.providers.nextclaw?.apiBase),
       platformBase: status.platformBase
     });
-    const service = {
-      running: serviceRunning,
-      currentProcess: Boolean(serviceRunning && serviceState?.pid === process.pid),
-      ...serviceState?.pid ? { pid: serviceState.pid } : {},
-      ...serviceState?.uiUrl ? { uiUrl: serviceState.uiUrl } : {},
-      ...typeof serviceState?.uiPort === "number" ? { uiPort: serviceState.uiPort } : {}
-    };
     return {
       account,
       settings: {
@@ -6591,7 +6831,7 @@ var RemoteAccessHost = class {
         deviceName: config2.remote.deviceName,
         platformApiBase: config2.remote.platformApiBase
       },
-      service,
+      service: resolveRemoteServiceView(this.deps.currentUi),
       localOrigin: status.localOrigin,
       configuredEnabled: status.configuredEnabled,
       platformBase: status.platformBase,
@@ -6614,7 +6854,7 @@ var RemoteAccessHost = class {
     };
   }
   async pollBrowserAuth(input) {
-    const config2 = loadConfig13(getConfigPath6());
+    const config2 = loadConfig15(getConfigPath7());
     const result = await this.deps.platformAuthCommands.pollBrowserAuth({
       apiBase: normalizeOptionalString5(input.apiBase) ?? normalizeOptionalString5(config2.remote.platformApiBase) ?? normalizeOptionalString5(config2.providers.nextclaw?.apiBase) ?? void 0,
       sessionId: input.sessionId
@@ -6652,92 +6892,7 @@ var RemoteAccessHost = class {
     };
   }
   async controlService(action) {
-    const state = readServiceState();
-    const running = Boolean(state && isProcessRunning(state.pid));
-    const currentProcess = Boolean(running && state?.pid === process.pid);
-    const uiOverrides = this.resolveManagedUiOverrides();
-    if (action === "start") {
-      if (running) {
-        return {
-          accepted: true,
-          action,
-          message: currentProcess ? "Managed service is already running for this UI." : "Managed service is already running."
-        };
-      }
-      await this.deps.serviceCommands.startService({
-        uiOverrides,
-        open: false
-      });
-      return {
-        accepted: true,
-        action,
-        message: "Managed service started."
-      };
-    }
-    if (!running) {
-      if (action === "restart") {
-        await this.deps.serviceCommands.startService({
-          uiOverrides,
-          open: false
-        });
-        return {
-          accepted: true,
-          action,
-          message: "Managed service was not running and has been started."
-        };
-      }
-      return {
-        accepted: true,
-        action,
-        message: "No managed service is currently running."
-      };
-    }
-    if (currentProcess) {
-      if (action === "restart") {
-        await this.deps.requestManagedServiceRestart({
-          uiPort: uiOverrides.port ?? 18791
-        });
-      } else {
-        this.scheduleSelfStop();
-      }
-      return {
-        accepted: true,
-        action,
-        message: action === "restart" ? "Restart scheduled. This page may disconnect for a few seconds." : "Stop scheduled. This page will disconnect shortly."
-      };
-    }
-    if (action === "stop") {
-      await this.deps.serviceCommands.stopService();
-      return {
-        accepted: true,
-        action,
-        message: "Managed service stopped."
-      };
-    }
-    await this.deps.serviceCommands.stopService();
-    await this.deps.serviceCommands.startService({
-      uiOverrides,
-      open: false
-    });
-    return {
-      accepted: true,
-      action,
-      message: "Managed service restarted."
-    };
-  }
-  resolveManagedUiOverrides() {
-    const config2 = loadConfig13(getConfigPath6());
-    const resolved = resolveUiConfig(config2, {
-      enabled: true,
-      host: FORCED_PUBLIC_UI_HOST,
-      open: false
-    });
-    return {
-      enabled: true,
-      host: FORCED_PUBLIC_UI_HOST,
-      open: false,
-      port: resolved.port
-    };
+    return controlRemoteService(action, this.deps);
   }
   readAccountView(params) {
     if (!isPlatformSessionToken2(params.token)) {
@@ -6758,62 +6913,6 @@ var RemoteAccessHost = class {
       platformBase: params.platformBase
     };
   }
-  scheduleSelfStop() {
-    this.launchManagedSelfControl();
-  }
-  launchManagedSelfControl(params = {}) {
-    const script = [
-      'const { spawn } = require("node:child_process");',
-      'const { rmSync } = require("node:fs");',
-      `const parentPid = ${process.pid};`,
-      `const serviceStatePath = ${JSON.stringify(resolveServiceStatePath())};`,
-      `const command = ${JSON.stringify(params.command ?? null)};`,
-      `const args = ${JSON.stringify(params.args ?? [])};`,
-      `const cwd = ${JSON.stringify(process.cwd())};`,
-      "const env = process.env;",
-      "function isRunning(pid) {",
-      "  try {",
-      "    process.kill(pid, 0);",
-      "    return true;",
-      "  } catch {",
-      "    return false;",
-      "  }",
-      "}",
-      "setTimeout(() => {",
-      "  try {",
-      "    process.kill(parentPid, 'SIGTERM');",
-      "  } catch {}",
-      "}, 150);",
-      "const startedAt = Date.now();",
-      "const maxWaitMs = 30000;",
-      "const timer = setInterval(() => {",
-      "  if (isRunning(parentPid)) {",
-      "    if (Date.now() - startedAt > maxWaitMs) {",
-      "      try {",
-      "        process.kill(parentPid, 'SIGKILL');",
-      "      } catch {}",
-      "    }",
-      "    return;",
-      "  }",
-      "  clearInterval(timer);",
-      "  try {",
-      "    rmSync(serviceStatePath, { force: true });",
-      "  } catch {}",
-      "  if (command) {",
-      "    const child = spawn(command, args, { detached: true, stdio: 'ignore', cwd, env });",
-      "    child.unref();",
-      "  }",
-      "  process.exit(0);",
-      "}, 250);"
-    ].join("");
-    const helper = spawn2(process.execPath, ["-e", script], {
-      detached: true,
-      stdio: "ignore",
-      env: process.env,
-      cwd: process.cwd()
-    });
-    helper.unref();
-  }
 };
 
 // src/cli/commands/service-remote-access.ts
@@ -6830,11 +6929,24 @@ function requestManagedServiceRestart(requestRestart, options = {}) {
   });
 }
 function createRemoteAccessHost(params) {
+  const currentLocalOrigin = `http://127.0.0.1:${params.uiConfig.port}`;
   return new RemoteAccessHost({
     serviceCommands: params.serviceCommands,
     requestManagedServiceRestart: (options) => requestManagedServiceRestart(params.requestRestart, options),
-    remoteCommands: new RemoteCommands(),
-    platformAuthCommands: new PlatformAuthCommands()
+    remoteCommands: new RemoteCommands({ currentLocalOrigin }),
+    platformAuthCommands: new PlatformAuthCommands(),
+    currentUi: params.uiConfig,
+    remoteRuntimeController: params.remoteModule ? {
+      start: async () => {
+        params.remoteModule?.start();
+      },
+      stop: async () => {
+        await params.remoteModule?.stop();
+      },
+      restart: async () => {
+        await params.remoteModule?.restart();
+      }
+    } : null
   });
 }
 
@@ -7462,18 +7574,18 @@ var {
   ChannelManager: ChannelManager2,
   CronService: CronService2,
   getApiBase,
-  getConfigPath: getConfigPath7,
+  getConfigPath: getConfigPath8,
   getDataDir: getDataDir7,
   getProvider,
   getProviderName,
   getWorkspacePath: getWorkspacePath9,
   HeartbeatService,
   LiteLLMProvider,
-  loadConfig: loadConfig14,
+  loadConfig: loadConfig16,
   MessageBus,
   ProviderManager,
-  resolveConfigSecrets: resolveConfigSecrets2,
-  saveConfig: saveConfig9,
+  resolveConfigSecrets: resolveConfigSecrets3,
+  saveConfig: saveConfig10,
   SessionManager,
   parseAgentScopedSessionKey: parseAgentScopedSessionKey3
 } = NextclawCore;
@@ -7493,8 +7605,8 @@ var ServiceCommands = class {
   async startGateway(options = {}) {
     this.applyLiveConfigReload = null;
     this.liveUiNcpAgent = null;
-    const runtimeConfigPath = getConfigPath7();
-    const config2 = resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath });
+    const runtimeConfigPath = getConfigPath8();
+    const config2 = resolveConfigSecrets3(loadConfig16(), { configPath: runtimeConfigPath });
     const workspace = getWorkspacePath9(config2.agents.defaults.workspace);
     let pluginRegistry = loadPluginRegistry(config2, workspace);
     let extensionRegistry = toExtensionRegistry(pluginRegistry);
@@ -7511,7 +7623,10 @@ var ServiceCommands = class {
     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);
+    const remoteModule = createManagedRemoteModuleForUi({
+      loadConfig: () => resolveConfigSecrets3(loadConfig16(), { configPath: runtimeConfigPath }),
+      uiConfig
+    });
     if (!provider) {
       console.warn("Warning: No API key configured. The gateway is running, but agent replies are disabled until provider config is set.");
     }
@@ -7523,7 +7638,7 @@ var ServiceCommands = class {
       sessionManager,
       providerManager,
       makeProvider: (nextConfig) => this.makeProvider(nextConfig, { allowMissing: true }) ?? this.makeMissingProvider(nextConfig),
-      loadConfig: () => resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
+      loadConfig: () => resolveConfigSecrets3(loadConfig16(), { configPath: runtimeConfigPath }),
       getExtensionChannels: () => extensionRegistry.channels,
       onRestartRequired: (paths) => {
         void this.deps.requestRestart({
@@ -7534,14 +7649,14 @@ var ServiceCommands = class {
       }
     });
     this.applyLiveConfigReload = async () => {
-      await reloader.applyReloadPlan(resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }));
+      await reloader.applyReloadPlan(resolveConfigSecrets3(loadConfig16(), { configPath: runtimeConfigPath }));
     };
     const gatewayController = new GatewayControllerImpl({
       reloader,
       cron: cron2,
       sessionManager,
-      getConfigPath: getConfigPath7,
-      saveConfig: saveConfig9,
+      getConfigPath: getConfigPath8,
+      saveConfig: saveConfig10,
       requestRestart: async (options2) => {
         await this.deps.requestRestart({
           reason: options2?.reason ?? "gateway tool restart",
@@ -7567,7 +7682,7 @@ var ServiceCommands = class {
       resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets3(loadConfig16(), { configPath: runtimeConfigPath }),
         accountId
       })
     });
@@ -7599,48 +7714,10 @@ var ServiceCommands = class {
       await this.liveUiNcpAgent?.applyMcpConfig?.(nextConfig);
     });
     let pluginChannelBindings = getPluginChannelBindings3(pluginRegistry);
-    setPluginRuntimeBridge({
-      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 = loadConfig14();
-        const next = mergePluginConfigView(current, nextConfigView, pluginChannelBindings);
-        saveConfig9(next);
-      },
-      dispatchReplyWithBufferedBlockDispatcher: async ({ ctx, dispatcherOptions }) => {
-        const bodyForAgent = typeof ctx.BodyForAgent === "string" ? ctx.BodyForAgent : "";
-        const body = typeof ctx.Body === "string" ? ctx.Body : "";
-        const content = (bodyForAgent || body).trim();
-        if (!content) {
-          return;
-        }
-        const sessionKey = typeof ctx.SessionKey === "string" && ctx.SessionKey.trim().length > 0 ? ctx.SessionKey : void 0;
-        const channel = typeof ctx.OriginatingChannel === "string" && ctx.OriginatingChannel.trim().length > 0 ? ctx.OriginatingChannel : "cli";
-        const chatId = typeof ctx.OriginatingTo === "string" && ctx.OriginatingTo.trim().length > 0 ? ctx.OriginatingTo : typeof ctx.SenderId === "string" && ctx.SenderId.trim().length > 0 ? ctx.SenderId : "direct";
-        const modelOverride = typeof ctx.Model === "string" && ctx.Model?.trim().length ? ctx.Model.trim() : typeof ctx.AgentModel === "string" && ctx.AgentModel?.trim().length ? ctx.AgentModel.trim() : void 0;
-        try {
-          const response = await runtimePool.processDirect({
-            content,
-            sessionKey,
-            channel,
-            chatId,
-            agentId: typeof ctx.AgentId === "string" ? ctx.AgentId : void 0,
-            metadata: {
-              ...typeof ctx.AccountId === "string" && ctx.AccountId.trim().length > 0 ? { account_id: ctx.AccountId } : {},
-              ...modelOverride ? { model: modelOverride } : {}
-            }
-          });
-          const replyText = typeof response === "string" ? response : String(response ?? "");
-          if (replyText.trim()) {
-            await dispatcherOptions.deliver({ text: replyText }, { kind: "final" });
-          }
-        } catch (error) {
-          dispatcherOptions.onError?.(error);
-          throw error;
-        }
-      }
+    installPluginRuntimeBridge({
+      runtimePool,
+      runtimeConfigPath,
+      pluginChannelBindings
     });
     cron2.onJob = async (job) => {
       const response = await runtimePool.processDirect({
@@ -7681,16 +7758,16 @@ var ServiceCommands = class {
       providerManager,
       bus,
       gatewayController,
-      () => resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
+      () => resolveConfigSecrets3(loadConfig16(), { configPath: runtimeConfigPath }),
       () => extensionRegistry,
       ({ channel, accountId }) => resolvePluginChannelMessageToolHints({
         registry: pluginRegistry,
         channel,
-        cfg: resolveConfigSecrets2(loadConfig14(), { configPath: runtimeConfigPath }),
+        cfg: resolveConfigSecrets3(loadConfig16(), { configPath: runtimeConfigPath }),
         accountId
-      })
+      }),
+      remoteModule
     );
-    const remoteModule = createManagedRemoteModule({ config: config2, localOrigin });
     await startGatewaySupportServices({
       cronJobs: cron2.status().jobs,
       remoteModule,
@@ -7713,7 +7790,7 @@ var ServiceCommands = class {
       this.liveUiNcpAgent = null;
       await remoteModule?.stop();
       await stopPluginChannelGateways2(pluginGatewayHandles);
-      setPluginRuntimeBridge(null);
+      setPluginRuntimeBridge2(null);
     }
   }
   normalizeOptionalString(value) {
@@ -7724,7 +7801,7 @@ var ServiceCommands = class {
     return trimmed || void 0;
   }
   watchConfigFile(reloader) {
-    const configPath = resolve10(getConfigPath7());
+    const configPath = resolve10(getConfigPath8());
     const watcher = chokidar.watch(configPath, {
       ignoreInitial: true,
       awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 50 }
@@ -7845,7 +7922,7 @@ var ServiceCommands = class {
     });
   }
   async runForeground(options) {
-    const config2 = loadConfig14();
+    const config2 = loadConfig16();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     if (options.open) {
@@ -7858,7 +7935,7 @@ var ServiceCommands = class {
     });
   }
   async startService(options) {
-    const config2 = loadConfig14();
+    const config2 = loadConfig16();
     const uiConfig = resolveUiConfig(config2, options.uiOverrides);
     const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
     const apiUrl = `${uiUrl}/api`;
@@ -8266,7 +8343,7 @@ var ServiceCommands = class {
         return null;
       }
       console.error("Error: No API key configured.");
-      console.error(`Set one in ${getConfigPath7()} under providers section`);
+      console.error(`Set one in ${getConfigPath8()} under providers section`);
       process.exit(1);
     }
     return new LiteLLMProvider({
@@ -8306,7 +8383,7 @@ var ServiceCommands = class {
     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) {
+  async startUiIfEnabled(uiConfig, uiStaticDir, cronService, runtimePool, sessionManager, providerManager, bus, gatewayController, getConfig, getExtensionRegistry, resolveMessageToolHints, remoteModule) {
     if (!uiConfig.enabled) {
       return;
     }
@@ -8387,11 +8464,16 @@ var ServiceCommands = class {
       runCliSubcommand: (args) => this.runCliSubcommand(args),
       installBuiltinSkill: (slug, force) => this.installBuiltinMarketplaceSkill(slug, force)
     }).createInstaller();
-    const remoteAccess = createRemoteAccessHost({ serviceCommands: this, requestRestart: this.deps.requestRestart });
+    const remoteAccess = createRemoteAccessHost({
+      serviceCommands: this,
+      requestRestart: this.deps.requestRestart,
+      uiConfig,
+      remoteModule
+    });
     const uiServer = startUiServer({
       host: uiConfig.host,
       port: uiConfig.port,
-      configPath: getConfigPath7(),
+      configPath: getConfigPath8(),
       productVersion: getPackageVersion(),
       staticDir: uiStaticDir ?? void 0,
       cronService,
@@ -8480,7 +8562,7 @@ var ServiceCommands = class {
     }
   }
   installBuiltinMarketplaceSkill(slug, force) {
-    const workspace = getWorkspacePath9(loadConfig14().agents.defaults.workspace);
+    const workspace = getWorkspacePath9(loadConfig16().agents.defaults.workspace);
     const destination = join6(workspace, "skills", slug);
     const destinationSkillFile = join6(destination, "SKILL.md");
     if (existsSync10(destinationSkillFile) && !force) {
@@ -8985,14 +9067,14 @@ var CliRuntime = class {
     const source = options.source ?? "init";
     const prefix = options.auto ? "Auto init" : "Init";
     const force = Boolean(options.force);
-    const configPath = getConfigPath8();
+    const configPath = getConfigPath9();
     let createdConfig = false;
     if (!existsSync12(configPath)) {
       const config3 = ConfigSchema2.parse({});
-      saveConfig10(config3);
+      saveConfig11(config3);
       createdConfig = true;
     }
-    const config2 = loadConfig15();
+    const config2 = loadConfig17();
     const workspaceSetting = config2.agents.defaults.workspace;
     const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join8(getDataDir9(), DEFAULT_WORKSPACE_DIR) : expandHome2(workspaceSetting);
     const workspaceExisted = existsSync12(workspacePath);
@@ -9118,16 +9200,16 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
     await this.serviceCommands.stopService();
   }
   async agent(opts) {
-    const configPath = getConfigPath8();
-    const config2 = resolveConfigSecrets3(loadConfig15(), { configPath });
+    const configPath = getConfigPath9();
+    const config2 = resolveConfigSecrets4(loadConfig17(), { configPath });
     const workspace = getWorkspacePath10(config2.agents.defaults.workspace);
     const pluginRegistry = loadPluginRegistry(config2, workspace);
     const extensionRegistry = toExtensionRegistry(pluginRegistry);
     logPluginDiagnostics(pluginRegistry);
     const pluginChannelBindings = getPluginChannelBindings4(pluginRegistry);
-    setPluginRuntimeBridge2({
+    setPluginRuntimeBridge3({
       loadConfig: () => toPluginConfigView(
-        resolveConfigSecrets3(loadConfig15(), { configPath }),
+        resolveConfigSecrets4(loadConfig17(), { configPath }),
         pluginChannelBindings
       ),
       writeConfigFile: async (nextConfigView) => {
@@ -9136,13 +9218,13 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
             "plugin runtime writeConfigFile expects an object config"
           );
         }
-        const current = loadConfig15();
+        const current = loadConfig17();
         const next = mergePluginConfigView(
           current,
           nextConfigView,
           pluginChannelBindings
         );
-        saveConfig10(next);
+        saveConfig11(next);
       }
     });
     try {
@@ -9168,7 +9250,7 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
         resolveMessageToolHints: ({ channel, accountId }) => resolvePluginChannelMessageToolHints2({
           registry: pluginRegistry,
           channel,
-          cfg: resolveConfigSecrets3(loadConfig15(), { configPath }),
+          cfg: resolveConfigSecrets4(loadConfig17(), { configPath }),
           accountId
         })
       });
@@ -9222,7 +9304,7 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
         printAgentResponse(response);
       }
     } finally {
-      setPluginRuntimeBridge2(null);
+      setPluginRuntimeBridge3(null);
     }
   }
   async update(opts) {
@@ -9363,7 +9445,7 @@ ${this.logo} ${APP_NAME5} is ready! (${source})`);
     await this.diagnosticsCommands.doctor(opts);
   }
   async skillsInstall(options) {
-    const config2 = loadConfig15();
+    const config2 = loadConfig17();
     const workdir = resolveSkillsInstallWorkdir({
       explicitWorkdir: options.workdir,
       configuredWorkspace: config2.agents.defaults.workspace