@honor-claw/yoyo 0.0.1-beta.6 → 0.0.1-beta.7

package/openclaw.plugin.json

@@ -25,7 +25,7 @@
       },
       "env": {
         "type": "string",
-        "enum": ["test", "production"]
+        "enum": ["dev", "test", "production"]
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "0.0.1-beta.6",
+  "version": "0.0.1-beta.7",
   "type": "module",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "scripts": {

package/src/apis/honor-auth.ts

@@ -9,6 +9,7 @@ import type { TokenResponse, HonorAuthConfig } from '../honor-auth/types.js';
 import { uuid } from '../utils/id.js';
 import { isOKResponse } from './helpers.js';
 import type { HttpApiWrapper } from './types.js';
+import { takeApiHost } from '../modules/claw-configs/hosts.js';
 
 /**
  * PKCE参数
@@ -101,7 +102,8 @@ export class HonorAuthClient {
    * 使用授权码换取Token
    */
   async exchangeToken(code: string) {
-    const tokenUrl = 'https://api-agd-test-drcn.hiboard.hihonorcloud.com/honorboard/auth/v1/oauth/jwtToken';
+    const hosts = takeApiHost();
+    const tokenUrl = `https://${hosts.ics}/honorboard/auth/v1/oauth/jwtToken`;
 
     const data = {
       clientId: this.config.clientId,

package/src/cloud-channel/channel.ts

@@ -1,10 +1,12 @@
-import type { ClawChannelConfig, YoyoClawMessage, ClawSocketSourceInfo } from './types.js';
-import { ClawCloudSocketClient } from './client.js';
-import { GatewayClient } from '../gateway-client/client.js';
-import { useClawLogger } from '../utils/logger.js';
-
-const DEFAULT_WS_SERVER_URL =
-  'ws://omni-pre-drcn.hiboard.hihonorcloud.com/aicloud/yoyo-claw-service/v1/yoyoclaw/fullduplex';
+import type {
+  ClawChannelConfig,
+  YoyoClawMessage,
+  DeviceSessionInfo,
+} from "./types.js";
+import { ClawCloudSocketClient } from "./client.js";
+import { GatewayClient } from "../gateway-client/client.js";
+import { useClawLogger } from "../utils/logger.js";
+import { takeApiHost } from "../modules/claw-configs/hosts.js";
 
 /**
  * 新的Channel实现
@@ -15,14 +17,17 @@ const DEFAULT_WS_SERVER_URL =
 export class ClawChannel {
   private cloudClient: ClawCloudSocketClient;
   private gatewayClientsMap = new Map<string, GatewayClient>();
-  private deviceIdToSourceInfoMap = new Map<string, ClawSocketSourceInfo>();
+  private deviceSessionsMap = new Map<string, DeviceSessionInfo[]>();
+  private sessionIdToHardwareDeviceMap = new Map<string, string>();
   private config: ClawChannelConfig;
 
   constructor(config: ClawChannelConfig) {
     this.config = config;
 
+    const hosts = takeApiHost();
+
     this.cloudClient = new ClawCloudSocketClient({
-      serverUrl: DEFAULT_WS_SERVER_URL,
+      serverUrl: `wss://${hosts.clawCloud}/aicloud/yoyo-claw-service/v1/yoyoclaw/fullduplex`,
       deviceInfo: config.deviceInfo,
       userInfo: config.userInfo,
       onMessage: this.handleCloudMessage,
@@ -37,7 +42,7 @@ export class ClawChannel {
    * 启动连接
    */
   start(): void {
-    useClawLogger().info('[yoyoclaw-channel] starting connection');
+    useClawLogger().info("[yoyoclaw-channel] starting connection");
     this.cloudClient.connect();
   }
 
@@ -45,7 +50,7 @@ export class ClawChannel {
    * 关闭连接
    */
   destroy(): void {
-    useClawLogger().info('[yoyoclaw-channel] closing connection');
+    useClawLogger().info("[yoyoclaw-channel] closing connection");
     this.closeAllGatewayClients();
     this.cloudClient.close();
   }
@@ -54,7 +59,7 @@ export class ClawChannel {
    * 处理云侧连接打开
    */
   private handleCloudOpen = () => {
-    useClawLogger().info('[yoyoclaw-channel] cloud connection established');
+    useClawLogger().info("[yoyoclaw-channel] cloud connection established");
     this.config.onOpen?.();
   };
 
@@ -62,7 +67,7 @@ export class ClawChannel {
    * 处理云侧连接关闭
    */
   private handleCloudClose = () => {
-    useClawLogger().info('[yoyoclaw-channel] cloud connection closed');
+    useClawLogger().info("[yoyoclaw-channel] cloud connection closed");
     this.config.onClose?.();
   };
 
@@ -70,23 +75,16 @@ export class ClawChannel {
    * 处理对向设备离线
    */
   private handleRemoteDeviceOffline = (sourceDeviceId: string) => {
-    // 关闭对应的 GatewayClient 连接
-    const gatewayClient = this.gatewayClientsMap.get(sourceDeviceId);
-    if (gatewayClient) {
-      gatewayClient.stop();
-      this.gatewayClientsMap.delete(sourceDeviceId);
-      this.deviceIdToSourceInfoMap.delete(sourceDeviceId);
-      useClawLogger().info(`[yoyoclaw-channel] closed gateway client for offline device: ${sourceDeviceId}`);
-    } else {
-      useClawLogger().warn(`[yoyoclaw-channel] no gateway client found for offline device: ${sourceDeviceId}`);
-    }
+    this.closeGatewayClient(sourceDeviceId);
   };
 
   /**
    * 处理当前设备未注册
    */
   private handleDeviceNotRegistered = () => {
-    useClawLogger().info('[yoyoclaw-channel] device not registered, notifying connection layer');
+    useClawLogger().info(
+      "[yoyoclaw-channel] device not registered, notifying connection layer"
+    );
     this.config.onDeviceNotRegistered?.();
   };
 
@@ -95,13 +93,13 @@ export class ClawChannel {
    */
   private handleCloudMessage = (message: YoyoClawMessage) => {
     // 处理配对消息
-    if (message.msgType === 'devicePairMessage') {
+    if (message.msgType === "devicePairMessage") {
       this.handlePairMessage(message);
       return;
     }
 
     // 处理用户消息，转发到对应的GatewayClient
-    if (message.msgType === 'userMessage') {
+    if (message.msgType === "userMessage") {
       this.handleUserMessage(message);
     }
   };
@@ -110,35 +108,73 @@ export class ClawChannel {
    * 处理配对消息，创建GatewayClient连接
    */
   private handlePairMessage(message: YoyoClawMessage): void {
-    if (message.msgType !== 'devicePairMessage') {
+    if (message.msgType !== "devicePairMessage") {
       return;
     }
 
     try {
-      const { sourceDeviceId, sourceDeviceInfo, targetDeviceId, port } = message;
+      const {
+        sourceDeviceId,
+        sourceDeviceInfo,
+        targetDeviceId,
+        port,
+        sessionInfo,
+      } = message;
+
+      if (
+        sourceDeviceId &&
+        targetDeviceId &&
+        port &&
+        sourceDeviceInfo?.deviceId
+      ) {
+        const hardwareDeviceId = sourceDeviceInfo.deviceId;
+        const newTimestamp = sessionInfo?.nodeConnectTimestamp;
+
+        if (!newTimestamp) {
+          // 兜底旧版本，异常场景，暂时不移除旧连接
+          useClawLogger().warn(
+            `[yoyoclaw-channel] pair message missing timestamp for device: ${sourceDeviceId}`
+          );
+        } else {
+          // 关闭该硬件设备ID对应的所有前序 GatewayClient（timestamp 小于新 timestamp）
+          this.closePreviousGatewayClients(hardwareDeviceId, newTimestamp);
+        }
 
-      if (sourceDeviceId && targetDeviceId && port) {
         useClawLogger().info(
-          `[yoyoclaw-channel] received pair message, creating gateway client for device: ${sourceDeviceId}`
+          `[yoyoclaw-channel] received pair message, creating gateway client for device: ${sourceDeviceId}, hardware device: ${hardwareDeviceId}, timestamp: ${newTimestamp}`
         );
 
-        // 保存设备ID对应的源信息
-        this.deviceIdToSourceInfoMap.set(sourceDeviceId, {
-          sourceRole: sourceDeviceInfo?.role ?? 'node',
-          sourceDeviceId: sourceDeviceId,
-          sourceDeviceInfo: sourceDeviceInfo,
-        });
+        // 创建会话信息
+        const sessionInfoData: DeviceSessionInfo = {
+          sessionId: sourceDeviceId,
+          timestamp: newTimestamp,
+          sourceInfo: {
+            sourceRole: sourceDeviceInfo?.role ?? "node",
+            sourceDeviceId: sourceDeviceId,
+            sourceDeviceInfo: sourceDeviceInfo,
+          },
+        };
+
+        // 保存会话信息
+        const sessions = this.deviceSessionsMap.get(hardwareDeviceId) || [];
+        sessions.push(sessionInfoData);
+        this.deviceSessionsMap.set(hardwareDeviceId, sessions);
+        this.sessionIdToHardwareDeviceMap.set(sourceDeviceId, hardwareDeviceId);
 
         // 创建GatewayClient
         const gatewayClient = new GatewayClient({
           onOpen: () => {
-            useClawLogger().info(`[yoyoclaw-channel] gateway client connected for device: ${sourceDeviceId}`);
+            useClawLogger().info(
+              `[yoyoclaw-channel] gateway client connected for device: ${sourceDeviceId}`
+            );
           },
-          onMessage: data => {
+          onMessage: (data) => {
             this.handleGatewayMessage(sourceDeviceId, data);
           },
-          onClose: () => {
-            useClawLogger().info(`[yoyoclaw-channel] gateway client closed for device: ${sourceDeviceId}`);
+          onClose: (reason) => {
+            useClawLogger().info(
+              `[yoyoclaw-channel] gateway client closed for device: ${sourceDeviceId}, with ${reason}`
+            );
           },
         });
 
@@ -146,7 +182,9 @@ export class ClawChannel {
         gatewayClient.start();
       }
     } catch (error) {
-      useClawLogger().error(`[yoyoclaw-channel] failed to handle pair message: ${String(error)}`);
+      useClawLogger().error(
+        `[yoyoclaw-channel] failed to handle pair message: ${String(error)}`
+      );
     }
   }
 
@@ -155,24 +193,38 @@ export class ClawChannel {
    */
   private handleUserMessage(message: YoyoClawMessage): void {
     if (!message.sourceDeviceId) {
-      useClawLogger().warn('[yoyoclaw-channel] user message missing sourceDeviceId');
+      useClawLogger().warn(
+        "[yoyoclaw-channel] user message missing sourceDeviceId"
+      );
       return;
     }
 
+    const hardwareDeviceId = this.sessionIdToHardwareDeviceMap.get(
+      message.sourceDeviceId
+    );
+
     try {
       const gatewayClient = this.gatewayClientsMap.get(message.sourceDeviceId);
       if (!gatewayClient) {
-        useClawLogger().warn(`[yoyoclaw-channel] no gateway client found for source device: ${message.sourceDeviceId}`);
+        useClawLogger().warn(
+          `[yoyoclaw-channel] no gateway client found for source device: ${hardwareDeviceId}, session: ${message.sourceDeviceId}`
+        );
         return;
       }
 
       // 只发送data部分
       if (message.data) {
-        useClawLogger().info(`[yoyoclaw-channel] forwarding user message to gateway from ${message.sourceDeviceId}`);
+        useClawLogger().info(
+          `[yoyoclaw-channel] forwarding user message to gateway from ${hardwareDeviceId}, session: ${message.sourceDeviceId}`
+        );
         gatewayClient.send(message.data);
       }
     } catch (error) {
-      useClawLogger().error(`[yoyoclaw-channel] failed to handle user message: ${String(error)}`);
+      useClawLogger().error(
+        `[yoyoclaw-channel] failed to send gateway message to ${hardwareDeviceId}: ${String(
+          error
+        )}, session: ${message.sourceDeviceId}`
+      );
     }
   }
 
@@ -180,39 +232,62 @@ export class ClawChannel {
    * 处理来自Gateway的消息，转发到云侧
    */
   private handleGatewayMessage(sourceDeviceId: string, data: string): void {
-    const sourceInfo = this.deviceIdToSourceInfoMap.get(sourceDeviceId);
+    const hardwareDeviceId =
+      this.sessionIdToHardwareDeviceMap.get(sourceDeviceId);
+    if (!hardwareDeviceId) {
+      useClawLogger().warn(
+        `[yoyoclaw-channel] gateway source node offline, session: ${sourceDeviceId}`
+      );
+      return;
+    }
+
+    const sessions = this.deviceSessionsMap.get(hardwareDeviceId);
+    const sessionInfo = sessions?.find((s) => s.sessionId === sourceDeviceId);
 
-    if (!sourceInfo) {
-      useClawLogger().warn('[yoyoclaw-channel] gateway source node offline');
+    if (!sessionInfo) {
+      useClawLogger().warn(
+        `[yoyoclaw-channel] gateway source node offline, session: ${sourceDeviceId}`
+      );
       return;
     }
 
+    useClawLogger().debug?.(
+      `[yoyoclaw-channel] received gateway message from ${
+        sessionInfo.sourceInfo.sourceDeviceInfo?.deviceId
+      } to cloud:, ${data.slice(0, 1000)}`
+    );
+
     try {
       // 将Gateway的消息封装成YoyoClawMessage发送到云侧
       // 使用当前接收到的socket对应deviceId的来源信息
       const cloudMessage: YoyoClawMessage = {
-        msgType: 'userMessage',
-        sourceRole: 'yoyoclaw',
+        msgType: "userMessage",
+        sourceRole: "yoyoclaw",
         sourceDeviceId: this.config.deviceInfo.deviceId,
-        targetRole: 'node',
-        targetDeviceId: sourceInfo.sourceDeviceId,
+        targetRole: "node",
+        targetDeviceId: sessionInfo.sourceInfo.sourceDeviceId,
         port: this.config.deviceInfo.port,
         data,
       };
 
-      const result = this.cloudClient.send(cloudMessage);
+      const result = this.cloudClient.send(
+        cloudMessage,
+        sessionInfo.sourceInfo.sourceDeviceInfo?.deviceId
+      );
 
       if (!result) {
         // 云socket挂了，这个gateway连接就需要取消掉
         // 最好不要一次性把所有的gateway连接都干掉，让惰性关闭
         useClawLogger().error(
-          `[yoyoclaw-channel] failed to send message, cloud socket closed, from: ${sourceInfo.sourceDeviceId}`
+          `[yoyoclaw-channel] failed to send message, cloud socket closed, from: ${sessionInfo.sourceInfo.sourceDeviceId}`
         );
 
-        this.handleRemoteDeviceOffline(sourceInfo.sourceDeviceId);
+        this.handleRemoteDeviceOffline(sessionInfo.sourceInfo.sourceDeviceId);
       }
     } catch (error) {
-      useClawLogger().error(`[yoyoclaw-channel] failed to handle gateway message: ${String(error)}`);
+      useClawLogger().error(
+        `[yoyoclaw-channel] failed to handle gateway message: ${String(error)}`
+      );
     }
   }
 
@@ -220,11 +295,73 @@ export class ClawChannel {
    * 关闭所有GatewayClient连接
    */
   private closeAllGatewayClients(): void {
-    for (const [deviceId, client] of this.gatewayClientsMap.entries()) {
+    for (const [sessionId, client] of this.gatewayClientsMap.entries()) {
       client.stop();
-      useClawLogger().info(`[yoyoclaw-channel] closed gateway client for device: ${deviceId}`);
+      useClawLogger().info(
+        `[yoyoclaw-channel] closed gateway client for session: ${sessionId}`
+      );
     }
     this.gatewayClientsMap.clear();
-    this.deviceIdToSourceInfoMap.clear();
+    this.deviceSessionsMap.clear();
+    this.sessionIdToHardwareDeviceMap.clear();
+  }
+
+  /**
+   * 关闭硬件设备的所有前序 GatewayClient（timestamp 小于指定值）
+   */
+  private closePreviousGatewayClients(
+    hardwareDeviceId: string,
+    newTimestamp: number
+  ): void {
+    const sessions = this.deviceSessionsMap.get(hardwareDeviceId);
+    if (!sessions || sessions.length === 0) {
+      return;
+    }
+
+    // 找出所有 timestamp 小于新 timestamp 的会话
+    const previousSessions = sessions.filter((s) => s.timestamp < newTimestamp);
+
+    if (previousSessions.length > 0) {
+      useClawLogger().info(
+        `[yoyoclaw-channel] closing ${previousSessions.length} previous gateway client(s) for hardware device: ${hardwareDeviceId}, new timestamp: ${newTimestamp}`
+      );
+
+      for (const session of previousSessions) {
+        this.closeGatewayClient(session.sessionId);
+      }
+    }
+  }
+
+  /**
+   * 关闭单个 GatewayClient
+   */
+  private closeGatewayClient(sessionId: string): void {
+    const gatewayClient = this.gatewayClientsMap.get(sessionId);
+    if (gatewayClient) {
+      gatewayClient.stop();
+      this.gatewayClientsMap.delete(sessionId);
+
+      // 从会话映射中移除
+      const hardwareDeviceId = this.sessionIdToHardwareDeviceMap.get(sessionId);
+      if (hardwareDeviceId) {
+        const sessions = this.deviceSessionsMap.get(hardwareDeviceId);
+        if (sessions) {
+          const index = sessions.findIndex((s) => s.sessionId === sessionId);
+          if (index !== -1) {
+            sessions.splice(index, 1);
+          }
+
+          // 如果没有会话了，清理该硬件设备的记录
+          if (sessions.length === 0) {
+            this.deviceSessionsMap.delete(hardwareDeviceId);
+          }
+        }
+        this.sessionIdToHardwareDeviceMap.delete(sessionId);
+      }
+
+      useClawLogger().info(
+        `[yoyoclaw-channel] closed gateway client for session: ${sessionId}`
+      );
+    }
   }
 }

package/src/cloud-channel/client.ts

@@ -80,7 +80,9 @@ export class ClawCloudSocketClient {
 
     this.ws.on("open", () => {
       const connectionType = isRetry ? "reconnected" : "connected";
-      useClawLogger().info(`[claw-cloud-socket] ${connectionType} to ${url}`);
+      useClawLogger().info(
+        `[claw-cloud-socket] ${connectionType} to ${url.slice(0, 15)}`
+      );
 
       // 清除重试定时器
       this.clearRetryTimer();
@@ -129,7 +131,7 @@ export class ClawCloudSocketClient {
   /**
    * 发送消息
    */
-  send(message: YoyoClawMessage): boolean {
+  send(message: YoyoClawMessage, toDeviceId?: string): boolean {
     if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
       useClawLogger().error(
         "[claw-cloud-socket] cannot send message: connection not open"
@@ -141,14 +143,18 @@ export class ClawCloudSocketClient {
       const msgText = JSON.stringify(message);
 
       useClawLogger().debug?.(
-        `[yoyoclaw-cloud] send message to cloud:, ${msgText.slice(0, 500)}`
+        `[yoyoclaw-cloud] send message to cloud session ${
+          message.targetDeviceId
+        }, device: ${toDeviceId}:, ${msgText.slice(0, 1000)}`
       );
 
       this.ws.send(msgText);
       return true;
     } catch (error) {
       useClawLogger().error(
-        `[claw-cloud-socket] failed to send message: ${
+        `[claw-cloud-socket] failed to send message to cloud session ${
+          message.targetDeviceId
+        }, device: ${toDeviceId}: ${
           error instanceof Error ? error.message : String(error)
         }`
       );
@@ -188,11 +194,19 @@ export class ClawCloudSocketClient {
       const message: YoyoClawSocketMessage = JSON.parse(dataText);
 
       useClawLogger().debug?.(
-        `[yoyoclaw-channel] received cloud message: ${dataText.slice(0, 500)}`
+        `[yoyoclaw-channel] received cloud message from session ${
+          message.wsOutputEvent?.sourceDeviceId
+        }, deviceId ${
+          message.wsOutputEvent?.sourceDeviceInfo?.deviceId
+        }: ${dataText.slice(0, 1000)}`
       );
 
       if (message.code === "YOYO_CLAW_100000") {
         if (message.wsOutputEvent) {
+          // 将 sessionInfo 从 wrapper 复制到 message 中
+          if (message.sessionInfo) {
+            message.wsOutputEvent.sessionInfo = message.sessionInfo;
+          }
           this.options.onMessage?.(message.wsOutputEvent);
           return;
         }
@@ -200,7 +214,7 @@ export class ClawCloudSocketClient {
         // 对向设备离线，当前设备对应的gateway连接都可以销毁掉
         if (message.extData?.offlineSocketId) {
           useClawLogger().info(
-            `[claw-cloud-socket] remote device offline: ${message.extData.offlineSocketId}`
+            `[claw-cloud-socket] remote device offline, session: ${message.extData.offlineSocketId}`
           );
           this.options.onRemoteDeviceOffline?.(message.extData.offlineSocketId);
 

package/src/cloud-channel/types.ts

@@ -17,6 +17,12 @@ export interface YoyoClawMessage {
   port: number | string;
   data?: string;
   msgType: "userMessage" | "devicePairMessage";
+  /**
+   * 会话轮次等追加信息，只有配对消息有
+   */
+  sessionInfo?: {
+    nodeConnectTimestamp: number;
+  };
 }
 
 /**
@@ -43,6 +49,12 @@ export interface YoyoClawSocketWrapper<T> {
   extData?: {
     offlineSocketId?: string;
   };
+  /**
+   * 会话轮次等追加信息，只有配对消息有
+   */
+  sessionInfo?: {
+    nodeConnectTimestamp: number;
+  }
 }
 
 /**
@@ -79,3 +91,12 @@ export interface ClawSocketClientOptions {
   // 当前设备未注册回调
   onDeviceNotRegistered?: () => void;
 }
+
+/**
+ * 设备会话信息
+ */
+export interface DeviceSessionInfo {
+  sessionId: string;
+  timestamp: number;
+  sourceInfo: ClawSocketSourceInfo;
+}

package/src/commands/env/impl.ts

@@ -5,8 +5,8 @@ import type { Command } from "commander";
 export function registerEnvCommand(_: unknown, command: Command) {
   const nextCommand = command
     .command("env")
-    .description("Manage runtime environment (test/production)")
-    .option("--set <env>", "Set environment: test or production")
+    .description("Manage runtime environment (dev/test/production)")
+    .option("--set <env>", "Set environment: dev, test or production")
     .action(async (options) => {
       const { set: setEnv } = options;
       const logger = useClawLogger();
@@ -16,7 +16,7 @@ export function registerEnvCommand(_: unknown, command: Command) {
 
         if (setEnv) {
           // 设置环境
-          if (setEnv !== "test" && setEnv !== "production") {
+          if (setEnv !== "test" && setEnv !== "dev" && setEnv !== "production") {
             logger.error("❌ Invalid environment. Use 'test' or 'production'.");
             return;
           }

package/src/commands/index.ts

@@ -1,6 +1,7 @@
 import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { registerLoginCommand } from "./login/index.js";
 import { registerStatusCommand } from "./status/index.js";
+import { registerLogoutCommand } from "./logout/index.js";
 import { registerEnvCommand } from "./env/index.js";
 import { isBetaVersion } from "../utils/version.js";
 
@@ -15,7 +16,8 @@ export function registerCommands(api: OpenClawPluginApi) {
       registerLoginCommand(api, rootCommand);
       // @ts-ignore
       registerStatusCommand(api, rootCommand);
-      // registerLogoutCommand(api, rootCommand);
+      // @ts-ignore
+      registerLogoutCommand(api, rootCommand);
 
       // 只在 beta 版本时注册 env 命令
       if (isBetaVersion()) {

package/src/commands/logout/impl.ts

@@ -0,0 +1,26 @@
+import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { type Command } from "commander";
+import { getConfigManager } from "../../modules/claw-configs/config-manager.js";
+
+export function registerLogoutCommand(api: OpenClawPluginApi, command: Command) {
+  const nextCommand = command
+    .command("logout")
+    .description("退出登录并清除用户配置")
+    .action(async () => {
+      api.logger.info("logout CLI command called");
+      
+      try {
+        // 清除用户配置
+        const configManager = getConfigManager();
+        await configManager.clearUserConfig();
+        console.log("✅ 用户配置已清除");
+        console.log("✅ 去登录成功，网关将自动重启处理新配置");
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        console.error("❌ 去登录失败:", errorMessage);
+        throw error;
+      }
+    });
+
+  return nextCommand;
+}

package/src/commands/logout/index.ts

@@ -1,53 +1 @@
-import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
-import { getConnectionManager } from "../../services/connection-manager.js";
-import { type Command } from "commander";
-
-export function registerLogoutCommand(api: OpenClawPluginApi, command: Command) {
-  const nextCommand = command
-    .command("logout")
-    .description("Logout and disconnect from YOYOClaw")
-    .option("--force", "Force logout without confirmation")
-    .action(async (options) => {
-      api.logger.info("honor logout CLI command called");
-
-      const { force } = options;
-      const connectionManager = getConnectionManager();
-      const isConnected = connectionManager.isConnected();
-      const connectedDevices = connectionManager.getConnectedDevices();
-
-      if (!isConnected) {
-        console.log("⚠️  当前未连接到 YOYOClaw");
-        return;
-      }
-
-      // 如果有活跃的设备连接且不是强制模式，提示确认
-      if (connectedDevices.length > 0 && !force) {
-        console.log(`⚠️  当前有 ${connectedDevices.length} 个活跃的设备连接:`);
-        for (const device of connectedDevices) {
-          console.log(`  - ${device}`);
-        }
-        console.log("\n⚠️  断开连接将停止所有设备间的通信");
-        console.log('💡 使用 --force 选项可以跳过此确认');
-        
-        // 注意：在命令行工具中，我们无法直接等待用户输入
-        // 这里我们给出提示，然后继续执行
-        console.log("\n🔌 正在断开连接...");
-      } else {
-        console.log("🔌 正在断开连接...");
-      }
-
-      try {
-        await connectionManager.cleanup();
-        console.log("✅ WebSocket 连接已关闭");
-        console.log("✅ 所有设备连接已清理");
-        console.log("✅ 资源已释放");
-        console.log("👋 已登出");
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        console.error("❌ 登出失败:", errorMessage);
-        throw error;
-      }
-    });
-
-  return nextCommand;
-}
+export * from "./impl.js";

package/src/gateway-client/client.ts

@@ -1,9 +1,9 @@
-import { rawDataToString } from "openclaw/plugin-sdk";
-import { WebSocket } from "ws";
-import { GatewayClientOptions } from "./types.js";
-import { useClawLogger } from "../utils/logger.js";
+import { rawDataToString } from 'openclaw/plugin-sdk';
+import { WebSocket } from 'ws';
+import { GatewayClientOptions } from './types.js';
+import { getConfigManager } from '../modules/claw-configs/config-manager.js';
 
-const GATEWAY_SERVER_URL = "ws://127.0.0.1:18789";
+const GATEWAY_SERVER_URL = 'ws://127.0.0.1:18789';
 
 /**
  * 纯透传 Gateway Client
@@ -26,29 +26,28 @@ export class GatewayClient {
     if (this.closed) {
       return;
     }
-    const url = GATEWAY_SERVER_URL;
+
+    const configManager = getConfigManager();
+    const url = `ws://127.0.0.1:${configManager.getGatewayPort()}`;
     this.ws = new WebSocket(url, { maxPayload: 25 * 1024 * 1024 });
 
-    this.ws.on("open", () => {
+    this.ws.on('open', () => {
       this.opts.onOpen?.();
     });
 
-    this.ws.on("message", (data) => {
+    this.ws.on('message', data => {
       const dataText = rawDataToString(data);
-      useClawLogger().debug?.(`[yoyoclaw-gateway] received message:, ${dataText.slice(0, 500)}`);
       this.opts.onMessage?.(dataText);
     });
 
-    this.ws.on("close", (code, reason) => {
+    this.ws.on('close', (code, reason) => {
       const reasonText = rawDataToString(reason);
       this.ws = null;
-      useClawLogger().info(`[yoyoclaw-gateway] closed (${code}): ${reasonText}`);
-      this.opts.onClose?.();
+      this.opts.onClose?.(`code: ${code}, reason: ${reasonText ?? ''}`);
     });
 
-    this.ws.on("error", (err) => {
-      useClawLogger().error(`[yoyoclaw-gateway] error: ${String(err)}`);
-      this.opts.onClose?.();
+    this.ws.on('error', err => {
+      this.opts.onClose?.(`socket error: ${(err as Error).message}`);
     });
   }
 
@@ -66,11 +65,9 @@ export class GatewayClient {
    */
   send(data: Buffer | string): void {
     if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-      useClawLogger().error(
-        "[yoyoclaw-gateway] send failed: gateway not connected"
-      );
-      return;
+      throw new Error('gateway not connected');
     }
+
     this.ws.send(data);
   }
 }

package/src/gateway-client/types.ts

@@ -4,5 +4,5 @@
 export interface GatewayClientOptions {
   onMessage?: (data: string) => void; // 原始消息透传
   onOpen?: () => void;
-  onClose?: () => void;
-}
+  onClose?: (reason: string) => void;
+}

package/src/modules/claw-configs/config-manager.ts

@@ -4,6 +4,7 @@
 
 import type { OpenClawConfig } from "openclaw/plugin-sdk";
 import { getYoyoRuntime } from "../../runtime.js";
+import { isBetaVersion } from "../../utils/version.js";
 import type { GatewayAuthConfig, UserConfig } from "./types.js";
 
 const PLUGIN_YOYO_ID = "yoyo";
@@ -21,7 +22,8 @@ export class ConfigManager {
       return runtime.config.loadConfig();
     } catch (error) {
       throw new Error(
-        `Failed to load config: ${error instanceof Error ? error.message : String(error)
+        `Failed to load config: ${
+          error instanceof Error ? error.message : String(error)
         }`
       );
     }
@@ -36,7 +38,8 @@ export class ConfigManager {
       await runtime.config.writeConfigFile(config);
     } catch (error) {
       throw new Error(
-        `Failed to save config: ${error instanceof Error ? error.message : String(error)
+        `Failed to save config: ${
+          error instanceof Error ? error.message : String(error)
         }`
       );
     }
@@ -112,22 +115,24 @@ export class ConfigManager {
   /**
    * 获取运行环境配置
    */
-  getEnv(): 'test' | 'production' {
+  getEnv(): "test" | "production" {
     try {
       const config = this.loadConfig();
-      const env = config.plugins?.entries?.[PLUGIN_YOYO_ID]?.config
-        ?.env as 'test' | 'production' | undefined;
-      return env || 'test';
+      const env = config.plugins?.entries?.[PLUGIN_YOYO_ID]?.config?.env as
+        | "test"
+        | "production"
+        | undefined;
+      return env || "test";
     } catch (error) {
       console.error(`[claw-configs] Failed to read env config: ${error}`);
-      return 'test';
+      return "test";
     }
   }
 
   /**
    * 更新运行环境配置
    */
-  async updateEnv(env: 'test' | 'production'): Promise<void> {
+  async updateEnv(env: "test" | "production"): Promise<void> {
     try {
       const currentConfig = this.loadConfig();
       const currentUserConfig = this.getUserConfig() || {};
@@ -187,7 +192,8 @@ export class ConfigManager {
       await this.saveConfig(updatedConfig);
     } catch (error) {
       throw new Error(
-        `Failed to update user config: ${error instanceof Error ? error.message : String(error)
+        `Failed to update user config: ${
+          error instanceof Error ? error.message : String(error)
         }`
       );
     }
@@ -219,7 +225,8 @@ export class ConfigManager {
       await this.saveConfig(updatedConfig);
     } catch (error) {
       throw new Error(
-        `Failed to clear user config: ${error instanceof Error ? error.message : String(error)
+        `Failed to clear user config: ${
+          error instanceof Error ? error.message : String(error)
         }`
       );
     }
@@ -266,7 +273,7 @@ export class ConfigManager {
         "sound.vibration",
         "ringing.mode",
         "vibration.mode",
-        "close.app"
+        "close.app",
       ];
 
       const currentAllowCommands =
@@ -275,12 +282,33 @@ export class ConfigManager {
         new Set([...currentAllowCommands, ...commandsToAdd])
       );
 
+      // 处理 env 默认值（仅在未设置时设置）
+      const currentEnv =
+        currentConfig.plugins?.entries?.[pluginId]?.config?.env;
+      const shouldSetEnv = !currentEnv;
+      const defaultEnv = isBetaVersion() ? "test" : "production";
+
+      // 构建插件配置
+      const pluginConfig =
+        currentConfig.plugins?.entries?.[pluginId]?.config || {};
+      const updatedPluginConfig = shouldSetEnv
+        ? { ...pluginConfig, env: defaultEnv }
+        : pluginConfig;
+
       // 一次性更新所有配置
       const updatedConfig: OpenClawConfig = {
         ...currentConfig,
         plugins: {
           ...currentConfig.plugins,
           allow: updatedAllow,
+          entries: {
+            ...currentConfig.plugins?.entries,
+            [pluginId]: {
+              ...currentConfig.plugins?.entries?.[pluginId],
+              enabled: true,
+              config: updatedPluginConfig,
+            },
+          },
         },
         gateway: {
           ...currentConfig.gateway,
@@ -294,7 +322,8 @@ export class ConfigManager {
       await this.saveConfig(updatedConfig);
     } catch (error) {
       throw new Error(
-        `failed to initialize plugin config: ${error instanceof Error ? error.message : String(error)
+        `failed to initialize plugin config: ${
+          error instanceof Error ? error.message : String(error)
         }`
       );
     }

package/src/modules/claw-configs/hosts.ts

@@ -0,0 +1,30 @@
+import { getYoyoEnv } from '../../runtime.js';
+
+/**
+ * 获取当前环境的api host信息
+ */
+export function takeApiHost() {
+  const env = getYoyoEnv();
+
+  switch (env) {
+    case 'dev': {
+      return {
+        clawCloud: 'omni-dev-drcn.hiboard.hihonorcloud.com',
+        ics: 'api-agd-test-drcn.hiboard.hihonorcloud.com',
+      };
+    }
+    case 'test': {
+      return {
+        clawCloud: 'omni-pre-drcn.hiboard.hihonorcloud.com',
+        ics: 'api-agd-test-drcn.hiboard.hihonorcloud.com',
+      };
+    }
+    case 'production':
+    default: {
+      return {
+        clawCloud: 'yoyoclaw-drcn.hiboard.hihonorcloud.com',
+        ics: 'api-prd-drcn.hiboard.hihonorcloud.com',
+      };
+    }
+  }
+}

package/src/modules/claw-configs/index.ts

@@ -5,3 +5,4 @@
 
 export * from './types.js';
 export * from './config-manager.js';
+export * from './hosts.js';

package/src/modules/claw-configs/types.ts

@@ -27,6 +27,6 @@ export interface YoyoClawPluginConfig {
   config?: {
     user?: UserConfig;
     /** 运行环境：test 或 production */
-    env?: 'test' | 'production';
+    env?: 'dev' | 'test' | 'production';
   };
 }

package/src/modules/device/device-info.ts

@@ -4,6 +4,8 @@
 import type { DeviceInfo } from '../../types.js';
 import { WindowsDeviceInfoProvider } from './providers/windows.js';
 import { PadDevice } from './providers/pad.js';
+import { LinuxDeviceInfoProvider } from './providers/linux.js';
+import { MacOSDeviceInfoProvider } from './providers/macos.js';
 import type { DeviceInfoProvider } from './providers/base.js';
 import { useClawLogger } from '../../utils/logger.js';
 import { getConfigManager } from '../claw-configs/config-manager.js';
@@ -11,7 +13,7 @@ import { getConfigManager } from '../claw-configs/config-manager.js';
 /**
  * 检测当前设备类型
  */
-function detectDeviceType(): 'windows' | 'android' {
+function detectDeviceType(): 'windows' | 'pad' | 'linux' | 'macos' {
   const platform = process.platform;
 
   if (platform === 'win32') {
@@ -19,20 +21,24 @@ function detectDeviceType(): 'windows' | 'android' {
   }
 
   if (platform === 'linux') {
-    // 检查是否为 Android 环境
+    // 检查是否为 pad 环境
     try {
       const fs = require('fs');
       if (fs.existsSync('/system/bin/getprop')) {
-        return 'android';
+        return 'pad';
       }
     } catch {
-      // 忽略错误，默认为 android
+      // 忽略错误，继续检测为 Linux
     }
-    return 'android';
+    return 'linux';
   }
 
-  // 默认返回 windows（兼容性）
-  return 'windows';
+  if (platform === 'darwin') {
+    return 'macos';
+  }
+
+  // 默认返回 linux（兼容性）
+  return 'linux';
 }
 
 /**
@@ -42,11 +48,16 @@ function getDeviceInfoProvider(): DeviceInfoProvider {
   const deviceType = detectDeviceType();
 
   switch (deviceType) {
-    case 'android':
+    case 'pad':
       return new PadDevice();
     case 'windows':
-    default:
       return new WindowsDeviceInfoProvider();
+    case 'linux':
+      return new LinuxDeviceInfoProvider();
+    case 'macos':
+      return new MacOSDeviceInfoProvider();
+    default:
+      return new LinuxDeviceInfoProvider();
   }
 }
 

package/src/modules/device/providers/linux.ts

@@ -0,0 +1,128 @@
+/**
+ * Linux 设备信息提供者
+ */
+import { v4 as uuidv4 } from 'uuid';
+import os from 'os';
+import { execSync } from 'child_process';
+import { createHash } from 'crypto';
+import type { DeviceInfoProvider } from './base.js';
+import type { DeviceType } from '../../../types.js';
+
+export class LinuxDeviceInfoProvider implements DeviceInfoProvider {
+  /**
+   * 执行 shell 命令并获取输出
+   */
+  private execCommand(command: string): string {
+    try {
+      return execSync(command, { encoding: 'utf-8' }).trim();
+    } catch {
+      return '';
+    }
+  }
+
+  /**
+   * 获取 Linux 设备唯一ID
+   */
+  private getLinuxDeviceId(): string {
+    try {
+      // 尝试获取机器ID（systemd-based systems）
+      const machineId = this.execCommand('cat /etc/machine-id 2>/dev/null');
+      if (machineId) {
+        return machineId;
+      }
+
+      // 尝试获取 D-Bus 机器ID
+      const dbusMachineId = this.execCommand('cat /var/lib/dbus/machine-id 2>/dev/null');
+      if (dbusMachineId) {
+        return dbusMachineId;
+      }
+
+      // 尝试获取主板序列号
+      const serial = this.execCommand('sudo dmidecode -s system-serial-number 2>/dev/null');
+      if (serial && serial !== 'Not Specified') {
+        return serial;
+      }
+
+      // 获取 CPU 信息作为备选
+      const cpuInfo = this.execCommand('cat /proc/cpuinfo | grep "serial" | head -1 | cut -d":" -f2 | tr -d " "');
+      if (cpuInfo) {
+        return cpuInfo;
+      }
+
+      // 最后备用方案：使用主机名和架构生成哈希
+      const hostname = os.hostname();
+      const arch = os.arch();
+      const raw = `${hostname}_${arch}_${os.platform()}`;
+      return createHash('sha256').update(raw, 'utf-8').digest('hex');
+    } catch {
+      return uuidv4();
+    }
+  }
+
+  /**
+   * 获取 Linux 设备型号
+   */
+  private getLinuxDeviceModel(): string {
+    try {
+      // 尝试获取产品名称
+      const productName = this.execCommand('sudo dmidecode -s system-product-name 2>/dev/null');
+      if (productName && productName !== 'Not Specified') {
+        return productName;
+      }
+
+      // 尝试获取主板信息
+      const boardName = this.execCommand('sudo dmidecode -s baseboard-product-name 2>/dev/null');
+      if (boardName && boardName !== 'Not Specified') {
+        return boardName;
+      }
+
+      // 尝试从 /sys/class/dmi/id 获取信息
+      const sysProductName = this.execCommand('cat /sys/class/dmi/id/product_name 2>/dev/null');
+      if (sysProductName) {
+        return sysProductName;
+      }
+
+      // 默认返回 Linux PC
+      return 'Linux PC';
+    } catch {
+      return 'Linux PC';
+    }
+  }
+
+  /**
+   * 获取 Linux 设备名称
+   */
+  private getLinuxDeviceName(): string {
+    const hostname = os.hostname();
+    const model = this.getLinuxDeviceModel();
+    return `${hostname} (${model})`;
+  }
+
+  /**
+   * 获取设备唯一ID
+   */
+  getDeviceId(): string {
+    return this.getLinuxDeviceId();
+  }
+
+  /**
+   * 获取设备名称
+   */
+  getDeviceName(): string {
+    return this.getLinuxDeviceName();
+  }
+
+  /**
+   * 获取设备型号
+   */
+  getDeviceModel(): string {
+    return this.getLinuxDeviceModel();
+  }
+
+  /**
+   * 获取设备类型
+   */
+  getDeviceType(): DeviceType {
+    return 'pc';
+  }
+}

package/src/modules/device/providers/macos.ts

@@ -0,0 +1,116 @@
+/**
+ * macOS 设备信息提供者
+ */
+import { v4 as uuidv4 } from 'uuid';
+import os from 'os';
+import { execSync } from 'child_process';
+import { createHash } from 'crypto';
+import type { DeviceInfoProvider } from './base.js';
+import type { DeviceType } from '../../../types.js';
+
+export class MacOSDeviceInfoProvider implements DeviceInfoProvider {
+  /**
+   * 执行 shell 命令并获取输出
+   */
+  private execCommand(command: string): string {
+    try {
+      return execSync(command, { encoding: 'utf-8' }).trim();
+    } catch {
+      return '';
+    }
+  }
+
+  /**
+   * 获取 macOS 设备唯一ID
+   */
+  private getMacOSDeviceId(): string {
+    try {
+      // 获取硬件UUID（最可靠的macOS设备标识）
+      const hardwareUuid = this.execCommand('system_profiler SPHardwareDataType | grep "Hardware UUID" | cut -d ":" -f2 | tr -d " "');
+      if (hardwareUuid) {
+        return hardwareUuid;
+      }
+
+      // 获取序列号
+      const serialNumber = this.execCommand('system_profiler SPHardwareDataType | grep "Serial Number" | cut -d ":" -f2 | tr -d " "');
+      if (serialNumber) {
+        return serialNumber;
+      }
+
+      // 获取主板序列号
+      const boardSerial = this.execCommand('system_profiler SPHardwareDataType | grep "Board ID" | cut -d ":" -f2 | tr -d " "');
+      if (boardSerial) {
+        return boardSerial;
+      }
+
+      // 最后备用方案：使用主机名和架构生成哈希
+      const hostname = os.hostname();
+      const arch = os.arch();
+      const raw = `${hostname}_${arch}_macOS`;
+      return createHash('sha256').update(raw, 'utf-8').digest('hex');
+    } catch {
+      return uuidv4();
+    }
+  }
+
+  /**
+   * 获取 macOS 设备型号
+   */
+  private getMacOSDeviceModel(): string {
+    try {
+      // 获取硬件型号
+      const modelName = this.execCommand('system_profiler SPHardwareDataType | grep "Model Name" | cut -d ":" -f2 | sed "s/^ //"');
+      if (modelName) {
+        return modelName;
+      }
+
+      // 获取机型标识符
+      const modelIdentifier = this.execCommand('system_profiler SPHardwareDataType | grep "Model Identifier" | cut -d ":" -f2 | tr -d " "');
+      if (modelIdentifier) {
+        return modelIdentifier;
+      }
+
+      // 默认返回 Mac
+      return 'Mac';
+    } catch {
+      return 'Mac';
+    }
+  }
+
+  /**
+   * 获取 macOS 设备名称
+   */
+  private getMacOSDeviceName(): string {
+    const hostname = os.hostname();
+    const model = this.getMacOSDeviceModel();
+    return `${hostname} (${model})`;
+  }
+
+  /**
+   * 获取设备唯一ID
+   */
+  getDeviceId(): string {
+    return this.getMacOSDeviceId();
+  }
+
+  /**
+   * 获取设备名称
+   */
+  getDeviceName(): string {
+    return this.getMacOSDeviceName();
+  }
+
+  /**
+   * 获取设备型号
+   */
+  getDeviceModel(): string {
+    return this.getMacOSDeviceModel();
+  }
+
+  /**
+   * 获取设备类型
+   */
+  getDeviceType(): DeviceType {
+    return 'pc';
+  }
+}

package/src/modules/device/providers/pad.ts

@@ -67,22 +67,6 @@ export class PadDevice implements DeviceInfoProvider {
     return this.getAndroidDeviceModel();
   }
 
-  /**
-   * 获取 Android 品牌
-   */
-  private getAndroidBrand(): string {
-    const brand = this.getAndroidProp('ro.product.brand');
-    return brand || 'Android';
-  }
-
-  /**
-   * 获取 Android 系统版本
-   */
-  private getAndroidSysVersion(): string {
-    const version = this.getAndroidProp('ro.honor.build.display.id');
-    return version || 'Android';
-  }
-
   /**
    * 获取设备唯一ID
    */

package/src/modules/device/registry.ts

@@ -1,7 +1,7 @@
 import { createClawCloudClient } from '../../apis/claw-cloud.js';
 import { isOKResponse } from '../../apis/index.js';
 import type { DeviceInfo, HonorUserInfo } from '../../types.js';
-import { getConfigManager } from '../claw-configs/index.js';
+import { getConfigManager, takeApiHost } from '../claw-configs/index.js';
 
 /**
  * 注册设备到 Claw Cloud
@@ -17,7 +17,8 @@ export async function registerDevice(deviceInfo: DeviceInfo, userInfo: HonorUser
     const gatewayAuthConfig = configManager.getGatewayAuthConfig();
 
     // 创建 Claw Cloud 客户端
-    const baseUrl = 'http://omni-pre-drcn.hiboard.hihonorcloud.com/aicloud/yoyo-claw-service';
+    const hosts = takeApiHost();
+    const baseUrl = `https://${hosts.clawCloud}/aicloud/yoyo-claw-service`;
     const client = createClawCloudClient(baseUrl);
 
     // 调用注册接口，传入认证信息

package/src/runtime.ts

@@ -17,7 +17,7 @@ export function getYoyoRuntime(): PluginRuntime {
 /**
  * Yoyo 环境类型
  */
-export type YoyoEnv = "test" | "production";
+export type YoyoEnv = "test" | "production" | "dev";
 
 /**
  * 获取当前运行环境
@@ -29,6 +29,6 @@ export function getYoyoEnv(): YoyoEnv {
     return configManager.getEnv();
   } catch (error) {
     console.error(`[runtime] Failed to get env from config: ${error}`);
-    return "test"; // 默认返回测试环境
+    return "production"; // 默认返回生产环境
   }
 }

package/src/schemas.ts

@@ -17,5 +17,5 @@ const UserInfoSchema = z.object({
 export const YoyoPluginConfigSchema = z.object({
   user: UserInfoSchema.optional(),
   /** 运行环境：test 或 production */
-  env: z.enum(['test', 'production']).optional(),
+  env: z.enum(['dev', 'test', 'production']).optional(),
 });