@honor-claw/yoyo 1.6.1-beta.1 → 1.6.1-beta.3

package/dist/apis/http-client.mjs

@@ -3,6 +3,8 @@ import { getProxyUrl as t, shouldUseProxy as n } from "../utils/proxy.mjs";
 import { ProxyAgent as r, request as i } from "undici";
 //#region src/apis/http-client.ts
 var a = class extends Error {
+	status;
+	data;
 	constructor(e, t, n) {
 		super(n), this.status = e, this.data = t, this.name = "HttpError";
 	}

package/dist/cloud-channel/message-handler.mjs

@@ -9,6 +9,7 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 	config;
 	pendingFirstMessages = /* @__PURE__ */ new Map();
 	initializedDeviceIds = /* @__PURE__ */ new Set();
+	pendingNodeConnects = /* @__PURE__ */ new Map();
 	contextUpdateHandlers = {
 		style: this.updateStyleContext.bind(this),
 		"model.primary": this.updatePrimaryModel.bind(this),
@@ -116,7 +117,43 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 		}
 	}
 	forwardToNodeGateway(t, n, r, a) {
-		e().info(`${i} forwarding user message to node gateway from ${n}, session: ${t}`), r.send(a);
+		e().info(`${i} forwarding user message to node gateway from ${n}, session: ${t}`);
+		let o = this.readNodeConnectRequest(a);
+		o && this.pendingNodeConnects.set(o.requestId, o.nodeId);
+		try {
+			r.send(a);
+		} catch (e) {
+			throw o && this.pendingNodeConnects.delete(o.requestId), e;
+		}
+	}
+	readNodeConnectRequest(e) {
+		let t;
+		try {
+			t = JSON.parse(e);
+		} catch {
+			return;
+		}
+		if (t.type !== "req" || t.method !== "connect" || typeof t.id != "string" || !t.params || typeof t.params != "object") return;
+		let n = t.params;
+		if (n.role !== "node" || !n.device || typeof n.device != "object") return;
+		let r = n.device;
+		if (!(typeof r.id != "string" || !r.id.trim())) return {
+			requestId: t.id,
+			nodeId: r.id
+		};
+	}
+	handleNodeConnectResponse(e) {
+		let t = e;
+		if (t.type !== "res" || typeof t.id != "string") return;
+		let n = this.pendingNodeConnects.get(t.id);
+		n && (this.pendingNodeConnects.delete(t.id), !(t.ok !== !0 || !t.payload || typeof t.payload != "object") && t.payload.type === "hello-ok" && this.armNodePairingAutoApproval(n));
+	}
+	async armNodePairingAutoApproval(t) {
+		if (!await this.adminClientManager.waitForReady()) {
+			e().warn(`${i} admin client not available for node pairing auto approval, nodeId: ${t}`);
+			return;
+		}
+		await this.adminClientManager.getClient()?.approvePendingNodePairing(t);
 	}
 	processMessageBuffer(e, t, n, r) {
 		let i = this.pendingFirstMessages.get(t);
@@ -156,7 +193,7 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 				e().warn(`${i} gateway message is not valid JSON`);
 				return;
 			}
-			if (!a.ok && a.error?.code === "NOT_PAIRED") {
+			if (this.handleNodeConnectResponse(a), !a.ok && a.error?.code === "NOT_PAIRED") {
 				let r = a.error?.details?.requestId;
 				if (!r) {
 					e().warn(`${i} NOT_PAIRED without requestId, ignoring...`);

package/dist/gateway-client/admin-client.mjs

@@ -1,7 +1,8 @@
-import { GATEWAY_CLIENT_IDS as e, GATEWAY_CLIENT_MODES as t } from "./types/client.mjs";
-import { ProtocolGatewayClient as n } from "./protocol-client.mjs";
+import { useClawLogger as e } from "../utils/logger.mjs";
+import { GATEWAY_CLIENT_IDS as t, GATEWAY_CLIENT_MODES as n } from "./types/client.mjs";
+import { ProtocolGatewayClient as r } from "./protocol-client.mjs";
 //#region src/gateway-client/admin-client.ts
-var r = {
+var i = {
 	role: "operator",
 	scopes: [
 		"operator.admin",
@@ -11,12 +12,12 @@ var r = {
 		"operator.approvals",
 		"operator.pairing"
 	],
-	clientId: e.CLI,
+	clientId: t.CLI,
 	displayName: "YOYO-Control",
-	clientMode: t.BACKEND
-}, i = class extends n {
+	clientMode: n.BACKEND
+}, a = "[yoyoclaw-adminGatewayClient]", o = class extends r {
 	constructor(e = {}) {
-		super(e, r);
+		super(e, i);
 	}
 	async setAgentFile(e, t, n = "main") {
 		return this.sendRequest("agents.files.set", {
@@ -49,6 +50,16 @@ var r = {
 	async devicePairApprove(e) {
 		return this.sendRequest("device.pair.approve", { requestId: e });
 	}
+	async approvePendingNodePairing(t) {
+		let n = t.trim();
+		if (!n) return !1;
+		try {
+			let t = (await this.sendRequest("node.pair.list", {})).pending?.find((e) => e.nodeId === n);
+			return t ? (e().info(`${a} auto approving node pairing, nodeId: ${n}, requestId: ${t.requestId}`), await this.sendRequest("node.pair.approve", { requestId: t.requestId }), !0) : !1;
+		} catch (t) {
+			return e().error(`${a} node pairing auto approve failed, nodeId: ${n}, error: ${String(t)}`), !1;
+		}
+	}
 };
 //#endregion
-export { i as default };
+export { o as default };

package/dist/gateway-client/protocol-client.mjs

@@ -1,17 +1,18 @@
 import { useClawLogger as e } from "../utils/logger.mjs";
-import { loadOrCreateDeviceIdentity as t } from "../modules/device/identity.mjs";
-import { buildDeviceAuthCredential as n } from "../modules/device/credential-builder.mjs";
-import { GatewayClient as r } from "./client.mjs";
-import { ErrorCodes as i, GATEWAY_CLIENT_IDS as a, GATEWAY_CLIENT_MODES as o, WebSocketClientError as s } from "./types/client.mjs";
-import { randomUUID as c } from "node:crypto";
+import { getProtocolVersion as t } from "../utils/version.mjs";
+import { loadOrCreateDeviceIdentity as n } from "../modules/device/identity.mjs";
+import { buildDeviceAuthCredential as r } from "../modules/device/credential-builder.mjs";
+import { GatewayClient as i } from "./client.mjs";
+import { ErrorCodes as a, GATEWAY_CLIENT_IDS as o, GATEWAY_CLIENT_MODES as s, WebSocketClientError as c } from "./types/client.mjs";
+import { randomUUID as l } from "node:crypto";
 //#region src/gateway-client/protocol-client.ts
-var l = {
+var u = {
 	role: "operator",
 	scopes: [],
-	clientId: a.CLI,
+	clientId: o.CLI,
 	displayName: "Protocol Client",
-	clientMode: o.CLI
-}, u = 3e4, d = "1.0.0", f = "server", p = 2, m = 1e3, h = class extends r {
+	clientMode: s.CLI
+}, d = 3e4, f = "1.0.0", p = "server", m = 2, h = 1e3, g = class extends i {
 	protocolOpts;
 	config;
 	pendingRequests = /* @__PURE__ */ new Map();
@@ -27,7 +28,7 @@ var l = {
 	isReconnecting = !1;
 	constructor(e = {}, t = {}) {
 		super(e), this.protocolOpts = e, this.config = {
-			...l,
+			...u,
 			...t
 		}, this.debug = process.env.DEBUG_GATEWAY === "true";
 	}
@@ -67,15 +68,15 @@ var l = {
 		if (t) if (this.logDebug("response", e), this.pendingRequests.delete(e.id), this.clearTimer(e.id), e.ok) t.resolve(e.payload);
 		else {
 			let n = e.error || {
-				code: i.UNKNOWN,
+				code: a.UNKNOWN,
 				message: "Unknown error"
 			};
-			t.reject(new s(this.toErrorCode(n.code), n.message, n.details, n.retryable));
+			t.reject(new c(this.toErrorCode(n.code), n.message, n.details, n.retryable));
 		}
 	}
 	async sendConnect() {
-		let e = this.config.clientMode ?? o.CLI, r = await t(), i = this.connectNonce ? n({
-			deviceIdentity: r,
+		let e = this.config.clientMode ?? s.CLI, i = await n(), a = this.connectNonce ? r({
+			deviceIdentity: i,
 			clientName: this.config.clientId,
 			clientMode: e,
 			role: this.config.role,
@@ -83,16 +84,16 @@ var l = {
 			authToken: this.protocolOpts.token,
 			nonce: this.connectNonce,
 			platform: process.platform,
-			deviceFamily: f
-		}) : void 0, a = {
-			minProtocol: 3,
-			maxProtocol: 3,
+			deviceFamily: p
+		}) : void 0, o = {
+			minProtocol: t(),
+			maxProtocol: t(),
 			client: {
 				id: this.config.clientId,
 				displayName: this.config.displayName,
-				version: d,
+				version: f,
 				platform: process.platform,
-				deviceFamily: f,
+				deviceFamily: p,
 				mode: e
 			},
 			role: this.config.role,
@@ -101,21 +102,21 @@ var l = {
 				token: this.protocolOpts.token,
 				password: this.protocolOpts.password
 			},
-			device: i
+			device: a
 		};
-		this.sendRequest("connect", a).then((e) => {
+		this.sendRequest("connect", o).then((e) => {
 			this.helloOk = e, this.connected = !0, this.authenticated = !0, this.protocolOpts.onAuthenticated?.();
 		}).catch((e) => {
-			this.authenticated = !1, e instanceof s ? this.protocolOpts.onClose?.(`auth failed: [${e.code}] ${e.message}`) : this.protocolOpts.onClose?.(`auth failed: ${e.message}`);
+			this.authenticated = !1, e instanceof c ? this.protocolOpts.onClose?.(`auth failed: [${e.code}] ${e.message}`) : this.protocolOpts.onClose?.(`auth failed: ${e.message}`);
 		});
 	}
 	async sendRequest(e, t) {
-		let n = c();
+		let n = l();
 		return this.logDebug("request", {
 			id: n,
 			method: e,
 			params: t
-		}), new Promise((r, a) => {
+		}), new Promise((r, i) => {
 			let o = {
 				type: "req",
 				id: n,
@@ -124,22 +125,22 @@ var l = {
 			};
 			this.pendingRequests.set(n, {
 				resolve: r,
-				reject: a
+				reject: i
 			});
 			try {
 				this.send(JSON.stringify(o));
 			} catch (e) {
-				this.pendingRequests.delete(n), a(new s(i.CONNECTION_FAILED, `WebSocket is not connected, ${JSON.stringify(e)}`));
+				this.pendingRequests.delete(n), i(new c(a.CONNECTION_FAILED, `WebSocket is not connected, ${JSON.stringify(e)}`));
 				return;
 			}
-			let c = setTimeout(() => {
+			let s = setTimeout(() => {
 				if (this.pendingRequests.has(n)) {
 					this.pendingRequests.delete(n);
 					let t = this.pendingTimers.get(n);
-					t && clearTimeout(t), this.pendingTimers.delete(n), a(new s(i.TIMEOUT, `Request timeout: ${e}`));
+					t && clearTimeout(t), this.pendingTimers.delete(n), i(new c(a.TIMEOUT, `Request timeout: ${e}`));
 				}
-			}, u);
-			this.pendingTimers.set(n, c);
+			}, d);
+			this.pendingTimers.set(n, s);
 		});
 	}
 	isAuthenticated() {
@@ -149,7 +150,7 @@ var l = {
 		return this.connected;
 	}
 	toErrorCode(e) {
-		return Object.values(i).includes(e) ? e : i.UNKNOWN;
+		return Object.values(a).includes(e) ? e : a.UNKNOWN;
 	}
 	clearTimer(e) {
 		let t = this.pendingTimers.get(e);
@@ -170,15 +171,15 @@ var l = {
 	}
 	scheduleReconnect() {
 		if (!(this.closed || this.isReconnecting)) {
-			if (this.reconnectAttempts >= p) {
-				e().error(`[protocol-gateway] max reconnect attempts (${p}) reached, giving up`), this.protocolOpts.onReconnectFailed?.();
+			if (this.reconnectAttempts >= m) {
+				e().error(`[protocol-gateway] max reconnect attempts (${m}) reached, giving up`), this.protocolOpts.onReconnectFailed?.();
 				return;
 			}
-			this.reconnectAttempts++, this.isReconnecting = !0, e().info(`[protocol-gateway] attempting to reconnect (attempt ${this.reconnectAttempts}/${p})`), this.reconnectTimer = setTimeout(() => {
+			this.reconnectAttempts++, this.isReconnecting = !0, e().info(`[protocol-gateway] attempting to reconnect (attempt ${this.reconnectAttempts}/${m})`), this.reconnectTimer = setTimeout(() => {
 				this.isReconnecting = !1, this.closed || super.connect();
-			}, m);
+			}, h);
 		}
 	}
 };
 //#endregion
-export { h as ProtocolGatewayClient };
+export { g as ProtocolGatewayClient };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { setYoyoRuntime as e } from "./runtime.mjs";
-import { setClawLogger as t } from "./utils/logger.mjs";
+import { setClawLogger as e } from "./utils/logger.mjs";
+import { setYoyoRuntime as t } from "./runtime.mjs";
 import { registerCommands as n } from "./commands/index.mjs";
 import { registerHooks as r } from "./hooks/index.mjs";
 import { YoyoPluginConfigSchema as i } from "./schemas.mjs";
@@ -12,7 +12,7 @@ var o = {
 	description: "OpenClaw Honor Yoyo connection plugin",
 	configSchema: i,
 	register(i) {
-		e(i.runtime), t(i.logger), i.registerService(a(i)), r(i), n(i);
+		t(i.runtime), e(i.logger), i.registerService(a(i)), r(i), n(i);
 	}
 };
 //#endregion

package/dist/modules/configs/config-manager.mjs

@@ -1,25 +1,34 @@
-import { isBetaVersion as e } from "../../utils/version.mjs";
-import { getYoyoRuntime as t } from "../../runtime.mjs";
-import { areStringArraysEqual as n } from "../../utils/array.mjs";
-import { getEnvFromProcessEnv as r } from "../../utils/env.mjs";
-import { wrapError as i } from "../../utils/error.mjs";
-import { useClawLogger as a } from "../../utils/logger.mjs";
-import { detectProvidersToRename as o, updateProviderReferences as s } from "./provider.mjs";
-import { STATE_FLAG as c, hasPersistedStateFlag as l, markPersistedStateFlag as u } from "./state-flags.mjs";
+import { areStringArraysEqual as e } from "../../utils/array.mjs";
+import { getEnvFromProcessEnv as t } from "../../utils/env.mjs";
+import { wrapError as n } from "../../utils/error.mjs";
+import { useClawLogger as r } from "../../utils/logger.mjs";
+import { detectProvidersToRename as i, updateProviderReferences as a } from "./provider.mjs";
+import { STATE_FLAG as o, hasPersistedStateFlag as s, markPersistedStateFlag as c } from "./state-flags.mjs";
+import { getYoyoRuntime as l } from "../../runtime.mjs";
+import { isBetaVersion as u } from "../../utils/version.mjs";
 //#region src/modules/configs/config-manager.ts
 var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,alarm.enable,alarm.query,alarm.update,app.close,app.open,call.phone,call.search,capture-screenshot,contact.search,file-upload,hotspot,local-search,message.search,message.send,mobile-data,no-disturb,quiet-mode,ringing-mode,schedule.create,schedule.delete,schedule.search,schedule.update,screen-record,vibration-mode,volume.operate,wlan,bluetooth,location-service,nfc,usb-shared-network,eyecomfort,status-bar-show,brightness,autoscreen-onnotice,dark-mode,device-operation,camera,app.uninstall,audio-record,battery,gui.create,gui.pause,gui.terminate,mcp.tool.call,task_result_query".split(","), p = class {
 	loadConfig() {
 		try {
-			return t().config.loadConfig();
+			let e = l().config, t = e.current;
+			return typeof t == "function" ? structuredClone(t()) : structuredClone(e.loadConfig());
 		} catch (e) {
-			throw i(e, "Failed to load config");
+			throw n(e, "Failed to load config");
 		}
 	}
 	async saveConfig(e) {
 		try {
-			await t().config.writeConfigFile(e);
+			let t = l().config, n = t.replaceConfigFile;
+			if (typeof n == "function") {
+				await n({
+					nextConfig: e,
+					afterWrite: { mode: "auto" }
+				});
+				return;
+			}
+			await t.writeConfigFile(e);
 		} catch (e) {
-			throw i(e, "Failed to save config");
+			throw n(e, "Failed to save config");
 		}
 	}
 	getGatewayAuthConfig() {
@@ -53,14 +62,14 @@ var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,ala
 	}
 	getEnvInfo() {
 		try {
-			let e = this.loadConfig().plugins?.entries?.[d]?.config, t = e?.envInfo;
-			if (t?.env) return t;
-			let n = e?.env;
-			if (n) return {
-				env: n,
+			let e = this.loadConfig().plugins?.entries?.[d]?.config, n = e?.envInfo;
+			if (n?.env) return n;
+			let r = e?.env;
+			if (r) return {
+				env: r,
 				source: "manual"
 			};
-			let i = r();
+			let i = t();
 			return i ? {
 				env: i,
 				source: "env"
@@ -115,7 +124,7 @@ var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,ala
 			};
 			await this.saveConfig(r);
 		} catch (e) {
-			throw i(e, "Failed to update device config");
+			throw n(e, "Failed to update device config");
 		}
 	}
 	async updateEnv(e) {
@@ -143,7 +152,7 @@ var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,ala
 			};
 			await this.saveConfig(n);
 		} catch (e) {
-			throw i(e, "Failed to update env config");
+			throw n(e, "Failed to update env config");
 		}
 	}
 	async resetEnv() {
@@ -172,7 +181,7 @@ var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,ala
 			};
 			await this.saveConfig(n);
 		} catch (e) {
-			throw i(e, "Failed to reset env config");
+			throw n(e, "Failed to reset env config");
 		}
 	}
 	async updateGrayTag(e) {
@@ -196,7 +205,7 @@ var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,ala
 			};
 			await this.saveConfig(n);
 		} catch (e) {
-			throw i(e, "Failed to update gray tag config");
+			throw n(e, "Failed to update gray tag config");
 		}
 	}
 	async updateUserConfig(e) {
@@ -220,7 +229,7 @@ var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,ala
 			};
 			await this.saveConfig(n);
 		} catch (e) {
-			throw i(e, "Failed to update user config");
+			throw n(e, "Failed to update user config");
 		}
 	}
 	async clearUserConfig() {
@@ -243,38 +252,38 @@ var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,ala
 			};
 			await this.saveConfig(t);
 		} catch (e) {
-			throw i(e, "Failed to clear user config");
+			throw n(e, "Failed to clear user config");
 		}
 	}
-	async initializePluginConfig(t) {
+	async initializePluginConfig(l) {
 		try {
-			let i = this.loadConfig(), d = i.skills || {}, p = d.load || {}, m = p.watch === !0, h = !m || await l(c.DISABLE_SKILLS_LOAD_WATCH_MIGRATION_DONE), g = i.plugins?.allow || [], _ = !g.includes(t), v = g.includes(t) ? g : [...g, t], y = i.gateway?.nodes?.allowCommands || [], b = Array.from(new Set([...y, ...f])), x = !n(y, b), S = m && !h, C = i.plugins?.entries?.[t]?.config?.envInfo, w = i.plugins?.entries?.[t]?.config?.env, T = !!(C?.env || w), E = r(), D = !!C?.env && C.source === "env", O = !C?.env && !!w || D && E && C.env !== E, k = !T || O, A = {
-				env: E || w || (e() ? "test" : "production"),
+			let n = this.loadConfig(), d = n.skills || {}, p = d.load || {}, m = p.watch === !0, h = !m || await s(o.DISABLE_SKILLS_LOAD_WATCH_MIGRATION_DONE), g = n.plugins?.allow || [], _ = !g.includes(l), v = g.includes(l) ? g : [...g, l], y = n.gateway?.nodes?.allowCommands || [], b = Array.from(new Set([...y, ...f])), x = !e(y, b), S = m && !h, C = n.plugins?.entries?.[l]?.config?.envInfo, w = n.plugins?.entries?.[l]?.config?.env, T = !!(C?.env || w), E = t(), D = !!C?.env && C.source === "env", O = !C?.env && !!w || D && E && C.env !== E, k = !T || O, A = {
+				env: E || w || (u() ? "test" : "production"),
 				source: "env"
-			}, j = i.plugins?.entries?.[t]?.config || {}, M = k ? {
+			}, j = n.plugins?.entries?.[l]?.config || {}, M = k ? {
 				...j,
 				envInfo: A,
 				env: void 0
-			} : j, N = i.plugins?.entries?.[t]?.enabled !== !0, P = o(i), F = Object.keys(P).length > 0;
-			if (F && a().info(`[claw-configs] Found ${Object.keys(P).length} providers to rename: ${Object.entries(P).map(([e, t]) => `${e} -> ${t}`).join(", ")}`), !_ && !x && !S && !k && !N && !F) return;
+			} : j, N = n.plugins?.entries?.[l]?.enabled !== !0, P = i(n), F = Object.keys(P).length > 0;
+			if (F && r().info(`[claw-configs] Found ${Object.keys(P).length} providers to rename: ${Object.entries(P).map(([e, t]) => `${e} -> ${t}`).join(", ")}`), !_ && !x && !S && !k && !N && !F) return;
 			let I = {
-				...i,
+				...n,
 				plugins: {
-					...i.plugins,
+					...n.plugins,
 					allow: v,
 					entries: {
-						...i.plugins?.entries,
-						[t]: {
-							...i.plugins?.entries?.[t],
+						...n.plugins?.entries,
+						[l]: {
+							...n.plugins?.entries?.[l],
 							enabled: !0,
 							config: M
 						}
 					}
 				},
 				gateway: {
-					...i.gateway,
+					...n.gateway,
 					nodes: {
-						...i.gateway?.nodes,
+						...n.gateway?.nodes,
 						allowCommands: b
 					}
 				}
@@ -288,9 +297,9 @@ var d = "yoyo", f = /* @__PURE__ */ "alarm.create,alarm.delete,alarm.disable,ala
 						watch: !1
 					}
 				}
-			}, a().info("[claw-configs] Disabled skills.load.watch for yoyo migration")), F && (I = s(I, P), a().info("[claw-configs] Provider renaming completed")), await this.saveConfig(I), S && await u(c.DISABLE_SKILLS_LOAD_WATCH_MIGRATION_DONE);
+			}, r().info("[claw-configs] Disabled skills.load.watch for yoyo migration")), F && (I = a(I, P), r().info("[claw-configs] Provider renaming completed")), await this.saveConfig(I), S && await c(o.DISABLE_SKILLS_LOAD_WATCH_MIGRATION_DONE);
 		} catch (e) {
-			throw i(e, "failed to initialize plugin config");
+			throw n(e, "failed to initialize plugin config");
 		}
 	}
 }, m = null;

package/dist/modules/configs/identity-persist.mjs

@@ -4,70 +4,68 @@ import { safeReadFile as n, safeWriteFile as r } from "../../utils/fs-safe.mjs";
 import { resolveEffectiveHomeDir as i } from "../../utils/home-dir.mjs";
 import a from "node:path";
 //#region src/modules/configs/identity-persist.ts
-var o = /* @__PURE__ */ function(e) {
-	return e[e.LEGACY = 1] = "LEGACY", e[e.NEW = 2] = "NEW", e;
-}({}), s = ".openclaw", c = "yoyo", l = "identity.json", u = 6e4;
-function d() {
-	return a.join(s, c, l);
+var o = ".openclaw", s = "yoyo", c = "identity.json", l = 6e4;
+function u() {
+	return a.join(o, s, c);
 }
-async function f(t) {
-	let r = d();
+async function d(t) {
+	let r = u();
 	try {
 		let e = (await n({
 			rootDir: t,
 			relativePath: r,
 			maxBytes: 10 * 1024
 		})).buffer.toString("utf8"), i = JSON.parse(e);
-		return typeof i != "object" || !i ? v() : {
-			...v(),
+		return typeof i != "object" || !i ? _() : {
+			..._(),
 			...i
 		};
 	} catch (t) {
 		return e(t, "[yoyo-identity] failed to read identity"), null;
 	}
 }
-async function p() {
+async function f() {
 	let e = i();
-	return e ? await f(e) || null : (t().warn("[yoyo-identity] failed to find home dir"), null);
+	return e ? await d(e) || null : (t().warn("[yoyo-identity] failed to find home dir"), null);
 }
-async function m(e) {
+async function p(e) {
 	let n = i();
 	if (!n) return t().warn("[yoyo-identity] failed to find home dir"), null;
-	let a = await f(n), s = {
+	let a = await d(n), o = {
 		...a,
-		version: a?.version || o.NEW
+		version: a?.version || 2
 	};
-	return e.legacyDeviceId && (s.legacyDeviceId = e.legacyDeviceId), e.deviceId && (s.deviceId = e.deviceId, s.publicKeyPem = e.publicKeyPem, s.privateKeyPem = e.privateKeyPem, s.createdAtMs = e.createdAtMs), e.version && (s.version = e.version), "gatewayAuthMd5" in e && (s.gatewayAuthMd5 = e.gatewayAuthMd5), "pluginVersionCode" in e && (s.pluginVersionCode = e.pluginVersionCode), "authorizationCache" in e && (s.authorizationCache = e.authorizationCache), await r({
+	return e.legacyDeviceId && (o.legacyDeviceId = e.legacyDeviceId), e.deviceId && (o.deviceId = e.deviceId, o.publicKeyPem = e.publicKeyPem, o.privateKeyPem = e.privateKeyPem, o.createdAtMs = e.createdAtMs), e.version && (o.version = e.version), "gatewayAuthMd5" in e && (o.gatewayAuthMd5 = e.gatewayAuthMd5), "pluginVersionCode" in e && (o.pluginVersionCode = e.pluginVersionCode), "authorizationCache" in e && (o.authorizationCache = e.authorizationCache), await r({
 		rootDir: n,
-		relativePath: d(),
-		data: JSON.stringify(s, null, 2),
+		relativePath: u(),
+		data: JSON.stringify(o, null, 2),
 		encoding: "utf8",
 		mkdir: !0
-	}), s;
+	}), o;
 }
-function h(e) {
+function m(e) {
 	let t = typeof e == "number" ? e : typeof e == "string" && e.trim() ? Number(e) : 0;
-	return !Number.isFinite(t) || t < u ? 0 : Math.floor(t);
+	return !Number.isFinite(t) || t < l ? 0 : Math.floor(t);
 }
-async function g(e, t, n = Date.now()) {
-	let r = await m({ authorizationCache: {
+async function h(e, t, n = Date.now()) {
+	let r = await p({ authorizationCache: {
 		jwtToken: e,
 		receivedAtMs: n,
-		expireMs: h(t)
+		expireMs: m(t)
 	} });
 	if (!r) throw Error("failed to write authorization cache");
 	return r;
 }
-async function _() {
-	let e = await p(), t = e?.authorizationCache;
-	return t?.jwtToken ? m({ authorizationCache: {
+async function g() {
+	let e = await f(), t = e?.authorizationCache;
+	return t?.jwtToken ? p({ authorizationCache: {
 		jwtToken: void 0,
 		receivedAtMs: t.receivedAtMs,
-		expireMs: h(t.expireMs)
+		expireMs: m(t.expireMs)
 	} }) : e;
 }
-function v() {
-	return { version: o.NEW };
+function _() {
+	return { version: 2 };
 }
 //#endregion
-export { o as IdentityVersion, g as cacheAuthorizationToken, _ as clearCachedAuthorizationToken, p as getPersistedIdentity, h as parseAuthorizationExpireMs, m as updatePersistedIdentity };
+export { h as cacheAuthorizationToken, g as clearCachedAuthorizationToken, f as getPersistedIdentity, m as parseAuthorizationExpireMs, p as updatePersistedIdentity };

package/dist/modules/device/providers/windows.mjs

@@ -1,5 +1,5 @@
 import e from "os";
-import * as t from "winreg";
+import t from "winreg";
 //#region src/modules/device/providers/windows.ts
 function n(e, n, r) {
 	return new Promise((i) => {

package/dist/modules/device/registry.mjs

@@ -1,6 +1,6 @@
-import { getYoyoPluginVersionCode as e } from "../../utils/version.mjs";
-import { useClawLogger as t } from "../../utils/logger.mjs";
-import { getConfigManager as n } from "../configs/config-manager.mjs";
+import { useClawLogger as e } from "../../utils/logger.mjs";
+import { getConfigManager as t } from "../configs/config-manager.mjs";
+import { getYoyoPluginVersionCode as n } from "../../utils/version.mjs";
 import { isOKResponse as r } from "../../apis/helpers.mjs";
 import { createClawCloudClient as i } from "../../apis/claw-cloud.mjs";
 import { getPersistedIdentity as a, updatePersistedIdentity as o } from "../configs/identity-persist.mjs";
@@ -9,28 +9,28 @@ import "../../apis/index.mjs";
 import { formatHashForLog as s } from "../../utils/hash.mjs";
 import { createGatewayAuthMd5 as c, isSameGatewayAuthMd5 as l } from "./gateway-auth.mjs";
 //#region src/modules/device/registry.ts
-async function u(t, a) {
-	if (!t || !a) throw Error("设备信息或用户信息缺失");
-	let o = n().getGatewayAuthConfig(), s = c(o), l = e(), u = await i().registerDevice(t, a, o);
+async function u(e, a) {
+	if (!e || !a) throw Error("设备信息或用户信息缺失");
+	let o = t().getGatewayAuthConfig(), s = c(o), l = n(), u = await i().registerDevice(e, a, o);
 	if (!r(u)) throw Error(`注册失败：${u.data?.cnMessage}`);
 	await f(s, l);
 }
 async function d(r, i) {
-	let o = c(n().getGatewayAuthConfig()), d = e(), f = await a(), p = f?.gatewayAuthMd5, m = f?.pluginVersionCode, h = t();
+	let o = c(t().getGatewayAuthConfig()), d = n(), f = await a(), p = f?.gatewayAuthMd5, m = f?.pluginVersionCode, h = e();
 	if (h.info(`[yoyoclaw-registry] checking registration state: gatewayAuth current=${s(o)}, persisted=${s(p)}; pluginVersionCode current=${d}, persisted=${m ?? "none"}`), l(p, o) && m === d) {
 		h.info("[yoyoclaw-registry] registration state unchanged, skipping device registration");
 		return;
 	}
 	h.info("[yoyoclaw-registry] registration state changed, registering device"), await u(r, i), h.info(`[yoyoclaw-registry] device registration succeeded, pluginVersionCode=${d}`);
 }
-async function f(e, n) {
+async function f(t, n) {
 	try {
 		await o({
-			gatewayAuthMd5: e,
+			gatewayAuthMd5: t,
 			pluginVersionCode: n
-		}), t().info("[yoyoclaw-registry] registration state persisted after device registration");
-	} catch (e) {
-		t().warn(`[yoyoclaw-registry] failed to persist registration state: ${String(e)}`);
+		}), e().info("[yoyoclaw-registry] registration state persisted after device registration");
+	} catch (t) {
+		e().warn(`[yoyoclaw-registry] failed to persist registration state: ${String(t)}`);
 	}
 }
 //#endregion

package/dist/utils/home-dir.mjs

@@ -1,16 +1,16 @@
 import { findPackageRoot as e } from "./package-json.mjs";
 import t from "node:path";
-import { fileURLToPath as n } from "node:url";
-import r from "node:os";
+import n from "node:os";
+import { fileURLToPath as r } from "node:url";
 //#region src/utils/home-dir.ts
 function i(e) {
 	return e?.trim() || void 0;
 }
-function a(r = import.meta.url) {
-	return e(r) ?? t.parse(n(r)).root;
+function a(n = import.meta.url) {
+	return e(n) ?? t.parse(r(n)).root;
 }
-function o(e = process.env, n = r.homedir) {
-	let i = s(e, n);
+function o(e = process.env, r = n.homedir) {
+	let i = s(e, r);
 	return i ? t.resolve(i) : void 0;
 }
 function s(e, t) {

package/dist/utils/version.mjs

@@ -1,27 +1,59 @@
 import { findPackageRoot as e, readPackageJson as t } from "./package-json.mjs";
+import { getYoyoRuntime as n } from "../runtime.mjs";
 //#region src/utils/version.ts
-var n = "@honor-claw/yoyo";
-function r() {
-	let e = o();
+var r = "@honor-claw/yoyo", i = 3;
+function a() {
+	try {
+		let e = n().version;
+		return o(e);
+	} catch {
+		return i;
+	}
+}
+function o(e) {
+	let t = s(e);
+	return t && c(t, [
+		2026,
+		5,
+		12
+	]) >= 0 ? 4 : i;
+}
+function s(e) {
+	if (!e) return null;
+	let t = e.split("-", 1)[0].split(".");
+	if (t.length === 0) return null;
+	let n = t.map((e) => Number.parseInt(e, 10));
+	return n.some((e) => !Number.isFinite(e) || e < 0) ? null : n;
+}
+function c(e, t) {
+	let n = Math.max(e.length, t.length);
+	for (let r = 0; r < n; r += 1) {
+		let n = e[r] ?? 0, i = t[r] ?? 0;
+		if (n !== i) return n - i;
+	}
+	return 0;
+}
+function l() {
+	let e = f();
 	return e.includes("beta") || e.includes("alpha");
 }
-function i(e) {
+function u(e) {
 	if (!e) return 0;
 	let t = Number.parseInt(e, 10);
 	return Number.isFinite(t) && t >= 0 ? t : 0;
 }
-function a() {
-	let [e, t, n] = o().split("-", 1)[0].split("."), r = i(e), a = i(t), s = i(n);
-	return r * 1e6 + a * 1e3 + s;
+function d() {
+	let [e, t, n] = f().split("-", 1)[0].split("."), r = u(e), i = u(t), a = u(n);
+	return r * 1e6 + i * 1e3 + a;
 }
-function o() {
+function f() {
 	try {
-		let r = e(import.meta.url, n);
-		if (!r) return "0.0.0";
-		let i = t(r)?.version;
+		let n = e(import.meta.url, r);
+		if (!n) return "0.0.0";
+		let i = t(n)?.version;
 		if (typeof i == "string") return i;
 	} catch {}
 	return "0.0.0";
 }
 //#endregion
-export { a as getYoyoPluginVersionCode, r as isBetaVersion };
+export { a as getProtocolVersion, d as getYoyoPluginVersionCode, l as isBetaVersion };

package/openclaw.plugin.json

@@ -1,6 +1,10 @@
 {
   "id": "yoyo",
   "skills": ["./skills"],
+  "enabledByDefault": true,
+  "activation": {
+    "onStartup": true
+  },
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.6.1-beta.1",
+  "version": "1.6.1-beta.3",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",
@@ -26,6 +26,10 @@
   "scripts": {
     "build": "vite build",
     "ci:check": "npx tsc --noEmit && npm run test:coverage",
+    "format": "oxfmt",
+    "format:fix": "oxfmt --write",
+    "lint": "oxlint src/",
+    "lint:fix": "oxlint --fix src/",
     "publish:alpha": "npm run build && node scripts/publish.js --alpha",
     "publish:beta": "npm run build && node scripts/publish.js",
     "publish:latest": "npm run build && node scripts/publish.js --release",
@@ -49,6 +53,8 @@
     "@types/node": "^25.0.10",
     "@types/ws": "^8.5.13",
     "@vitest/coverage-v8": "^2.1.8",
+    "oxfmt": "^0.55.0",
+    "oxlint": "^1.70.0",
     "typescript": "^6.0.2",
     "vite": "^8.0.10",
     "vitest": "^2.1.8"