rol-websocket-channel 1.7.4 → 1.7.5

package/dist/index.js

@@ -34,16 +34,30 @@ function getChannelConfig(cfg) {
 export function getPluginRuntime() {
     return pluginRuntime;
 }
+// Chinese translations keyed by error code, so CLI failures are returned
+// bilingually (English `message` + Chinese `messageZh`).
+const ERROR_MESSAGES_ZH = {
+    PAIR_KEY_REQUIRED: "配对码不能为空",
+    PAIR_CONFIG_NOT_FOUND: "找不到 openclaw.json 配置文件(请确认插件位于 OpenClaw 安装目录内,或设置环境变量 OPENCLAW_HOME 指向 .openclaw 目录)",
+    PAIR_EXCHANGE_REQUEST_FAILED: "配对请求发送失败(无法连接配对服务,请检查网络、DNS 或代理)",
+    PAIR_EXCHANGE_FAILED: "配对兑换被拒绝(配对码无效、已过期或已被使用;请向签发服务获取新配对码,并在 10 分钟内尽快完成配对)",
+    PAIR_CHANNEL_CONFIG_INVALID: "配对返回的频道配置无效(缺少 mqttUrl 或 mqttTopic)",
+};
 export function formatCliErrorPayload(error) {
     const data = error?.data;
     const dataObject = data && typeof data === "object" && !Array.isArray(data)
         ? data
         : {};
     const code = dataObject.code ?? error?.code;
+    const message = error instanceof Error ? error.message : String(error);
+    // Fall back to the English message when no Chinese translation exists for
+    // the code, so both fields are always present.
+    const messageZh = (typeof code === "string" && ERROR_MESSAGES_ZH[code]) || message;
     return {
         ok: false,
         error: {
-            message: error instanceof Error ? error.message : String(error),
+            message,
+            messageZh,
             ...dataObject,
             ...(code === undefined ? {} : { code }),
         },
@@ -74,6 +88,14 @@ const WebSocketChannel = {
             mentions: true,
         },
     },
+    // 让配对写入的 channels.rol-websocket-channel 变更被判为 hot：
+    // OpenClaw 只热重载本 channel（进程内 stop→start，加载新 MQTT 连接），
+    // 不整机重启、不等 health-monitor。配置写完即在 gateway 进程内生效。
+    // (plugins.entries.rol-websocket-channel.* 已由 OpenClaw 内置的
+    //  channel-plugin-state 规则自动判为 hot+restart-channel，无需在此声明。)
+    reload: {
+        configPrefixes: ["channels.rol-websocket-channel"],
+    },
     configSchema: {
         schema: {
             type: "object",
@@ -466,6 +488,19 @@ async function handleIncomingMessage(payload, account, cfg, runtime, log, mqttTo
             await handleCustomMessageType(msgType, innerData, traceId, account.accountId, mqttTopic);
             return;
         }
+        // 收到 sender 消息时，先回复一个确认
+        publishCustomMessageResponse({
+            type: "receiver",
+            trace_id: traceId,
+            source: "system",
+            timestamp: Date.now(),
+            success: true,
+            data: {
+                ok: true,
+                status: "received",
+                message: "已收到消息"
+            }
+        }, innerData, mqttTopic);
         // 构造标准消息格式
         const attachments = (innerData.attachments || []).map((att) => ({
             url: att.url,
@@ -545,9 +580,9 @@ async function handleIncomingMessage(payload, account, cfg, runtime, log, mqttTo
                 let targetTopic = mqttTopic;
                 const sourceType = innerData?.source_type;
                 if (targetTopic.endsWith("#")) {
-                    const replacement = sourceType === "device" ? "device" : "bot";
-                    targetTopic = targetTopic.slice(0, -1) + replacement;
+                    targetTopic = targetTopic.slice(0, -1) + 'app';
                 }
+                targetTopic = targetTopic.replace('device', 'app').replace('bot', 'app');
                 conn.ws.publish(targetTopic, JSON.stringify(replyMessage));
             },
             onError: (err) => {
@@ -689,9 +724,9 @@ function publishCustomMessageResponse(response, innerData, mqttTopic) {
         let targetTopic = mqttTopic;
         const sourceType = innerData?.source_type;
         if (targetTopic.endsWith("#")) {
-            const replacement = sourceType === "device" ? "device" : "bot";
-            targetTopic = targetTopic.slice(0, -1) + replacement;
+            targetTopic = targetTopic.slice(0, -1) + 'app';
         }
+        targetTopic = targetTopic.replace('device', 'app').replace('bot', 'app');
         conn.ws.publish(targetTopic, JSON.stringify(response));
     }
 }
@@ -779,7 +814,11 @@ function registerAdminBridgeCli(api) {
             }
             catch (error) {
                 process.exitCode = 1;
-                process.stderr.write(JSON.stringify(formatCliErrorPayload(error), null, 2) + "\n");
+                // Emit the structured error on stdout (same channel as the
+                // success payload) so callers that only capture stdout still
+                // receive the full diagnostic — message, code, status,
+                // serviceMessage — instead of just exit code 1.
+                process.stdout.write(JSON.stringify(formatCliErrorPayload(error), null, 2) + "\n");
             }
         });
         const mem9 = root

package/dist/src/admin/lib/paths.js

@@ -9,38 +9,38 @@ export function getProjectRoot() {
     if (path.basename(root) === 'dist') {
         root = path.dirname(root);
     }
-    console.log('[paths] __dirname:', __dirname);
-    console.log('[paths] getProjectRoot:', root);
+    console.error('[paths] __dirname:', __dirname);
+    console.error('[paths] getProjectRoot:', root);
     return root;
 }
 export function getOpenClawRoot() {
     if (process.env.OPENCLAW_HOME) {
-        console.log('[paths] getOpenClawRoot from env:', process.env.OPENCLAW_HOME);
+        console.error('[paths] getOpenClawRoot from env:', process.env.OPENCLAW_HOME);
         return path.resolve(process.env.OPENCLAW_HOME);
     }
     const projectRoot = getProjectRoot();
     const configuredRoot = findNearestOpenClawConfigRoot(projectRoot);
     if (configuredRoot) {
-        console.log('[paths] getOpenClawRoot from discovered openclaw.json:', configuredRoot);
+        console.error('[paths] getOpenClawRoot from discovered openclaw.json:', configuredRoot);
         return configuredRoot;
     }
     const openclawDir = findAncestorNamed(projectRoot, '.openclaw');
     if (openclawDir) {
-        console.log('[paths] getOpenClawRoot from .openclaw ancestor:', openclawDir);
+        console.error('[paths] getOpenClawRoot from .openclaw ancestor:', openclawDir);
         return openclawDir;
     }
     const parentDir = path.dirname(projectRoot);
     const parentName = path.basename(parentDir);
-    console.log('[paths] projectRoot:', projectRoot);
-    console.log('[paths] parentDir:', parentDir);
-    console.log('[paths] parentName:', parentName);
+    console.error('[paths] projectRoot:', projectRoot);
+    console.error('[paths] parentDir:', parentDir);
+    console.error('[paths] parentName:', parentName);
     if (parentName === 'extensions') {
         const openclawRoot = path.dirname(parentDir);
-        console.log('[paths] getOpenClawRoot (extensions):', openclawRoot);
+        console.error('[paths] getOpenClawRoot (extensions):', openclawRoot);
         return openclawRoot;
     }
     const fallbackRoot = path.resolve(projectRoot, '..');
-    console.log('[paths] getOpenClawRoot (fallback):', fallbackRoot);
+    console.error('[paths] getOpenClawRoot (fallback):', fallbackRoot);
     return fallbackRoot;
 }
 function findNearestOpenClawConfigRoot(startDir) {

package/dist/src/admin/methods/pairing.js

@@ -1,14 +1,9 @@
-import { exec, execFile } from 'node:child_process';
 import path from 'node:path';
-import { promisify } from 'node:util';
 import { pathExists, readJsonFile, writeJsonFile } from '../lib/fs.js';
 import { JsonRpcException, JSON_RPC_ERRORS } from '../jsonrpc.js';
-const execFileAsync = promisify(execFile);
-const execAsync = promisify(exec);
 const DEFAULT_PLUGIN_ID = 'rol-websocket-channel';
 const DEFAULT_PRODUCTION_BASE_URL = 'https://api.deotaland.ai';
 const PAIR_ENDPOINT_PATH = '/api-core-bot/front/agent/agent/key/query';
-const GATEWAY_SERVICE = 'openclaw-gateway.service';
 export async function pairWithKey(options, context) {
     const key = options.key.trim();
     if (!key) {
@@ -21,7 +16,6 @@ export async function pairWithKey(options, context) {
     const payload = await exchangePairKey(key, endpoint, options.auth, existingMqttUrl);
     applyPairingConfig(config, key, payload);
     await writeJsonFile(configPath, config);
-    const restart = await restartGateway(context.projectRoot);
     return {
         ok: true,
         openclawRoot: context.openclawRoot,
@@ -34,7 +28,18 @@ export async function pairWithKey(options, context) {
             `channels.${payload.pluginId}`
         ],
         channel: payload.channel,
-        restart
+        // No gateway restart is dispatched here on purpose. Writing openclaw.json is
+        // enough: OpenClaw's config watcher detects the `channels` change, plans a
+        // gateway restart, and defers it until in-flight operations/replies/embedded
+        // runs drain before restarting with the new config. Spawning our own
+        // `openclaw gateway restart` would restart immediately and jump ahead of that
+        // deferral, killing the gateway mid-operation (the original pair-hang bug).
+        reload: {
+            dispatched: false,
+            handledBy: 'openclaw-config-watcher',
+            mode: 'deferred-until-idle',
+            note: 'OpenClaw restarts the gateway automatically after the config write.'
+        }
     };
 }
 async function loadConfig(configPath) {
@@ -292,56 +297,6 @@ function resolveExistingMqttUrl(config) {
     }
     return pickString(channelConfig.mqttUrl);
 }
-async function restartGateway(cwd) {
-    const attempts = [];
-    try {
-        const { stdout, stderr } = await execAsync('openclaw gateway restart', { cwd });
-        return {
-            attempted: true,
-            success: true,
-            command: 'openclaw gateway restart',
-            stdout: stdout.trim(),
-            stderr: stderr.trim()
-        };
-    }
-    catch (error) {
-        attempts.push(formatRestartAttempt('openclaw gateway restart', error));
-    }
-    if (process.platform === 'win32') {
-        return {
-            attempted: true,
-            success: false,
-            message: 'openclaw gateway restart failed',
-            attempts
-        };
-    }
-    try {
-        await execFileAsync('systemctl', ['--user', 'restart', GATEWAY_SERVICE], { cwd });
-        return {
-            attempted: true,
-            success: true,
-            command: `systemctl --user restart ${GATEWAY_SERVICE}`,
-            attempts
-        };
-    }
-    catch (error) {
-        attempts.push(formatRestartAttempt(`systemctl --user restart ${GATEWAY_SERVICE}`, error));
-        return {
-            attempted: true,
-            success: false,
-            message: 'gateway restart failed',
-            attempts
-        };
-    }
-}
-function formatRestartAttempt(command, error) {
-    return {
-        command,
-        message: error instanceof Error ? error.message : String(error),
-        stdout: typeof error?.stdout === 'string' ? error.stdout.trim() : '',
-        stderr: typeof error?.stderr === 'string' ? error.stderr.trim() : ''
-    };
-}
 function normalizeGroupPolicy(value) {
     if (value === 'pairing' || value === 'allowlist' || value === 'open' || value === 'disabled') {
         return value;

package/dist/src/admin/methods/sessions-extended.js

@@ -12,9 +12,10 @@ export const getSession = async (params, context) => {
         : undefined;
     const sessionId = typeof objectParams.sessionId === 'string' ? objectParams.sessionId : null;
     const requestedLimit = typeof objectParams.limit === 'number' ? objectParams.limit : MAX_SESSION_MESSAGES;
-    const requestedOffset = typeof objectParams.offset === 'number' ? objectParams.offset : 0;
+    const beforeId = typeof objectParams.beforeId === 'string' && objectParams.beforeId.trim()
+        ? objectParams.beforeId.trim()
+        : undefined;
     const limit = normalizePageSize(requestedLimit, MAX_SESSION_MESSAGES);
-    const offset = normalizeOffset(requestedOffset);
     if (!sessionId) {
         throw new JsonRpcException(JSON_RPC_ERRORS.invalidParams, 'Missing required parameter: sessionId');
     }
@@ -23,7 +24,7 @@ export const getSession = async (params, context) => {
         throw new JsonRpcException(JSON_RPC_ERRORS.invalidParams, agentId ? `Session not found: ${sessionId} for agent ${agentId}` : `Session not found: ${sessionId}`);
     }
     const sessionFile = session.sessionFilePath ?? path.join(context.openclawRoot, 'agents', session.agentName, 'sessions', `${session.sessionId ?? sessionId}.jsonl`);
-    const messages = await readSessionMessages(sessionFile, limit, offset);
+    const messages = await readSessionMessages(sessionFile, limit, beforeId);
     return {
         agentId: session.agentId,
         agentName: session.agentName,
@@ -39,7 +40,8 @@ export const getSession = async (params, context) => {
         messages: {
             total: messages.total,
             limit,
-            offset,
+            hasMore: messages.hasMore,
+            nextBeforeId: messages.nextBeforeId,
             items: messages.items
         }
     };
@@ -131,15 +133,9 @@ function normalizePageSize(value, max) {
     }
     return Math.min(normalized, max);
 }
-function normalizeOffset(value) {
-    if (!Number.isFinite(value)) {
-        return 0;
-    }
-    return Math.max(0, Math.floor(value));
-}
-async function readSessionMessages(filePath, limit, offset) {
+async function readSessionMessages(filePath, limit, beforeId) {
     if (!(await pathExists(filePath))) {
-        return { total: 0, items: [] };
+        return { total: 0, hasMore: false, nextBeforeId: null, items: [] };
     }
     const messages = [];
     const fileStream = fs.createReadStream(filePath);
@@ -158,9 +154,19 @@ async function readSessionMessages(filePath, limit, offset) {
             continue;
         }
     }
+    const endExclusive = beforeId ? messages.findIndex((message) => message.id === beforeId) : messages.length;
+    if (endExclusive < 0) {
+        throw new JsonRpcException(JSON_RPC_ERRORS.invalidParams, `beforeId not found: ${beforeId}`);
+    }
+    const start = Math.max(0, endExclusive - limit);
+    const items = messages.slice(start, endExclusive);
+    const hasMore = start > 0;
+    const firstItemId = typeof items[0]?.id === 'string' ? items[0].id : null;
     return {
         total: messages.length,
-        items: messages.slice(offset, offset + limit)
+        hasMore,
+        nextBeforeId: hasMore ? firstItemId : null,
+        items
     };
 }
 async function findInstalledSkill(context, skillSlug) {

package/index.ts

@@ -67,6 +67,20 @@ export function getPluginRuntime(): any {
   return pluginRuntime;
 }
 
+// Chinese translations keyed by error code, so CLI failures are returned
+// bilingually (English `message` + Chinese `messageZh`).
+const ERROR_MESSAGES_ZH: Record<string, string> = {
+  PAIR_KEY_REQUIRED: "配对码不能为空",
+  PAIR_CONFIG_NOT_FOUND:
+    "找不到 openclaw.json 配置文件(请确认插件位于 OpenClaw 安装目录内,或设置环境变量 OPENCLAW_HOME 指向 .openclaw 目录)",
+  PAIR_EXCHANGE_REQUEST_FAILED:
+    "配对请求发送失败(无法连接配对服务,请检查网络、DNS 或代理)",
+  PAIR_EXCHANGE_FAILED:
+    "配对兑换被拒绝(配对码无效、已过期或已被使用;请向签发服务获取新配对码,并在 10 分钟内尽快完成配对)",
+  PAIR_CHANNEL_CONFIG_INVALID:
+    "配对返回的频道配置无效(缺少 mqttUrl 或 mqttTopic)",
+};
+
 export function formatCliErrorPayload(error: unknown): {
   ok: false;
   error: Record<string, unknown>;
@@ -78,11 +92,17 @@ export function formatCliErrorPayload(error: unknown): {
       : {};
   const code =
     dataObject.code ?? (error as { code?: unknown } | null | undefined)?.code;
+  const message = error instanceof Error ? error.message : String(error);
+  // Fall back to the English message when no Chinese translation exists for
+  // the code, so both fields are always present.
+  const messageZh =
+    (typeof code === "string" && ERROR_MESSAGES_ZH[code]) || message;
 
   return {
     ok: false,
     error: {
-      message: error instanceof Error ? error.message : String(error),
+      message,
+      messageZh,
       ...dataObject,
       ...(code === undefined ? {} : { code }),
     },
@@ -117,6 +137,15 @@ const WebSocketChannel: any = {
     },
   },
 
+  // 让配对写入的 channels.rol-websocket-channel 变更被判为 hot：
+  // OpenClaw 只热重载本 channel（进程内 stop→start，加载新 MQTT 连接），
+  // 不整机重启、不等 health-monitor。配置写完即在 gateway 进程内生效。
+  // (plugins.entries.rol-websocket-channel.* 已由 OpenClaw 内置的
+  //  channel-plugin-state 规则自动判为 hot+restart-channel，无需在此声明。)
+  reload: {
+    configPrefixes: ["channels.rol-websocket-channel"],
+  },
+
   configSchema: {
     schema: {
       type: "object",
@@ -388,7 +417,7 @@ const WebSocketChannel: any = {
 
       const text = typeof params.message === "string" ? params.message
         : typeof params.text === "string" ? params.text
-        : "";
+          : "";
 
       const conn = ConnectionManager.getGlobalConnection();
       if (!conn || !conn.ws || !conn.ws.connected) {
@@ -599,6 +628,20 @@ async function handleIncomingMessage(
       return;
     }
 
+    // 收到 sender 消息时，先回复一个确认
+    publishCustomMessageResponse({
+      type: "receiver",
+      trace_id: traceId,
+      source: "system",
+      timestamp: Date.now(),
+      success: true,
+      data: {
+        ok: true,
+        status: "received",
+        message: "已收到消息"
+      }
+    }, innerData, mqttTopic);
+
     // 构造标准消息格式
     const attachments = (innerData.attachments || []).map((att: any) => ({
       url: att.url,
@@ -689,9 +732,9 @@ async function handleIncomingMessage(
         let targetTopic = mqttTopic;
         const sourceType = innerData?.source_type;
         if (targetTopic.endsWith("#")) {
-          const replacement = sourceType === "device" ? "device" : "bot";
-          targetTopic = targetTopic.slice(0, -1) + replacement;
+          targetTopic = targetTopic.slice(0, -1) + 'app';
         }
+        targetTopic = targetTopic.replace('device', 'app').replace('bot', 'app');
 
         conn.ws.publish(targetTopic, JSON.stringify(replyMessage));
       },
@@ -867,9 +910,9 @@ function publishCustomMessageResponse(response: any, innerData: any, mqttTopic:
     let targetTopic = mqttTopic;
     const sourceType = innerData?.source_type;
     if (targetTopic.endsWith("#")) {
-      const replacement = sourceType === "device" ? "device" : "bot";
-      targetTopic = targetTopic.slice(0, -1) + replacement;
+      targetTopic = targetTopic.slice(0, -1) + 'app';
     }
+    targetTopic = targetTopic.replace('device', 'app').replace('bot', 'app');
 
     conn.ws.publish(targetTopic, JSON.stringify(response));
   }
@@ -997,7 +1040,11 @@ function registerAdminBridgeCli(api: OpenClawPluginApi) {
               );
             } catch (error) {
               process.exitCode = 1;
-              process.stderr.write(
+              // Emit the structured error on stdout (same channel as the
+              // success payload) so callers that only capture stdout still
+              // receive the full diagnostic — message, code, status,
+              // serviceMessage — instead of just exit code 1.
+              process.stdout.write(
                 JSON.stringify(formatCliErrorPayload(error), null, 2) + "\n",
               );
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rol-websocket-channel",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "Unified OpenClaw plugin: MQTT Channel + Admin Bridge for remote management",
   "license": "MIT",
   "author": "nixgnehc",

package/src/admin/lib/paths.ts

@@ -13,45 +13,45 @@ export function getProjectRoot(): string {
     root = path.dirname(root);
   }
 
-  console.log('[paths] __dirname:', __dirname);
-  console.log('[paths] getProjectRoot:', root);
+  console.error('[paths] __dirname:', __dirname);
+  console.error('[paths] getProjectRoot:', root);
   return root;
 }
 
 export function getOpenClawRoot(): string {
   if (process.env.OPENCLAW_HOME) {
-    console.log('[paths] getOpenClawRoot from env:', process.env.OPENCLAW_HOME);
+    console.error('[paths] getOpenClawRoot from env:', process.env.OPENCLAW_HOME);
     return path.resolve(process.env.OPENCLAW_HOME);
   }
 
   const projectRoot = getProjectRoot();
   const configuredRoot = findNearestOpenClawConfigRoot(projectRoot);
   if (configuredRoot) {
-    console.log('[paths] getOpenClawRoot from discovered openclaw.json:', configuredRoot);
+    console.error('[paths] getOpenClawRoot from discovered openclaw.json:', configuredRoot);
     return configuredRoot;
   }
 
   const openclawDir = findAncestorNamed(projectRoot, '.openclaw');
   if (openclawDir) {
-    console.log('[paths] getOpenClawRoot from .openclaw ancestor:', openclawDir);
+    console.error('[paths] getOpenClawRoot from .openclaw ancestor:', openclawDir);
     return openclawDir;
   }
 
   const parentDir = path.dirname(projectRoot);
   const parentName = path.basename(parentDir);
 
-  console.log('[paths] projectRoot:', projectRoot);
-  console.log('[paths] parentDir:', parentDir);
-  console.log('[paths] parentName:', parentName);
+  console.error('[paths] projectRoot:', projectRoot);
+  console.error('[paths] parentDir:', parentDir);
+  console.error('[paths] parentName:', parentName);
 
   if (parentName === 'extensions') {
     const openclawRoot = path.dirname(parentDir);
-    console.log('[paths] getOpenClawRoot (extensions):', openclawRoot);
+    console.error('[paths] getOpenClawRoot (extensions):', openclawRoot);
     return openclawRoot;
   }
 
   const fallbackRoot = path.resolve(projectRoot, '..');
-  console.log('[paths] getOpenClawRoot (fallback):', fallbackRoot);
+  console.error('[paths] getOpenClawRoot (fallback):', fallbackRoot);
   return fallbackRoot;
 }
 

package/src/admin/methods/pairing.ts

@@ -1,18 +1,12 @@
-import { exec, execFile } from 'node:child_process';
 import path from 'node:path';
-import { promisify } from 'node:util';
 
 import { pathExists, readJsonFile, writeJsonFile } from '../lib/fs.js';
 import { JsonRpcException, JSON_RPC_ERRORS } from '../jsonrpc.js';
 import type { JsonValue, MethodContext } from '../types.js';
 
-const execFileAsync = promisify(execFile);
-const execAsync = promisify(exec);
-
 const DEFAULT_PLUGIN_ID = 'rol-websocket-channel';
 const DEFAULT_PRODUCTION_BASE_URL = 'https://api.deotaland.ai';
 const PAIR_ENDPOINT_PATH = '/api-core-bot/front/agent/agent/key/query';
-const GATEWAY_SERVICE = 'openclaw-gateway.service';
 
 interface PairingCommandOptions {
   key: string;
@@ -73,7 +67,6 @@ export async function pairWithKey(
   const payload = await exchangePairKey(key, endpoint, options.auth, existingMqttUrl);
   applyPairingConfig(config, key, payload);
   await writeJsonFile(configPath, config);
-  const restart = await restartGateway(context.projectRoot);
 
   return {
     ok: true,
@@ -87,7 +80,18 @@ export async function pairWithKey(
       `channels.${payload.pluginId}`
     ],
     channel: payload.channel,
-    restart
+    // No gateway restart is dispatched here on purpose. Writing openclaw.json is
+    // enough: OpenClaw's config watcher detects the `channels` change, plans a
+    // gateway restart, and defers it until in-flight operations/replies/embedded
+    // runs drain before restarting with the new config. Spawning our own
+    // `openclaw gateway restart` would restart immediately and jump ahead of that
+    // deferral, killing the gateway mid-operation (the original pair-hang bug).
+    reload: {
+      dispatched: false,
+      handledBy: 'openclaw-config-watcher',
+      mode: 'deferred-until-idle',
+      note: 'OpenClaw restarts the gateway automatically after the config write.'
+    }
   };
 }
 
@@ -399,59 +403,6 @@ function resolveExistingMqttUrl(config: OpenClawConfig): string | null {
   return pickString(channelConfig.mqttUrl);
 }
 
-async function restartGateway(cwd: string): Promise<JsonValue> {
-  const attempts: JsonValue[] = [];
-
-  try {
-    const { stdout, stderr } = await execAsync('openclaw gateway restart', { cwd });
-    return {
-      attempted: true,
-      success: true,
-      command: 'openclaw gateway restart',
-      stdout: stdout.trim(),
-      stderr: stderr.trim()
-    };
-  } catch (error: any) {
-    attempts.push(formatRestartAttempt('openclaw gateway restart', error));
-  }
-
-  if (process.platform === 'win32') {
-    return {
-      attempted: true,
-      success: false,
-      message: 'openclaw gateway restart failed',
-      attempts
-    };
-  }
-
-  try {
-    await execFileAsync('systemctl', ['--user', 'restart', GATEWAY_SERVICE], { cwd });
-    return {
-      attempted: true,
-      success: true,
-      command: `systemctl --user restart ${GATEWAY_SERVICE}`,
-      attempts
-    };
-  } catch (error: any) {
-    attempts.push(formatRestartAttempt(`systemctl --user restart ${GATEWAY_SERVICE}`, error));
-    return {
-      attempted: true,
-      success: false,
-      message: 'gateway restart failed',
-      attempts
-    };
-  }
-}
-
-function formatRestartAttempt(command: string, error: any): JsonValue {
-  return {
-    command,
-    message: error instanceof Error ? error.message : String(error),
-    stdout: typeof error?.stdout === 'string' ? error.stdout.trim() : '',
-    stderr: typeof error?.stderr === 'string' ? error.stderr.trim() : ''
-  };
-}
-
 function normalizeGroupPolicy(value: string): 'pairing' | 'allowlist' | 'open' | 'disabled' {
   if (value === 'pairing' || value === 'allowlist' || value === 'open' || value === 'disabled') {
     return value;