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

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.6",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",

package/src/apis/claw-cloud.ts

@@ -56,8 +56,8 @@ export class ClawCloudClient {
       role: "yoyoclaw",
       deviceInfo: {
         ...deviceInfo,
-        manufacture: "unknown",
-        brand: deviceInfo.brand || "unknown",
+        manufacture: deviceInfo.manufacture,
+        brand: deviceInfo.brand,
         bizExtInfo: gatewayAuthConfig,
       },
     };

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/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

@@ -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/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;
 }
 

package/src/utils/env.ts

@@ -0,0 +1,29 @@
+/**
+ * 环境变量工具模块
+ */
+
+const DEVICE_ENV_VARS = {
+  brand: "YOYO_CLAW_BRAND",
+  manufacture: "YOYO_CLAW_MANUFACTURER",
+  deviceType: "YOYO_CLAW_DEVICE_TYPE",
+} as const;
+
+/**
+ * 设备相关的环境变量
+ */
+export interface DeviceEnvVars {
+  brand?: string;
+  manufacture?: string;
+  deviceType?: 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],
+  };
+}