@honor-claw/yoyo 1.2.1-beta.0 → 1.2.1-beta.2

package/index.ts

@@ -1,4 +1,5 @@
 import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { type ZodType } from "zod";
 import { registerCommands } from "./src/commands/index.js";
 import { AGENT_PROMPT } from "./src/modules/prompt/index.js";
 import { setYoyoRuntime } from "./src/runtime.js";
@@ -10,7 +11,7 @@ const plugin = {
   id: "yoyo",
   name: "YOYOClaw",
   description: "OpenClaw Honor Yoyo connection plugin",
-  configSchema: YoyoPluginConfigSchema,
+  configSchema: YoyoPluginConfigSchema as ZodType,
   register(api: OpenClawPluginApi) {
     setYoyoRuntime(api.runtime);
     setClawLogger(api.logger);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.2.1-beta.0",
+  "version": "1.2.1-beta.2",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",
@@ -31,7 +31,6 @@
     "test:unit:watch": "vitest"
   },
   "dependencies": {
-    "@honor-claw/safe-exec": "0.0.1",
     "http-proxy-agent": "^8.0.0",
     "https-proxy-agent": "^8.0.0",
     "jsonwebtoken": "^9.0.3",
@@ -48,7 +47,7 @@
     "@types/ws": "^8.5.13",
     "@vitest/coverage-v8": "^2.1.8",
     "commander": "^14.0.3",
-    "typescript": "^5.7.0",
+    "typescript": "^6.0.2",
     "vitest": "^2.1.8"
   },
   "openclaw": {

package/src/cloud-channel/client.ts

@@ -26,7 +26,7 @@ export class ClawCloudSocketClient {
   private retryTimer: NodeJS.Timeout | null = null;
   private isManualClose = false;
   private isRetryPaused = false; // 重试状态
-  // ping/pong 配置
+  // ping 定时器（原生 ping + 业务 pingMessage）
   private pingTimer: NodeJS.Timeout | null = null;
   // 当前连接上下文
   private currentTraceId = "";
@@ -59,7 +59,6 @@ export class ClawCloudSocketClient {
     this.ws = new WebSocket(url, wsOptions);
     this.ws.on("open", this.handleOpen.bind(this, url, isRetry));
     this.ws.on("message", this.onMessage);
-    this.ws.on("ping", this.handlePing);
     this.ws.on("pong", this.handlePong);
     this.ws.on("close", this.handleClose);
     this.ws.on("error", this.handleError);
@@ -90,10 +89,6 @@ export class ClawCloudSocketClient {
     this.options.onOpen?.();
   };
 
-  private handlePing = (): void => {
-    useClawLogger().debug?.("[claw-cloud-socket] received ping from server");
-  };
-
   private handlePong = (): void => {
     useClawLogger().debug?.("[claw-cloud-socket] received pong from server");
   };
@@ -299,7 +294,7 @@ export class ClawCloudSocketClient {
   }
 
   /**
-   * 启动 ping 定时器
+   * 启动 ping 定时器，同时发送原生 ping 和业务 pingMessage
    */
   private startPingTimer(): void {
     this.pingTimer = setInterval(() => {
@@ -308,9 +303,26 @@ export class ClawCloudSocketClient {
         return;
       }
 
-      // 发送 ping
+      // 原生 ping
       this.ws.ping();
       useClawLogger().debug?.("[claw-cloud-socket] sent ping to server");
+
+      // 业务 pingMessage
+      const { deviceInfo } = this.options;
+      const pingMessage: YOYOClawServiceEvent = {
+        msgType: "pingMessage",
+        sourceRole: "yoyoclaw",
+        sourceDeviceId: deviceInfo.deviceId,
+        targetRole: "node",
+        port: deviceInfo.port,
+      };
+
+      try {
+        this.ws.send(JSON.stringify(pingMessage));
+        useClawLogger().debug?.("[claw-cloud-socket] sent pingMessage to server");
+      } catch {
+        useClawLogger().error("[claw-cloud-socket] failed to send pingMessage");
+      }
     }, PING_INTERVAL);
   }
 

package/src/cloud-channel/types.ts

@@ -18,8 +18,8 @@ export interface YOYOClawServiceEvent {
   sourceDeviceId: string;
   sourceDeviceInfo?: ClawDeviceInfo;
   targetRole?: DeviceRole;
-  targetDeviceId: string;
-  traceInfo: object;
+  targetDeviceId?: string;
+  traceInfo?: object;
   port: number | string;
   data?: string; // openclaw原生消息
   msgType:
@@ -28,7 +28,8 @@ export interface YOYOClawServiceEvent {
     | "deviceUnPairMessage"
     | "fetchContexts"
     | "updateContexts"
-    | "deviceControl";
+    | "deviceControl"
+    | "pingMessage";
   /**
    * 会话轮次等追加信息，只有配对消息有
    */

package/src/commands/logout/impl.ts

@@ -1,7 +1,6 @@
 import { type Command } from "commander";
 import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { performLogout } from "../../honor-auth/cloud.js";
-import { upgradeIdentityToV2 } from "../../modules/configs/identity-persist.js";
 
 export function registerLogoutCommand(api: OpenClawPluginApi, command: Command) {
   const nextCommand = command
@@ -13,12 +12,6 @@ export function registerLogoutCommand(api: OpenClawPluginApi, command: Command)
       try {
         await performLogout();
 
-        // 升级 Identity 配置到 v2 版本
-        const upgraded = await upgradeIdentityToV2();
-        if (upgraded) {
-          api.logger.info("Identity upgraded from v1 to v2 during logout");
-        }
-
         console.log(
           "✅ Logout successful, gateway will automatically restart to handle new configuration",
         );

package/src/honor-auth/auth-result-html.ts

@@ -0,0 +1,51 @@
+export const AUTH_RESULT_HTML = `<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>授权结果</title>
+    <style>
+      body {
+        font-family:
+          -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+        background-color: #f0f2f5;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 100vh;
+        margin: 0;
+        color: #333;
+      }
+      .container {
+        text-align: center;
+        background-color: #ffffff;
+        padding: 48px 40px;
+        border-radius: 16px;
+        box-shadow: 0 20px 60px rgba(0, 0, 0, 0.15);
+        max-width: 380px;
+        width: 90%;
+      }
+      .icon {
+        margin-bottom: 24px;
+      }
+      h1 {
+        font-size: 20px;
+        font-weight: 600;
+        margin: 0 0 12px;
+        color: #1a1a1a;
+      }
+      .hint {
+        font-size: 14px;
+        color: #999;
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+      <div class="icon">{{ICON_SVG}}</div>
+      <h1>{{MESSAGE}}</h1>
+      <p class="hint">可安全关闭此页面</p>
+    </div>
+  </body>
+</html>`;

package/src/honor-auth/callback-server.ts

@@ -4,6 +4,7 @@
 
 import { createServer, type IncomingMessage, type ServerResponse } from "http";
 import { URL } from "url";
+import { AUTH_RESULT_HTML } from "./auth-result-html.js";
 
 /**
  * 回调服务器选项
@@ -19,6 +20,15 @@ export interface CallbackServerOptions {
   onError?: (error: Error) => void;
 }
 
+const SUCCESS_ICON_SVG = `<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M28 56C43.464 56 56 43.464 56 28C56 12.536 43.464 0 28 0C12.536 0 0 12.536 0 28C0 43.464 12.536 56 28 56Z" fill="#28a745"/><path d="M39.6667 20.3333L24.5 35.5L16.3333 27.3333" stroke="white" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>`;
+const FAILURE_ICON_SVG = `<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M28 56C43.464 56 56 43.464 56 28C56 12.536 43.464 0 28 0C12.536 0 0 12.536 0 28C0 43.464 12.536 56 28 56Z" fill="#dc3545"/><path d="M35 21L21 35M21 21L35 35" stroke="white" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>`;
+
+
+function getResultHtml(message: string, success: boolean): string {
+  const icon = success ? SUCCESS_ICON_SVG : FAILURE_ICON_SVG;
+  return AUTH_RESULT_HTML.replace("{{ICON_SVG}}", icon).replace("{{MESSAGE}}", message);
+}
+
 /**
  * 启动本地回调服务器
  */
@@ -40,13 +50,15 @@ export function startCallbackServer(options: CallbackServerOptions): Promise<voi
 
           // 返回成功响应
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-          res.end("<h1>授权成功！可以关闭此窗口</h1>");
+          res.end(getResultHtml("授权成功", true));
 
           // 延迟关闭服务器，确保响应已发送
           setTimeout(() => {
             if (!serverClosed) {
               serverClosed = true;
-              if (timeoutId) clearTimeout(timeoutId);
+              if (timeoutId) {
+                clearTimeout(timeoutId);
+              }
               server.close();
             }
           }, 100);
@@ -56,23 +68,25 @@ export function startCallbackServer(options: CallbackServerOptions): Promise<voi
         } else if (!hasReceivedCode) {
           // 返回错误响应
           res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
-          res.end("<h1>授权失败：未获取到授权码</h1>");
+          res.end(getResultHtml("授权失败：未获取到授权码", false));
         } else {
           // 重复请求，返回成功响应但不处理
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-          res.end("<h1>授权成功！可以关闭此窗口</h1>");
+          res.end(getResultHtml("授权成功", true));
         }
       } catch (error) {
         console.error("authorize callback error:", error);
         res.writeHead(500, { "Content-Type": "text/html; charset=utf-8" });
-        res.end("<h1>服务器错误</h1>");
+        res.end(getResultHtml("授权失败：服务器内部错误", false));
       }
     });
 
     server.on("error", (error) => {
       if (!serverClosed) {
         serverClosed = true;
-        if (timeoutId) clearTimeout(timeoutId);
+        if (timeoutId) {
+          clearTimeout(timeoutId);
+        }
         onError?.(error);
         if (!promiseResolved) {
           promiseResolved = true;
@@ -99,7 +113,9 @@ export function startCallbackServer(options: CallbackServerOptions): Promise<voi
 
     // 服务器关闭时解析Promise
     server.on("close", () => {
-      if (timeoutId) clearTimeout(timeoutId);
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
       if (!promiseResolved) {
         promiseResolved = true;
         resolve();

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

@@ -3,7 +3,6 @@
  */
 
 import { createClawCloudClient } from "../apis/claw-cloud.js";
-import { upgradeIdentityToV2 } from "../modules/configs/identity-persist.js";
 import { getConfigManager } from "../modules/configs/index.js";
 import { getDeviceInfo } from "../modules/device/index.js";
 import type { HonorUserInfo } from "../types.js";
@@ -63,14 +62,7 @@ export async function saveToken(
 /**
  * 刷新并保存Token
  */
-async function refreshToken(
-  userId: string,
-  options?: { upgradeIdentity?: boolean },
-): Promise<HonorUserInfo | null> {
-  if (options?.upgradeIdentity) {
-    await upgradeIdentityToV2();
-  }
-
+async function refreshToken(userId: string): Promise<HonorUserInfo | null> {
   const deviceInfo = await getDeviceInfo();
   const client = createClawCloudClient();
   const tokenInfo = await client.exchangeToken(deviceInfo, { userId });
@@ -108,7 +100,7 @@ export async function loadToken(): Promise<HonorUserInfo | null> {
 
     // 配置有 userId，优先使用 env userId 换取 token
     if (userConfig?.userId) {
-      return await refreshToken(envUserId || userConfig.userId, { upgradeIdentity: !!envUserId });
+      return await refreshToken(envUserId || userConfig.userId);
     }
 
     // 有 token 且未过期，直接返回
@@ -122,7 +114,7 @@ export async function loadToken(): Promise<HonorUserInfo | null> {
     // 没有token或者已经过期，拿envUserId重新获取
     if (envUserId) {
       logger.debug?.("[yoyoclaw-auth] token expired, using env userId to exchange token");
-      return await refreshToken(envUserId, { upgradeIdentity: true });
+      return await refreshToken(envUserId);
     }
 
     // 没有可用的鉴权信息且token过期了，清除token信息

package/src/modules/configs/identity-persist.ts

@@ -17,9 +17,9 @@ export enum IdentityVersion {
  * 完整的设备 Identity 类型
  */
 export interface PersistedIdentity {
-  /** 新版本 deviceId (基于公钥指纹) */
+  /** deviceId (基于公钥指纹) */
   deviceId?: string;
-  /** 旧版本 deviceId (基于硬件信息) */
+  /** 旧版本 deviceId (v1 缓存兼容读取，不再生成) */
   legacyDeviceId?: string;
   publicKeyPem?: string;
   privateKeyPem?: string;
@@ -112,7 +112,7 @@ export async function updatePersistedIdentity(
   // 合并配置
   const updatedConfig: PersistedIdentity = {
     ...existingConfig,
-    version: existingConfig?.version || IdentityVersion.LEGACY,
+    version: existingConfig?.version || IdentityVersion.NEW,
   };
 
   if (identity.legacyDeviceId) {
@@ -148,46 +148,6 @@ export async function updatePersistedIdentity(
  */
 function createDefaultConfig(): PersistedIdentity {
   return {
-    version: IdentityVersion.LEGACY,
-  };
-}
-
-/**
- * 升级 Identity 配置到 v2 版本
- * - 如果已经是 v2，不处理
- * - 如果是 v1，升级到 v2 并移除 legacyDeviceId
- * @returns 升级后的配置，如果已经是 v2 则返回 null
- */
-export async function upgradeIdentityToV2(): Promise<PersistedIdentity | null> {
-  const homeDir = resolveEffectiveHomeDir();
-  if (!homeDir) {
-    useClawLogger().warn("[yoyo-identity] failed to find home dir");
-    return null;
-  }
-
-  // 读取现有配置
-  const existingConfig = await loadConfig(homeDir);
-
-  // 如果已经有配置了，不做处理，这里老版本不删除这个问题就不走缓存咧
-  if (existingConfig) {
-    useClawLogger().warn("[yoyo-identity] identity exist, upgrade ignored");
-    return null;
-  }
-
-  // 升级到 v2，移除 legacyDeviceId
-  const upgradedConfig: PersistedIdentity = {
     version: IdentityVersion.NEW,
   };
-
-  // 写入升级后的配置
-  const configPath = getConfigPath();
-  await safeWriteFile({
-    rootDir: homeDir,
-    relativePath: configPath,
-    data: JSON.stringify(upgradedConfig, null, 2),
-    encoding: "utf8",
-    mkdir: true,
-  });
-
-  return upgradedConfig;
 }

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

@@ -19,19 +19,9 @@ export async function getDeviceInfo(): Promise<DeviceInfo> {
   // 确保 provider 初始化完成
   await provider.ensureInitialized();
 
-  // 获取设备 ID：使用 identity 模块生成的 ID
-  let deviceId: string;
-  let deviceIdSource: "persisted" | "generated" = "generated";
-
-  try {
-    const identity = await loadOrCreateDeviceIdentity();
-    deviceId = identity.legacyDeviceId ?? identity.deviceId;
-    deviceIdSource = "persisted";
-  } catch (error) {
-    // 如果 identity 获取失败，降级使用 provider 生成的 ID
-    useClawLogger().warn(`[yoyoclaw-device] failed to use identity: ${String(error)}`);
-    deviceId = await provider.getDeviceIdAsync();
-  }
+  // 获取设备 ID：优先使用 legacyDeviceId（v1 缓存兼容），否则使用新的 identity deviceId
+  const identity = await loadOrCreateDeviceIdentity();
+  const deviceId = identity.legacyDeviceId ?? identity.deviceId;
 
   // 获取设备信息，优先级: env > config > provider
   const envVars = getDeviceEnvVars();
@@ -63,7 +53,7 @@ export async function getDeviceInfo(): Promise<DeviceInfo> {
   // 记录 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})`,
+    `[yoyoclaw-device] device info: ${JSON.stringify(deviceInfo)} (source: ${source})`,
   );
 
   // env 与 config 的差异检测（key 映射: brand, manufacture, deviceType -> type）

package/src/modules/device/identity.ts

@@ -2,10 +2,8 @@ import crypto from "node:crypto";
 import {
   getPersistedIdentity,
   updatePersistedIdentity,
-  IdentityVersion,
   type PersistedIdentity,
 } from "../configs/identity-persist.js";
-import { getDeviceInfoProvider } from "./providers/index.js";
 import type { DeviceIdentity } from "./types.js";
 
 /**
@@ -55,33 +53,23 @@ function fingerprintPublicKey(publicKeyPem: string): string {
 /**
  * Generate a new device identity with ED25519 key pair
  */
-async function generateIdentity(identity: PersistedIdentity | null): Promise<DeviceIdentity> {
+async function generateIdentity(): Promise<DeviceIdentity> {
   const { publicKey, privateKey } = crypto.generateKeyPairSync("ed25519");
   const publicKeyPem = publicKey.export({ type: "spki", format: "pem" }).toString();
   const privateKeyPem = privateKey.export({ type: "pkcs8", format: "pem" }).toString();
   const deviceId = fingerprintPublicKey(publicKeyPem);
 
-  const fullIdentity = {
+  return {
     deviceId,
     publicKeyPem,
     privateKeyPem,
     createdAtMs: Date.now(),
-  } as DeviceIdentity;
-
-  if (!identity || identity.version === IdentityVersion.LEGACY) {
-    // 补充legacyDeviceId
-    const provider = getDeviceInfoProvider();
-    await provider.ensureInitialized();
-    fullIdentity.legacyDeviceId = await provider.getDeviceIdAsync();
-  }
-
-  return fullIdentity;
+  };
 }
 
 /**
- * Load or create device identity (async version)
- * 优先使用 legacyDeviceId (version < 2 的情况)，否则使用新的 identity deviceId
- * @returns Device identity with optional legacyDeviceId
+ * Load or create device identity
+ * @returns Device identity
  */
 export async function loadOrCreateDeviceIdentity(): Promise<DeviceIdentity> {
   // 获取缓存的 identity
@@ -120,7 +108,7 @@ export async function loadOrCreateDeviceIdentity(): Promise<DeviceIdentity> {
   }
 
   // No existing identity, generate new one
-  const identity = await generateIdentity(persisted);
+  const identity = await generateIdentity();
   await updatePersistedIdentity(identity);
 
   return identity;

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

@@ -10,11 +10,6 @@ export interface DeviceInfoProvider {
    */
   ensureInitialized(): Promise<void>;
 
-  /**
-   * 获取设备唯一ID（异步）
-   */
-  getDeviceIdAsync(): Promise<string>;
-
   /**
    * 获取设备名称
    */

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

@@ -1,4 +1,3 @@
-import { createHash } from "crypto";
 import fs from "fs";
 import os from "os";
 import type { DeviceType } from "../../../types.js";
@@ -26,53 +25,6 @@ export class LinuxDeviceInfoProvider implements DeviceInfoProvider {
     // Linux provider 同步执行，无需初始化
   }
 
-  /**
-   * 获取 Linux 设备唯一ID
-   */
-  private getLinuxDeviceId(): string {
-    // 尝试获取机器ID（systemd-based systems）
-    const machineId = readFile("/etc/machine-id");
-    if (machineId) {
-      return machineId;
-    }
-
-    // 尝试获取 D-Bus 机器ID
-    const dbusMachineId = readFile("/var/lib/dbus/machine-id");
-    if (dbusMachineId) {
-      return dbusMachineId;
-    }
-
-    // 尝试读取主板序列号
-    const boardSerial = readFile("/sys/class/dmi/id/board_serial");
-    if (boardSerial && boardSerial !== "Not Specified") {
-      return boardSerial;
-    }
-
-    // 尝试读取产品序列号
-    const productSerial = readFile("/sys/class/dmi/id/product_serial");
-    if (productSerial && productSerial !== "Not Specified") {
-      return productSerial;
-    }
-
-    // 尝试从 /proc/cpuinfo 提取序列号
-    const cpuinfo = readFile("/proc/cpuinfo");
-    if (cpuinfo) {
-      const match = cpuinfo.match(/serial\s*:\s*(.+)/i);
-      if (match && match[1]) {
-        const cpuSerial = match[1].trim();
-        if (cpuSerial && cpuSerial !== "0") {
-          return cpuSerial;
-        }
-      }
-    }
-
-    // 最后备用方案：使用主机名和架构生成哈希
-    const hostname = os.hostname();
-    const arch = os.arch();
-    const raw = `${hostname}_${arch}_${os.platform()}`;
-    return createHash("sha256").update(raw, "utf-8").digest("hex");
-  }
-
   /**
    * 获取 Linux 设备型号
    */
@@ -101,13 +53,6 @@ export class LinuxDeviceInfoProvider implements DeviceInfoProvider {
     return `${hostname} (${model})`;
   }
 
-  /**
-   * 获取设备唯一ID（异步）
-   */
-  async getDeviceIdAsync(): Promise<string> {
-    return this.getLinuxDeviceId();
-  }
-
   /**
    * 获取设备名称
    */

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

@@ -1,25 +1,7 @@
-import { createHash } from "crypto";
 import os from "os";
-import { execCommand } from "@honor-claw/safe-exec";
 import type { DeviceType } from "../../../types.js";
 import type { DeviceInfoProvider } from "./base.js";
 
-/**
- * 从 system_profiler 输出中提取指定字段值
- */
-function extractField(output: string, fieldName: string): string {
-  const lines = output.split("\n");
-  for (const line of lines) {
-    if (line.includes(fieldName)) {
-      const parts = line.split(":");
-      if (parts.length >= 2) {
-        return parts.slice(1).join(":").trim();
-      }
-    }
-  }
-  return "";
-}
-
 export class MacOSDeviceInfoProvider implements DeviceInfoProvider {
   /**
    * 确保 provider 初始化完成（macOS 无需异步初始化）
@@ -28,47 +10,6 @@ export class MacOSDeviceInfoProvider implements DeviceInfoProvider {
     // macOS provider 同步执行，无需初始化
   }
 
-  /**
-   * 获取 macOS 设备唯一ID
-   */
-  private async getMacOSDeviceId(): Promise<string> {
-    // 获取硬件信息
-    const output = await execCommand("system_profiler", ["SPHardwareDataType"]);
-    if (!output) {
-      return this.generateFallbackId();
-    }
-
-    // 提取硬件 UUID
-    const hardwareUuid = extractField(output, "Hardware UUID");
-    if (hardwareUuid) {
-      return hardwareUuid.replace(/[{}]/g, "");
-    }
-
-    // 提取序列号
-    const serialNumber = extractField(output, "Serial Number");
-    if (serialNumber) {
-      return serialNumber;
-    }
-
-    // 提取 Board ID
-    const boardId = extractField(output, "Board ID");
-    if (boardId) {
-      return boardId;
-    }
-
-    return this.generateFallbackId();
-  }
-
-  /**
-   * 生成备用 ID
-   */
-  private generateFallbackId(): string {
-    const hostname = os.hostname();
-    const arch = os.arch();
-    const raw = `${hostname}_${arch}_macOS`;
-    return createHash("sha256").update(raw, "utf-8").digest("hex");
-  }
-
   /**
    * 获取 macOS 设备型号
    */
@@ -87,13 +28,6 @@ export class MacOSDeviceInfoProvider implements DeviceInfoProvider {
     return `${hostname} (${model})`;
   }
 
-  /**
-   * 获取设备唯一ID（异步）
-   */
-  async getDeviceIdAsync(): Promise<string> {
-    return this.getMacOSDeviceId();
-  }
-
   /**
    * 获取设备名称
    */

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

@@ -1,5 +1,4 @@
 import { execFile } from "child_process";
-import { createHash } from "crypto";
 import fs from "fs";
 import os from "os";
 import { promisify } from "util";
@@ -12,11 +11,9 @@ const execFileAsync = promisify(execFile);
  * 设备信息缓存
  */
 interface DeviceInfoCache {
-  androidId: string;
   brand: string;
   model: string;
   device: string;
-  deviceId: string;
 }
 
 /**
@@ -24,11 +21,9 @@ interface DeviceInfoCache {
  */
 export class PadDeviceInfoProvider implements DeviceInfoProvider {
   private cache: DeviceInfoCache = {
-    androidId: "",
     brand: "",
     model: "",
     device: "",
-    deviceId: "",
   };
 
   private initPromise: Promise<void>;
@@ -65,21 +60,15 @@ export class PadDeviceInfoProvider implements DeviceInfoProvider {
   private async _initializeCache(): Promise<void> {
     try {
       // 并行获取所有属性
-      const [androidId, brand, model, device] = await Promise.all([
-        this.execAndroidCmd("/system/bin/settings get secure android_id"),
+      const [brand, model, device] = await Promise.all([
         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 {
       // 初始化失败，保持默认值
     }
@@ -116,14 +105,6 @@ export class PadDeviceInfoProvider implements DeviceInfoProvider {
     return this.getAndroidDeviceModel();
   }
 
-  /**
-   * 获取设备唯一ID（异步）
-   */
-  async getDeviceIdAsync(): Promise<string> {
-    await this.initPromise;
-    return this.cache.deviceId || "invalid";
-  }
-
   /**
    * 获取设备名称
    */

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

@@ -1,14 +1,12 @@
 import os from "os";
 import * as Registry from "winreg";
 import type { DeviceType } from "../../../types.js";
-import { uuid } from "../../../utils/id.js";
 import type { DeviceInfoProvider } from "./base.js";
 
 /**
  * 设备信息缓存
  */
 interface DeviceInfoCache {
-  deviceId: string;
   deviceBrand: string;
 }
 
@@ -67,7 +65,6 @@ function registryKeyExistsAsync(hive: number, keyPath: string): Promise<boolean>
 
 export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
   private cache: DeviceInfoCache = {
-    deviceId: "",
     deviceBrand: "",
   };
 
@@ -90,43 +87,30 @@ export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
   private async _initializeCache(): Promise<void> {
     try {
       // 并行获取所有注册表值
-      const [machineGuid, systemManufacturer, biosVendor, biosVendor2, systemManufacturer2] =
-        await Promise.all([
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\SOFTWARE\\Microsoft\\Cryptography",
-            "MachineGuid",
-          ),
-          // 原有路径
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\HARDWARE\\DESCRIPTION\\System",
-            "SystemManufacturer",
-          ),
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\HARDWARE\\DESCRIPTION\\System",
-            "SystemBiosVendor",
-          ),
-          // 新增路径（BIOS 子键）
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\HARDWARE\\DESCRIPTION\\System\\BIOS",
-            "Vendor",
-          ),
-          getRegistryStringValueAsync(
-            Registry.HKLM,
-            "\\HARDWARE\\DESCRIPTION\\System\\BIOS",
-            "SystemManufacturer",
-          ),
-        ]);
-
-      // 缓存 deviceId
-      if (machineGuid) {
-        this.cache.deviceId = machineGuid;
-      } else {
-        this.cache.deviceId = uuid();
-      }
+      const [systemManufacturer, biosVendor, biosVendor2, systemManufacturer2] = await Promise.all([
+        // 原有路径
+        getRegistryStringValueAsync(
+          Registry.HKLM,
+          "\\HARDWARE\\DESCRIPTION\\System",
+          "SystemManufacturer",
+        ),
+        getRegistryStringValueAsync(
+          Registry.HKLM,
+          "\\HARDWARE\\DESCRIPTION\\System",
+          "SystemBiosVendor",
+        ),
+        // 新增路径（BIOS 子键）
+        getRegistryStringValueAsync(
+          Registry.HKLM,
+          "\\HARDWARE\\DESCRIPTION\\System\\BIOS",
+          "Vendor",
+        ),
+        getRegistryStringValueAsync(
+          Registry.HKLM,
+          "\\HARDWARE\\DESCRIPTION\\System\\BIOS",
+          "SystemManufacturer",
+        ),
+      ]);
 
       // 缓存 deviceBrand（检查多个来源）
       const manufacturerSources = [
@@ -141,7 +125,10 @@ export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
         this.cache.deviceBrand = "HONOR";
       } else {
         // 最后兜底：检查 HKLM:\SOFTWARE\HONOR 注册表键是否存在
-        const honorKeyExists = await registryKeyExistsAsync(Registry.HKLM, "\\SOFTWARE\\HONOR");
+        const honorKeyExists = await registryKeyExistsAsync(
+          Registry.HKLM,
+          "\\SOFTWARE\\HONOR\\PCManager",
+        );
         if (honorKeyExists) {
           this.cache.deviceBrand = "HONOR";
         } else {
@@ -150,7 +137,6 @@ export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
       }
     } catch {
       // 初始化失败，使用默认值
-      this.cache.deviceId = uuid();
       this.cache.deviceBrand = "";
     }
   }
@@ -172,14 +158,6 @@ export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
     return `${hostname} (${model})`;
   }
 
-  /**
-   * 获取设备唯一 ID（异步）
-   */
-  async getDeviceIdAsync(): Promise<string> {
-    await this.initPromise;
-    return this.cache.deviceId;
-  }
-
   /**
    * 获取设备名称
    */

package/src/modules/login/impl.ts

@@ -2,10 +2,9 @@
  * 登录命令行的入口，提供登录流程的服务
  */
 import { performOAuth2AuthWithBrowser } from "../../honor-auth/index.js";
-import { loadToken, saveToken } from "../../honor-auth/token-manager.js";
+import { saveToken } from "../../honor-auth/token-manager.js";
 import type { HonorUserInfo } from "../../types.js";
 import { useClawLogger } from "../../utils/logger.js";
-import { upgradeIdentityToV2 } from "../configs/identity-persist.js";
 import { getDeviceInfo, registerDevice } from "../device/index.js";
 
 /**
@@ -33,18 +32,6 @@ export async function performLogin(options: LoginOptions = {}) {
   try {
     logger.debug?.("Starting login process...");
 
-    // 检查是否是新的登录触发（没有 token）
-    const existingToken = await loadToken();
-    const isNewLogin = !existingToken?.token;
-
-    if (isNewLogin) {
-      logger.debug?.("New login detected, upgrading identity to v2...");
-      const upgraded = await upgradeIdentityToV2();
-      if (upgraded) {
-        logger.info("Identity upgraded from v1 to v2 during login");
-      }
-    }
-
     // 步骤 1: 获取设备信息
     const deviceInfo = await getDeviceInfo();