@honor-claw/yoyo 1.2.0 → 1.2.1-beta.1

package/skills/yoyo-control/scripts/time_infer.py

@@ -0,0 +1,99 @@
+import time
+import hmac
+import hashlib
+import base64
+import json
+import requests
+from datetime import datetime
+import argparse
+
+
+def gen_headers():
+    # ak / sk 建议线上不要写死在代码里，放到环境变量或配置文件中
+    ak = "DB1178355DDE4CD2"
+    sk = "4764F7B34264E8F4343AC7363AA6D4"
+
+    # 对应：var ts = Math.floor(Date.now()).toString();
+    # Date.now() 是毫秒，这里同样用毫秒时间戳
+    ts = str(int(time.time() * 1000))
+
+    # 对应：CryptoJS.HmacSHA256(ts + ak, sk).toString().toUpperCase()
+    msg = (ts + ak).encode("utf-8")
+    key = sk.encode("utf-8")
+    digest = hmac.new(key, msg, hashlib.sha256).hexdigest().upper()
+
+    # 对应：new Buffer(...).toString('base64');
+    # 即对十六进制字符串做 base64 编码
+    sign = base64.b64encode(digest.encode("utf-8")).decode("utf-8")
+
+    headers = {
+        "accessKey": ak,
+        "ts": ts,
+        "sign": sign,
+        "Content-Type": "application/json",
+    }
+    return headers
+
+
+def get_current_local_time_str():
+    """
+    生成形如：2025-12-23 12:48:00.000 的时间字符串
+    使用当前系统时间
+    """
+    now = datetime.now()
+    # %f 是微秒，取前 3 位当毫秒
+    return now.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description="调用 time-agent 接口的命令行工具"
+    )
+    parser.add_argument(
+        "--query",
+        # required=True,
+        default="大小周下周六休息7点",
+        help="语义查询内容（必填）",
+    )
+    parser.add_argument(
+        "--type",
+        dest="req_type",
+        default="time",
+        help="payload.data.type，默认值为 'time'",
+    )
+    parser.add_argument(
+        "--timeZone",
+        dest="time_zone",
+        default="+0800",
+        help="payload.data.timeZone，默认值为 '+0800'",
+    )
+    return parser.parse_args()
+
+
+def main():
+    url = "https://ai-model-access-drcn.rnd.honor.com/time-agent/v1/models/model/predict"
+    args = parse_args()
+
+    payload = {
+        "data": {
+            "type": args.req_type,
+            "timeZone": args.time_zone,
+            "query": args.query,
+            "localTime": get_current_local_time_str()
+        }
+    }
+
+    headers = gen_headers()
+
+    resp = requests.post(url, headers=headers, data=json.dumps(payload))
+    print("Status code:", resp.status_code)
+    try:
+        datas = resp.json()
+        res = json.dumps(datas.get("data", {}), separators=(",", ":"), ensure_ascii=False)
+        print({"data_time": res})
+    except Exception:
+        print("Response text:", resp.text)
+
+
+if __name__ == "__main__":
+    main()

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/callback-server.ts

@@ -2,7 +2,9 @@
  * 本地HTTP回调服务器 - 接收OAuth2授权回调
  */
 
+import * as fs from "fs";
 import { createServer, type IncomingMessage, type ServerResponse } from "http";
+import * as path from "path";
 import { URL } from "url";
 
 /**
@@ -19,6 +21,21 @@ 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 {
+  try {
+    const template = fs.readFileSync(path.join(__dirname, "auth-result.html"), "utf-8");
+    const icon = success ? SUCCESS_ICON_SVG : FAILURE_ICON_SVG;
+    return template.replace("{{MESSAGE}}", message).replace("{{ICON_SVG}}", icon);
+  } catch (error) {
+    // Fallback to simple text
+    console.error("Failed to read auth-result.html:", error);
+    return `<h1>${message}</h1>`;
+  }
+}
+
 /**
  * 启动本地回调服务器
  */
@@ -40,13 +57,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 +75,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 +120,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";
-  }
-
   /**
    * 获取设备名称
    */