@honor-claw/yoyo 1.1.4-beta.5 → 1.1.4-beta.8

package/openclaw.plugin.json

@@ -26,7 +26,19 @@
       "device": {
         "type": "object",
         "properties": {
-          "deviceType": {
+          "type": {
+            "type": "string"
+          },
+          "manufacture": {
+            "type": "string"
+          },
+          "brand": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "model": {
             "type": "string"
           }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.1.4-beta.5",
+  "version": "1.1.4-beta.8",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",

package/src/apis/claw-cloud.ts

@@ -1,10 +1,7 @@
-/**
- * Claw Cloud API 接口封装
- */
+import { takeApiHost } from "../modules/configs/hosts.js";
 import type { GatewayAuthConfig } from "../modules/configs/types.js";
 import type { DeviceInfo, HonorUserInfo } from "../types.js";
 import { uuid } from "../utils/id.js";
-import { generateAuthorization } from "../utils/jwt.js";
 import { HttpClient, type HttpResponse, type HttpClientOptions } from "./http-client.js";
 import type {
   DeviceRegistryHeaders,
@@ -13,7 +10,13 @@ import type {
   UserLogoutHeaders,
   UserLogoutRequest,
   UserLogoutResponse,
+  ExchangeTokenRequest,
+  ExchangeTokenHeaders,
+  TokenResponseV2,
+  HttpApiWrapper,
+  ExchangeTokenParams,
 } from "./types.js";
+import { isOKResponse } from "./helpers.js";
 
 /**
  * Claw Cloud API 客户端
@@ -40,24 +43,17 @@ export class ClawCloudClient {
     // 构造请求头
     const headers: DeviceRegistryHeaders = {
       "x-trace-id": uuid(),
+      "x-jwt-token": userInfo.token,
+      "x-device-id": deviceInfo.deviceId,
     };
 
-    if (userInfo.userId) {
-      headers["x-agw-userId"] = userInfo.userId;
-      headers["authorization"] = generateAuthorization(userInfo.userId);
-      headers["x-udid"] = deviceInfo.deviceId;
-    } else if (userInfo.token) {
-      headers["x-jwt-token"] = userInfo.token;
-      headers["x-device-id"] = deviceInfo.deviceId;
-    }
-
     const requestBody: DeviceRegistryRequest = {
       businessTag: "YOYO_CLAW",
       role: "yoyoclaw",
       deviceInfo: {
         ...deviceInfo,
-        manufacture: "unknown",
-        brand: deviceInfo.brand || "unknown",
+        manufacture: deviceInfo.manufacture,
+        brand: deviceInfo.brand,
         bizExtInfo: gatewayAuthConfig,
       },
     };
@@ -81,24 +77,16 @@ export class ClawCloudClient {
     // 构造请求头
     const headers: UserLogoutHeaders = {
       "x-trace-id": uuid(),
+      "x-jwt-token": userInfo.token,
+      "x-device-id": deviceInfo.deviceId,
     };
 
-    // 如果有 userId，添加 x-agw-userId
-    if (userInfo.userId) {
-      headers["x-agw-userId"] = userInfo.userId;
-      headers["x-udid"] = deviceInfo.deviceId;
-      headers["authorization"] = generateAuthorization(userInfo.userId);
-    } else if (userInfo.token) {
-      headers["x-jwt-token"] = userInfo.token;
-      headers["x-device-id"] = deviceInfo.deviceId;
-    }
-
     const requestBody: UserLogoutRequest = {
       businessTag: "YOYO_CLAW",
       deviceInfo: {
         ...deviceInfo,
-        manufacture: "unknown",
-        brand: "unknown",
+        manufacture: deviceInfo.manufacture,
+        brand: deviceInfo.brand,
       },
     };
 
@@ -107,14 +95,71 @@ export class ClawCloudClient {
       body: requestBody,
     });
   }
+
+  /**
+   * 使用授权码换取Token
+   * @param deviceInfo 设备信息
+   * @param params 支持两种模式:
+   *   1. userId模式: { userId: string } - 通过 x-agw-userId header 认证
+   *   2. auth模式: { code: string; authConfig: HonorAuthConfig } - 通过 code + clientId 认证
+   * @returns Token响应
+   */
+  async exchangeToken(
+    deviceInfo: DeviceInfo,
+    params: ExchangeTokenParams,
+  ): Promise<TokenResponseV2> {
+    // 构建请求头
+    const headers: ExchangeTokenHeaders = {
+      "Content-Type": "application/json",
+      "x-device-id": deviceInfo.deviceId,
+      "x-trace-id": uuid(),
+    };
+
+    let data: ExchangeTokenRequest = {};
+
+    if ("userId" in params) {
+      // userId模式: 通过 header 认证，body为空
+      headers["x-agw-userId"] = params.userId;
+    } else {
+      // auth模式: 通过 code + clientId 认证
+      data = {
+        clientId: params.authConfig.clientId,
+        code: params.code,
+      };
+    }
+
+    const response = await this.httpClient.post<HttpApiWrapper<TokenResponseV2>>(
+      "/v1/user/jwtToken",
+      {
+        body: data,
+        headers: headers as unknown as Record<string, string>,
+        timeout: 15000,
+      },
+    );
+
+    if (isOKResponse(response) && response.data.data) {
+      return response.data.data;
+    }
+
+    throw new Error(`failed to get token: ${response.data?.cnMessage}`);
+  }
 }
 
 /**
  * 创建 Claw Cloud 客户端实例
  */
-export function createClawCloudClient(
-  baseUrl: string,
-  options?: HttpClientOptions,
-): ClawCloudClient {
+export function createClawCloudClient(): ClawCloudClient {
+  const hosts = takeApiHost();
+  const baseUrl = `https://${hosts.clawCloud}/aicloud/yoyo-claw-service`;
+
+  // 如果有灰度标签，设置默认headers
+  const options = hosts.grayTag
+    ? {
+        defaultHeaders: {
+          "x-gray": hosts.grayTag,
+        },
+      }
+    : undefined;
+
   return new ClawCloudClient(baseUrl, options);
 }

package/src/apis/http-client.ts

@@ -4,6 +4,7 @@
  */
 
 import { request, type Dispatcher, ProxyAgent } from "undici";
+import { wrapError } from "../utils/error.js";
 import { getProxyUrl, shouldUseProxy } from "../utils/proxy.js";
 
 /**
@@ -170,9 +171,7 @@ export class HttpClient {
       if (error instanceof HttpError) {
         throw error;
       }
-      throw new Error(
-        `HTTP request failed: ${error instanceof Error ? error.message : String(error)}`,
-      );
+      throw wrapError(error, "HTTP request failed");
     }
   }
 

package/src/apis/types.ts

@@ -2,6 +2,7 @@
  * 设备注册接口相关类型定义
  */
 import type { ClawDeviceInfo, DeviceRole } from "../types.js";
+import type { HonorAuthConfig } from "../honor-auth/types.js";
 
 /**
  * 设备注册请求体
@@ -75,3 +76,38 @@ export interface UserLogoutHeaders {
   authorization?: string;
   "x-agw-userId"?: string;
 }
+
+/**
+ * Token响应
+ */
+export type TokenResponseV2 = {
+  jwtToken?: string;
+};
+
+/**
+ * 换取Token请求体
+ */
+export interface ExchangeTokenRequest {
+  clientId?: string;
+  code?: string;
+}
+
+/**
+ * 换取Token参数 - 支持两种模式
+ * 1. userId模式: 通过 x-agw-userId header 认证，body为空
+ * 2. auth模式: 通过 code + clientId 认证
+ */
+export type ExchangeTokenParams =
+  | { userId: string }
+  | { code: string; authConfig: HonorAuthConfig };
+
+/**
+ * 换取Token请求头
+ */
+export interface ExchangeTokenHeaders {
+  "Content-Type": "application/json";
+  "x-device-id": string;
+  "x-trace-id": string;
+  'x-agw-userId'?: string;
+  "x-gray"?: string;
+}

package/src/cloud-channel/client.ts

@@ -4,7 +4,6 @@
  */
 import WebSocket from "ws";
 import { uuid } from "../utils/id.js";
-import { generateAuthorization } from "../utils/jwt.js";
 import { useClawLogger } from "../utils/logger.js";
 import { createWebSocketProxyAgent } from "../utils/proxy.js";
 import { rawDataToString } from "../utils/ws.js";
@@ -69,20 +68,10 @@ export class ClawCloudSocketClient {
     const headers: Record<string, string> = {
       ["x-role"]: "yoyoclaw",
       ["x-trace-id"]: traceId,
+      "x-jwt-token": userInfo.token,
+      "x-device-id": deviceInfo.deviceId,
     };
 
-    if (deviceInfo.deviceId) {
-      headers["x-device-id"] = deviceInfo.deviceId;
-    }
-
-    if (userInfo.userId) {
-      headers["x-agw-userId"] = userInfo.userId;
-      headers["authorization"] = generateAuthorization(userInfo.userId);
-    } else if (userInfo.token) {
-      // v2版本，基于jwt token
-      headers["x-jwt-token"] = userInfo.token;
-    }
-
     if (deviceInfo.port !== undefined) {
       headers["x-port"] = String(deviceInfo.port);
     }

package/src/cloud-channel/message-handler.ts

@@ -444,7 +444,7 @@ export class MessageHandler {
         this.sendContextResponse(msgType, sourceDeviceId, traceInfo, reqContext, {
           ok: false,
           error: result.error,
-          ...(result?.data || {}),
+          ...result?.data,
           ...(isUpdate && { name: contextName }),
         });
       }

package/src/cloud-channel/types.ts

@@ -19,7 +19,7 @@ export interface YOYOClawServiceEvent {
   sourceDeviceInfo?: ClawDeviceInfo;
   targetRole?: DeviceRole;
   targetDeviceId: string;
-  traceInfo: Object;
+  traceInfo: object;
   port: number | string;
   data?: string; // openclaw原生消息
   msgType: "userMessage" | "devicePairMessage" | "deviceUnPairMessage" | "fetchContexts" | "updateContexts";

package/src/commands/login/impl.ts

@@ -1,24 +1,19 @@
 import { type Command } from "commander";
 import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { performLogin } from "../../modules/login/impl.js";
-import { isBetaVersion } from "../../utils/version.js";
 
 export function registerLoginCommand(api: OpenClawPluginApi, command: Command) {
   let nextCommand = command.command("login").description("login to yoyoclaw and register devices");
 
-  if (isBetaVersion()) {
-    nextCommand = nextCommand.option("--skip-auth", "debug mode, no auth required");
-  }
-
   nextCommand = nextCommand
     .option("-u, --uid <userId>", "user ID for direct login")
     .option("--token <token>", "token for direct login")
     .action(async (options) => {
-      const { uid: userId, token, skipAuth } = options;
+      const { uid: userId, token } = options;
 
       api.logger.debug?.("honor login CLI command called");
 
-      await performLogin({ userId, token, noAuth: skipAuth });
+      await performLogin({ userId, token });
     });
 
   return nextCommand;

package/src/commands/status/index.ts

@@ -111,36 +111,6 @@ function displayDetailedStatus(statusData: ConnectionStatusData | null): void {
   console.log(`   ${formatDateTime(statusData.updatedAt)}`);
 }
 
-/**
- * Get emoji for connection status
- */
-function getStateEmoji(status: "idle" | "connecting" | "connected"): string {
-  switch (status) {
-    case "connected":
-      return "✅";
-    case "connecting":
-      return "⏳";
-    case "idle":
-    default:
-      return "⚪";
-  }
-}
-
-/**
- * Get text for connection status
- */
-function getStateText(status: "idle" | "connecting" | "connected"): string {
-  switch (status) {
-    case "connected":
-      return "Connected";
-    case "connecting":
-      return "Connecting";
-    case "idle":
-    default:
-      return "Disconnected";
-  }
-}
-
 /**
  * Format date time (YYYY-MM-DD HH:mm:ss)
  */

package/src/honor-auth/browser.ts

@@ -7,12 +7,13 @@ import { startCallbackServer } from "./callback-server.js";
 import { getConfig } from "./config.js";
 import { saveToken } from "./token-manager.js";
 import type { HonorAuthConfig } from "./types.js";
+import { createClawCloudClient } from "../apis/claw-cloud.js";
 
 /**
  * 执行OAuth2授权流程（自动打开浏览器）
  */
 export async function performOAuth2AuthWithBrowser(
-  _: DeviceInfo,
+  deviceInfo: DeviceInfo,
   configOverrides?: Partial<HonorAuthConfig>,
 ) {
   const config = getConfig(configOverrides);
@@ -63,19 +64,18 @@ export async function performOAuth2AuthWithBrowser(
 
   // 使用授权码换取Token
   try {
-    const tokenInfo = await authClient.exchangeToken(receivedCode);
+    const client = createClawCloudClient();
+    const tokenInfo = await client.exchangeToken(deviceInfo, { code: receivedCode, authConfig: config });
 
-    if (!tokenInfo?.token || !tokenInfo.userInfo?.userId) {
-      throw new Error("failed to get user info");
+    if (!tokenInfo?.jwtToken) {
+      throw new Error("failed to get jwt token");
     }
 
     // 保存Token
-    await saveToken(tokenInfo, config.saveToFile !== false);
+    await saveToken({ jwtToken: tokenInfo.jwtToken }, config.saveToFile !== false);
 
     return {
-      userId: tokenInfo.userInfo.userId,
-      token: tokenInfo.token,
-      userName: tokenInfo.userInfo.displayName,
+      token: tokenInfo.jwtToken
     } as HonorUserInfo;
   } catch (error) {
     throw wrapError(error, "get token failed");

package/src/honor-auth/cloud.ts

@@ -1,8 +1,9 @@
 import { createClawCloudClient } from "../apis/claw-cloud.js";
 import { isOKResponse } from "../apis/index.js";
-import { getConfigManager, takeApiHost } from "../modules/configs/index.js";
+import { getConfigManager } from "../modules/configs/index.js";
 import { getDeviceInfo } from "../modules/device/device-info.js";
 import type { HonorUserInfo } from "../types.js";
+import { wrapError } from "../utils/error.js";
 import { clearToken } from "./token-manager.js";
 
 /**
@@ -22,24 +23,10 @@ export async function performLogout(): Promise<void> {
     const deviceInfo = await getDeviceInfo();
 
     // 调用登出接口
-    const hosts = takeApiHost();
-    const baseUrl = `https://${hosts.clawCloud}/aicloud/yoyo-claw-service`;
-
-    // 如果有灰度标签，设置默认headers
-    const options = hosts.grayTag
-      ? {
-          defaultHeaders: {
-            "x-gray": hosts.grayTag,
-          },
-        }
-      : undefined;
-
-    const client = createClawCloudClient(baseUrl, options);
+    const client = createClawCloudClient();
 
     const userInfo: HonorUserInfo = {
-      userId: userConfig.userId,
       token: userConfig.token,
-      userName: userConfig.userName,
     };
 
     const response = await client.logoutDevice(deviceInfo, userInfo);
@@ -51,7 +38,6 @@ export async function performLogout(): Promise<void> {
     // 清除Token
     await clearToken();
   } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`failed to logout: ${errorMessage}`);
+    throw wrapError(error, "failed to logout");
   }
 }

package/src/honor-auth/honor-auth-client.ts

@@ -4,13 +4,7 @@
  */
 
 import { createHash, randomBytes } from "crypto";
-import type { TokenResponse, HonorAuthConfig } from "./types.js";
-import { takeApiHost } from "../modules/configs/hosts.js";
-import { wrapError } from "../utils/error.js";
-import { uuid } from "../utils/id.js";
-import { isOKResponse } from "../apis/helpers.js";
-import { HttpClient, type HttpClientOptions } from "../apis/http-client.js";
-import type { HttpApiWrapper } from "../apis/types.js";
+import type { HonorAuthConfig } from "./types.js";
 
 /**
  * PKCE参数
@@ -24,16 +18,10 @@ export interface PKCEParams {
  * 荣耀认证客户端
  */
 export class HonorAuthClient {
-  private httpClient: HttpClient;
   private config: HonorAuthConfig;
 
   constructor(config: HonorAuthConfig) {
     this.config = config;
-    // 从 HonorAuthConfig 中提取 HttpClientOptions
-    const httpClientOptions: HttpClientOptions = {
-      proxy: config.proxy,
-    };
-    this.httpClient = new HttpClient(config.authHost, httpClientOptions);
   }
 
   /**
@@ -99,50 +87,6 @@ export class HonorAuthClient {
     return `${this.config.authHost}/oauth2/v3/authorize?${params.toString()}`;
   }
 
-  /**
-   * 使用授权码换取Token
-   */
-  async exchangeToken(code: string) {
-    const hosts = takeApiHost();
-    const tokenUrl = `https://${hosts.ics}/honorboard/auth/v1/oauth/jwtToken`;
-
-    const data = {
-      clientId: this.config.clientId,
-      code,
-      redirectUri: this.config.redirectUri,
-    };
-
-    try {
-      // 构建请求头，包含灰度标签（如果有）
-      const headers: Record<string, string> = {
-        "Content-Type": "application/json",
-        "x-origin-udid": this.config.clientId,
-        "x-app-pkg": "com.hihonor.pc.openclaw",
-        "x-request-nonce": uuid(),
-        "x-timestamp": String(Date.now()),
-      };
-
-      // 添加灰度标签
-      if (hosts.grayTag) {
-        headers["x-gray"] = hosts.grayTag;
-      }
-
-      const response = await this.httpClient.post<HttpApiWrapper<TokenResponse>>(tokenUrl, {
-        body: data,
-        headers,
-        timeout: 15000,
-      });
-
-      if (isOKResponse(response)) {
-        return response.data.data;
-      }
-
-      throw new Error(`failed to get token: ${response.data?.cnMessage}`);
-    } catch (error) {
-      throw wrapError(error, "failed to get token");
-    }
-  }
-
   /**
    * 获取配置
    */

package/src/honor-auth/index.ts

@@ -2,3 +2,4 @@ export * from "./browser.js";
 export * from "./cloud.js";
 export * from "./token-manager.js";
 export { createHonorAuthClient, HonorAuthClient, type PKCEParams } from "./honor-auth-client.js";
+export * from "./types.js";

package/src/honor-auth/token-manager.ts

@@ -2,65 +2,130 @@
  * Token管理器 - 负责token的读写缓存
  */
 
+import { createClawCloudClient } from "../apis/claw-cloud.js";
 import { getConfigManager } from "../modules/configs/index.js";
+import { getDeviceInfo } from "../modules/device/index.js";
 import type { HonorUserInfo } from "../types.js";
+import { getEnvUserId } from "../utils/env.js";
+import { wrapError } from "../utils/error.js";
 import { useClawLogger } from "../utils/logger.js";
-import type { TokenResponse } from "./types.js";
+import { SaveTokenParams } from "./types.js";
 
 /**
- * 保存Token到openclaw配置文件
+ * 保存Token到openclaw配置文件（支持UserId/token双模）
+ * - 如果有 jwtToken，直接保存
+ * - 如果只有 userId，调用 exchangeToken 通过 userId 换取 jwtToken
  */
-export async function saveToken(token: TokenResponse, saveToFile: boolean = true): Promise<void> {
+export async function saveToken(
+  params: SaveTokenParams,
+  saveToFile: boolean = true,
+): Promise<HonorUserInfo> {
   try {
+    const configManager = getConfigManager();
+    let jwtToken = params.jwtToken;
+
+    // 如果没有 jwtToken 但有 userId，通过 exchangeToken 获取
+    if (!jwtToken && params.userId) {
+      const deviceInfo = await getDeviceInfo();
+      const client = createClawCloudClient();
+      const tokenInfo = await client.exchangeToken(deviceInfo, { userId: params.userId });
+      jwtToken = tokenInfo.jwtToken;
+    }
+
+    if (!jwtToken) {
+      throw new Error("no token available");
+    }
+
     if (!saveToFile) {
       useClawLogger().info("💾 token got, but not to save");
-      return;
+      return { token: jwtToken };
     }
 
-    const configManager = getConfigManager();
-
     // 计算过期时间（假设token有效期为30天）
     const expired = Math.floor(Date.now() / 1000) + 30 * 24 * 60 * 60;
 
     // 更新用户配置
     await configManager.updateUserConfig({
-      token: token.token,
+      token: jwtToken,
+      userId: params.userId,
       expired,
-      userId: token.userInfo?.userId,
-      userName: token.userInfo?.displayName,
     });
+
+    return {
+      token: jwtToken,
+    };
   } catch (error) {
-    throw new Error(`保存Token失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw wrapError(error, "保存Token失败");
+  }
+}
+
+/**
+ * 刷新并保存Token
+ */
+async function refreshToken(userId: string): Promise<HonorUserInfo | null> {
+  const deviceInfo = await getDeviceInfo();
+  const client = createClawCloudClient();
+  const tokenInfo = await client.exchangeToken(deviceInfo, { userId });
+
+  if (tokenInfo.jwtToken) {
+    const expired = Math.floor(Date.now() / 1000) + 30 * 24 * 60 * 60;
+    await getConfigManager().updateUserConfig({
+      token: tokenInfo.jwtToken,
+      userId: undefined,
+      userName: undefined,
+      expired,
+    });
+    return { token: tokenInfo.jwtToken };
   }
+  await getConfigManager().clearUserConfig();
+  return null;
 }
 
 /**
  * 从openclaw配置文件加载Token
+ * - 配置有 userId 时，优先使用 env userId 换取 token
+ * - 有 token 且未过期，直接返回
  */
 export async function loadToken(): Promise<HonorUserInfo | null> {
+  const logger = useClawLogger();
+
   try {
     const configManager = getConfigManager();
     const userConfig = configManager.getUserConfig();
+    const envUserId = getEnvUserId();
 
-    // todo 上线前移除
-    if (!userConfig?.token) {
-      return null;
+    logger.debug?.(
+      `[yoyoclaw-auth] env userId: ${envUserId ? "present" : "absent"}, config userId: ${userConfig?.userId ? "present" : "absent"}, config token: ${userConfig?.token ? "present" : "absent"}`,
+    );
+
+    // 配置有 userId，优先使用 env userId 换取 token
+    if (userConfig?.userId) {
+      return await refreshToken(envUserId || userConfig.userId);
+    }
+
+    // 有 token 且未过期，直接返回
+    if (userConfig?.token) {
+      if (!userConfig.expired || userConfig.expired >= Math.floor(Date.now() / 1000)) {
+        return { token: userConfig.token };
+      }
+      logger.debug?.("[yoyoclaw-auth] cached token expired");
     }
 
-    // 检查是否过期
-    if (userConfig.expired && userConfig.expired < Math.floor(Date.now() / 1000)) {
-      // Token已过期，从配置中移除
+    // 没有token或者已经过期，拿envUserId重新获取
+    if (envUserId) {
+      logger.debug?.("[yoyoclaw-auth] token expired, using env userId to exchange token");
+      return await refreshToken(envUserId);
+    }
+
+    // 没有可用的鉴权信息且token过期了，清除token信息
+    if (userConfig?.token) {
+      logger.debug?.("[yoyoclaw-auth] clearing expired token");
       await configManager.clearUserConfig();
-      return null;
     }
 
-    return {
-      userId: userConfig.userId || "",
-      token: userConfig.token,
-      userName: userConfig.userName,
-    };
+    return null;
   } catch (error) {
-    throw new Error(`加载Token失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw wrapError(error, "加载Token失败");
   }
 }
 
@@ -73,6 +138,6 @@ export async function clearToken(): Promise<void> {
     await configManager.clearUserConfig();
     useClawLogger().info("[yoyoclaw-auth] token cleared");
   } catch (error) {
-    throw new Error(`清除Token失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw wrapError(error, "清除Token失败");
   }
 }

package/src/honor-auth/types.ts

@@ -26,25 +26,7 @@ export interface HonorAuthConfig {
   saveToFile?: boolean;
 }
 
-/**
- * Token响应
- */
-export type TokenResponse = {
-  token?: string;
-  userInfo?: ApiUserInfo;
-};
-
-/**
- * Token响应
- */
-export type TokenResponseV2 = {
+export interface SaveTokenParams {
+  userId?: string;
   jwtToken?: string;
-};
-
-/**
- * 用户信息
- */
-export interface ApiUserInfo {
-  userId: string;
-  displayName: string;
 }

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

@@ -8,7 +8,7 @@ import { wrapError } from "../../utils/error.js";
 import { useClawLogger } from "../../utils/logger.js";
 import { isBetaVersion } from "../../utils/version.js";
 import { detectProvidersToRename, updateProviderReferences } from "./provider.js";
-import type { GatewayAuthConfig, UserConfig } from "./types.ts";
+import type { DeviceConfig, GatewayAuthConfig, UserConfig } from "./types.ts";
 
 const PLUGIN_YOYO_ID = "yoyo";
 const YOYO_ALLOW_COMMANDS = [
@@ -167,6 +167,60 @@ export class ConfigManager {
     }
   }
 
+  /**
+   * 获取设备配置
+   */
+  getDeviceConfig(): DeviceConfig | undefined {
+    try {
+      const config = this.loadConfig();
+      const deviceConfig = config.plugins?.entries?.[PLUGIN_YOYO_ID]?.config?.device as
+        | DeviceConfig
+        | undefined;
+      return deviceConfig;
+    } catch (error) {
+      console.error(`[claw-configs] Failed to read device config: ${error}`);
+      return undefined;
+    }
+  }
+
+  /**
+   * 更新设备配置
+   */
+  async updateDeviceConfig(deviceConfig: DeviceConfig): Promise<void> {
+    try {
+      const currentConfig = this.loadConfig();
+
+      // 合并现有设备配置
+      const existingDeviceConfig =
+        (currentConfig.plugins?.entries?.[PLUGIN_YOYO_ID]?.config?.device as DeviceConfig | undefined) || {};
+
+      const updatedConfig: OpenClawConfig = {
+        ...currentConfig,
+        plugins: {
+          ...currentConfig.plugins,
+          entries: {
+            ...currentConfig.plugins?.entries,
+            [PLUGIN_YOYO_ID]: {
+              ...currentConfig.plugins?.entries?.[PLUGIN_YOYO_ID],
+              enabled: true,
+              config: {
+                ...currentConfig.plugins?.entries?.[PLUGIN_YOYO_ID]?.config,
+                device: {
+                  ...existingDeviceConfig,
+                  ...deviceConfig,
+                },
+              },
+            },
+          },
+        },
+      };
+
+      await this.saveConfig(updatedConfig);
+    } catch (error) {
+      throw wrapError(error, "Failed to update device config");
+    }
+  }
+
   /**
    * 更新运行环境配置
    */

package/src/modules/configs/types.ts

@@ -19,7 +19,7 @@ export interface UserConfig {
   token?: string;
   expired?: number;
   userId?: string;
-  userName?: string;
+  userName?: undefined;
 }
 
 /**
@@ -33,5 +33,18 @@ export interface YoyoClawPluginConfig {
     env?: "dev" | "test" | "production";
     /** 灰度标签 */
     gray?: string;
+    /** 设备配置 */
+    device?: DeviceConfig;
   };
 }
+
+/**
+ * 设备配置信息
+ */
+export interface DeviceConfig {
+  brand?: string;
+  type?: string;
+  manufacture?: string;
+  name?: string;
+  model?: string;
+}

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

@@ -2,6 +2,7 @@
  * 设备信息获取模块
  */
 import type { DeviceInfo } from "../../types.js";
+import { getDeviceEnvVars } from "../../utils/env.js";
 import { useClawLogger } from "../../utils/logger.js";
 import { getConfigManager } from "../configs/config-manager.js";
 import { loadOrCreateDeviceIdentity } from "./identity.js";
@@ -9,6 +10,7 @@ import { getDeviceInfoProvider } from "./providers/index.js";
 
 /**
  * 获取设备信息（异步版本）
+ * 优先级: env > config > provider
  */
 export async function getDeviceInfo(): Promise<DeviceInfo> {
   const provider = getDeviceInfoProvider();
@@ -31,17 +33,57 @@ export async function getDeviceInfo(): Promise<DeviceInfo> {
     deviceId = await provider.getDeviceIdAsync();
   }
 
+  // 获取设备信息，优先级: env > config > provider
+  const envVars = getDeviceEnvVars();
+  const deviceConfig = configManager.getDeviceConfig();
+
+  useClawLogger().debug?.(`[yoyoclaw-device] env: ${JSON.stringify(envVars)}, config: ${JSON.stringify(deviceConfig)}`);
+
+  // 按优先级获取，并限制 128 字符
+  const brand = envVars.brand || deviceConfig?.brand || provider.getDeviceBrand() || "unknown";
+  const deviceType = (envVars.deviceType ||
+    deviceConfig?.type ||
+    provider.getDeviceType()) as DeviceInfo["deviceType"];
+  const manufacture = (envVars.manufacture || deviceConfig?.manufacture || brand).slice(0, 128);
+  const deviceName = (deviceConfig?.name || provider.getDeviceName()).slice(0, 128);
+  const deviceModel = (deviceConfig?.model || provider.getDeviceModel()).slice(0, 128);
+
   const deviceInfo: DeviceInfo = {
     deviceId,
-    deviceName: provider.getDeviceName().slice(0, 128),
-    deviceType: provider.getDeviceType(),
-    deviceModel: provider.getDeviceModel().slice(0, 128),
-    brand: provider.getDeviceBrand(),
+    deviceName,
+    deviceType,
+    deviceModel,
+    brand,
+    manufacture,
     port: configManager.getGatewayPort(),
   };
 
-  useClawLogger().debug?.(
-    `[yoyoclaw-device] device info: ${JSON.stringify(deviceInfo)} (deviceId source: ${deviceIdSource})`,
+  // 记录 deviceInfo 整体来源
+  const source = envVars.brand || envVars.deviceType || envVars.manufacture ? "env" : "config";
+  useClawLogger().info(
+    `[yoyoclaw-device] device info: ${JSON.stringify(deviceInfo)} (deviceId source: ${deviceIdSource}, source: ${source})`,
+  );
+
+  // env 与 config 的差异检测（key 映射: brand, manufacture, deviceType -> type）
+  const hasEnvDiff = !!(
+    (envVars.brand && envVars.brand !== deviceConfig?.brand) ||
+    (envVars.manufacture && envVars.manufacture !== deviceConfig?.manufacture) ||
+    (envVars.deviceType && envVars.deviceType !== deviceConfig?.type)
   );
+
+  if (!deviceConfig || hasEnvDiff) {
+    const configUpdate = {
+      brand,
+      type: deviceType,
+      manufacture,
+      name: deviceName,
+      model: deviceModel,
+    };
+
+    configManager.updateDeviceConfig(configUpdate).catch((error) => {
+      useClawLogger().warn(`[yoyoclaw-device] failed to persist device config: ${String(error)}`);
+    });
+  }
+
   return deviceInfo;
 }

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

@@ -1,72 +1,99 @@
-import { execSync } from "child_process";
+import { execFile } from "child_process";
 import { createHash } from "crypto";
 import fs from "fs";
 import os from "os";
+import { promisify } from "util";
 import type { DeviceType } from "../../../types.js";
 import type { DeviceInfoProvider } from "./base.js";
 
+const execFileAsync = promisify(execFile);
+
+/**
+ * 设备信息缓存
+ */
+interface DeviceInfoCache {
+  androidId: string;
+  brand: string;
+  model: string;
+  device: string;
+  deviceId: string;
+}
+
 /**
  * Pad 设备信息提供者
  */
 export class PadDeviceInfoProvider implements DeviceInfoProvider {
+  private cache: DeviceInfoCache = {
+    androidId: "",
+    brand: "",
+    model: "",
+    device: "",
+    deviceId: "",
+  };
+
+  private initPromise: Promise<void>;
+
+  constructor() {
+    this.initPromise = this._initializeCache();
+  }
+
   /**
-   * 确保 provider 初始化完成（Pad 无需异步初始化）
+   * 确保 provider 初始化完成（异步预取设备信息）
    */
   async ensureInitialized(): Promise<void> {
-    // Pad provider 同步执行，无需初始化
+    await this.initPromise;
   }
 
   /**
-   * 通过 /system/bin/getprop 获取 Android 系统属性
+   * 异步执行 Android shell 命令
    */
-  private getAndroidProp(prop: string): string {
+  private async execAndroidCmd(cmd: string, timeout = 5000): Promise<string> {
     try {
-      const result = execSync(`/system/bin/getprop ${prop}`, {
+      const { stdout } = await execFileAsync("/system/bin/sh", ["-c", cmd], {
+        timeout,
         encoding: "utf-8",
-        timeout: 5000,
       });
-      const value = result.trim();
-      return value || "";
+      return stdout.trim();
     } catch {
       return "";
     }
   }
 
   /**
-   * 获取 Android ID
+   * 初始化缓存（异步预取所有设备信息）
    */
-  private getAndroidId(): string {
+  private async _initializeCache(): Promise<void> {
     try {
-      const result = execSync("/system/bin/settings get secure android_id", {
-        encoding: "utf-8",
-        timeout: 5000,
-      });
-      const value = result.trim();
-      return value && value !== "null" ? value : "";
+      // 并行获取所有属性
+      const [androidId, brand, model, device] = await Promise.all([
+        this.execAndroidCmd("/system/bin/settings get secure android_id"),
+        this.execAndroidCmd("/system/bin/getprop ro.product.brand"),
+        this.execAndroidCmd("/system/bin/getprop ro.product.model"),
+        this.execAndroidCmd("/system/bin/getprop ro.product.device"),
+      ]);
+
+      this.cache.androidId = androidId && androidId !== "null" ? androidId : "";
+      this.cache.brand = brand || "";
+      this.cache.model = model || "";
+      this.cache.device = device || "";
+
+      // 计算 deviceId
+      const raw = `${this.cache.androidId}_${this.cache.brand}_${this.cache.model}_${this.cache.device}`;
+      this.cache.deviceId = createHash("sha256").update(raw, "utf-8").digest("hex");
     } catch {
-      return "";
+      // 初始化失败，保持默认值
     }
   }
 
   /**
-   * 获取 Android 设备唯一ID (SHA256 哈希)
-   */
-  private getAndroidDeviceId(): string {
-    const androidId = this.getAndroidId();
-    const brand = this.getAndroidProp("ro.product.brand");
-    const model = this.getAndroidProp("ro.product.model");
-    const device = this.getAndroidProp("ro.product.device");
-
-    const raw = `${androidId}_${brand}_${model}_${device}`;
-    return createHash("sha256").update(raw, "utf-8").digest("hex");
-  }
-
-  /**
-   * 获取 Android 设备型号
+   * 获取 Android 设备型号（兜底读取 build.prop）
    */
   private getAndroidDeviceModel(): string {
+    if (this.cache.model) {
+      return this.cache.model;
+    }
+
     try {
-      // 尝试直接解析系统属性文件
       const buildPropPath = "/system/build.prop";
       if (fs.existsSync(buildPropPath)) {
         const content = fs.readFileSync(buildPropPath, "utf8");
@@ -79,7 +106,6 @@ export class PadDeviceInfoProvider implements DeviceInfoProvider {
       // ignore
     }
 
-    // 兜底方案：使用架构信息
     return `Android(${os.arch()})`;
   }
 
@@ -94,8 +120,8 @@ export class PadDeviceInfoProvider implements DeviceInfoProvider {
    * 获取设备唯一ID（异步）
    */
   async getDeviceIdAsync(): Promise<string> {
-    const deviceId = this.getAndroidDeviceId();
-    return deviceId || "invalid";
+    await this.initPromise;
+    return this.cache.deviceId || "invalid";
   }
 
   /**
@@ -123,8 +149,7 @@ export class PadDeviceInfoProvider implements DeviceInfoProvider {
    * 获取设备品牌
    */
   getDeviceBrand(): string {
-    const brand = this.getAndroidProp("ro.product.brand");
-
+    const brand = this.cache.brand;
     return brand.toLowerCase() === "honor" ? "HONOR" : "";
   }
 }

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, takeApiHost } from "../configs/index.js";
+import { getConfigManager } from "../configs/index.js";
 
 /**
  * 注册设备到 Claw Cloud
@@ -16,19 +16,7 @@ export async function registerDevice(deviceInfo: DeviceInfo, userInfo: HonorUser
   const gatewayAuthConfig = configManager.getGatewayAuthConfig();
 
   // 创建 Claw Cloud 客户端
-  const hosts = takeApiHost();
-  const baseUrl = `https://${hosts.clawCloud}/aicloud/yoyo-claw-service`;
-
-  // 如果有灰度标签，设置默认headers
-  const options = hosts.grayTag
-    ? {
-        defaultHeaders: {
-          "x-gray": hosts.grayTag,
-        },
-      }
-    : undefined;
-
-  const client = createClawCloudClient(baseUrl, options);
+  const client = createClawCloudClient();
 
   // 调用注册接口，传入认证信息
   const response = await client.registerDevice(deviceInfo, userInfo, gatewayAuthConfig);

package/src/modules/login/impl.ts

@@ -12,8 +12,6 @@ import { getDeviceInfo, registerDevice } from "../device/index.js";
  * 登录选项
  */
 export interface LoginOptions {
-  /** 是否跳过认证流程，默认为 false */
-  noAuth?: boolean;
   /** 用户 ID，如果提供则直接使用此 ID 登录 */
   userId?: string;
   /** Token，如果提供则直接使用此 Token 登录 */
@@ -30,7 +28,7 @@ export interface LoginOptions {
  * @param options 登录选项
  */
 export async function performLogin(options: LoginOptions = {}) {
-  const { noAuth = false, userId, token } = options;
+  const { userId } = options;
   const logger = useClawLogger();
   try {
     logger.debug?.("Starting login process...");
@@ -53,43 +51,18 @@ export async function performLogin(options: LoginOptions = {}) {
     let userInfo: HonorUserInfo;
     // 检查是否提供了 userId 参数
     if (userId) {
-      // 暂时使用 vm-mock 来解决 token 没有的问题，后面需要等云侧接口就绪后获取到这个 jwtToken
-      const authToken = token || "vm-mock";
-      logger.debug?.("Using provided userId for direct login...");
-      userInfo = {
+      // 保存 Token，内部会基于userId换token
+      userInfo = await saveToken({
         userId,
-        token: authToken,
-      };
-
-      // 保存 Token
-      await saveToken({
-        token: authToken,
-        userInfo: { userId, displayName: "" },
       });
       logger.debug?.("Using provided user info");
-      logger.debug?.(`User: ${userInfo.userId}`);
-      logger.debug?.(`Device ID: ${deviceInfo?.deviceId}`);
-    } else if (noAuth) {
-      logger.debug?.("Skipping OAuth2 auth, using test user info...");
-      userInfo = {
-        userId: "test",
-        token: "",
-      };
-
-      // 保存 Token
-      await saveToken({
-        token: "test",
-        userInfo: { userId: "test", displayName: "Test User" },
-      });
-      logger.debug?.("Using test user info");
-      logger.debug?.(`User: ${userInfo.userId}`);
+      logger.debug?.(`User: ${userId}`);
       logger.debug?.(`Device ID: ${deviceInfo?.deviceId}`);
     } else {
       logger.debug?.("Starting OAuth2 authentication...");
       userInfo = await performOAuth2AuthWithBrowser(deviceInfo);
 
       logger.debug?.("OAuth2 authentication successful");
-      logger.debug?.(`User: ${userInfo?.userId || "Unknown"}`);
       logger.debug?.(`Device ID: ${deviceInfo?.deviceId}`);
     }
 

package/src/schemas.ts

@@ -14,7 +14,11 @@ const UserInfoSchema = z.object({
  * 设备信息配置
  */
 const DeviceInfoSchema = z.object({
-  deviceType: z.string().optional(),
+  type: z.string().optional(),
+  manufacture: z.string().optional(),
+  brand: z.string().optional(),
+  name: z.string().optional(),
+  model: z.string().optional(),
 });
 
 /**

package/src/types.ts

@@ -22,6 +22,10 @@ export interface DeviceInfo {
    * 品牌信息
    */
   brand: string;
+  /**
+   * 制造商信息
+   */
+  manufacture: string;
   port: number;
 }
 
@@ -34,9 +38,7 @@ export type DeviceRole = "yoyoclaw" | "node";
  * 用户信息
  */
 export interface HonorUserInfo {
-  userId?: string;
-  token?: string;
-  userName?: string;
+  token: string;
 }
 
 /**

package/src/utils/env.ts

@@ -0,0 +1,37 @@
+/**
+ * 环境变量工具模块
+ */
+const DEVICE_ENV_VARS = {
+  brand: "YOYO_CLAW_BRAND",
+  manufacture: "YOYO_CLAW_MANUFACTURER",
+  deviceType: "YOYO_CLAW_DEVICE_TYPE",
+  userId: "YOYO_CLAW_USER_ID",
+} as const;
+
+/**
+ * 设备相关的环境变量
+ */
+export interface DeviceEnvVars {
+  brand?: string;
+  manufacture?: string;
+  deviceType?: string;
+  userId?: string;
+}
+
+/**
+ * 批量获取所有设备相关的环境变量
+ */
+export function getDeviceEnvVars(): DeviceEnvVars {
+  return {
+    brand: process.env[DEVICE_ENV_VARS.brand],
+    manufacture: process.env[DEVICE_ENV_VARS.manufacture],
+    deviceType: process.env[DEVICE_ENV_VARS.deviceType]
+  };
+}
+
+/**
+ * 获取用户ID
+ */
+export function getEnvUserId(): string | undefined {
+  return process.env[DEVICE_ENV_VARS.userId];
+}