@honor-claw/yoyo 1.6.0-beta.3 → 1.6.0-beta.5

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/authorization-refresh-manager.mjs

@@ -9,6 +9,7 @@ var a = "[yoyoclaw-auth-refresh]", o = .3, s = .1, c = 1e3, l = 6e4, u = class {
 	scheduleVersion = 0;
 	destroyed = !1;
 	pausedForExpiredToken = !1;
+	pendingConfigTokenRefresh = !1;
 	constructor(e) {
 		this.config = e;
 	}
@@ -29,15 +30,29 @@ var a = "[yoyoclaw-auth-refresh]", o = .3, s = .1, c = 1e3, l = 6e4, u = class {
 		}
 		this.sendUpdateAuthorizationRequest(), this.scheduleTimer(n.expireMs * s);
 	}
-	async handleAuthorizationUpdate(t) {
-		let r = t.bizExtInfo, i = r?.jwtToken;
-		if (typeof i != "string" || !i.trim()) {
+	async handleAuthorizationUpdate(r) {
+		let i = r.bizExtInfo, o = i?.jwtToken;
+		if (typeof o != "string" || !o.trim()) {
 			e().warn(`${a} updateAuthorization missing valid jwtToken`);
 			return;
 		}
 		try {
-			let o = Date.now(), s = (await n(i.trim(), r?.expire, o))?.authorizationCache?.expireMs ?? 0;
-			e().info(`${a} cached new token, expireMs: ${s}, receivedAtMs: ${o}, sourceDeviceId: ${t.sourceDeviceId || "unknown"}, sourceRole: ${t.sourceRole || "unknown"}`), this.pausedForExpiredToken = !1, await this.schedule();
+			let s = Date.now(), c = o.trim(), l = (await n(c, i?.expire, s))?.authorizationCache?.expireMs ?? 0;
+			if (e().info(`${a} cached new token, expireMs: ${l}, receivedAtMs: ${s}, sourceDeviceId: ${r.sourceDeviceId || "unknown"}, sourceRole: ${r.sourceRole || "unknown"}`), this.pendingConfigTokenRefresh) {
+				this.pendingConfigTokenRefresh = !1;
+				try {
+					let n = t(), r = n.getUserConfig();
+					await n.updateUserConfig({
+						...r,
+						token: c,
+						userId: void 0,
+						expired: void 0
+					}), e().info(`${a} persisted upgraded token to plugin config, expireMs: ${l}`);
+				} catch (t) {
+					e().error(`${a} failed to persist upgraded token to plugin config: ${String(t)}`);
+				}
+			}
+			this.pausedForExpiredToken = !1, await this.schedule();
 		} catch (t) {
 			e().error(`${a} failed to cache new token: ${String(t)}`);
 		}
@@ -54,7 +69,7 @@ var a = "[yoyoclaw-auth-refresh]", o = .3, s = .1, c = 1e3, l = 6e4, u = class {
 		let s = (await r())?.authorizationCache, c = i(s?.expireMs), u = s?.receivedAtMs ?? 0;
 		if (!c || !Number.isFinite(u) || u <= 0) {
 			let t = Date.now();
-			return await n(o, l, t), e().warn(`${a} missing cached authorization timing, persisted legacy token timing and refreshing immediately`), {
+			return this.pendingConfigTokenRefresh = !0, await n(o, l, t), e().warn(`${a} missing cached authorization timing, persisted legacy token timing and refreshing immediately`), {
 				receivedAtMs: t,
 				expireMs: l,
 				refreshImmediately: !0

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/hooks/index.mjs

@@ -22,15 +22,21 @@ function c(e) {
 }
 function l(e) {
 	e.on("after_tool_call", async (t) => {
-		if (!(t.toolName !== "read" || t.error || !u(t.params))) try {
+		if (!(t.toolName !== "read" || t.error || !d(t.params))) try {
 			await r(o, "after_tool_call:read_yoyo_control_skill"), e.logger.info("[yoyoclaw-skill-refresh] yoyo-control skill read marker updated");
 		} catch (t) {
 			e.logger.warn(`[yoyoclaw-skill-refresh] failed to update skill read marker: ${String(t)}`);
 		}
 	});
 }
-function u(e) {
-	return n(e.path) || n(e.file_path);
+var u = [
+	"path",
+	"file_path",
+	"filePath",
+	"file"
+];
+function d(e) {
+	return u.some((t) => n(e[t]));
 }
 //#endregion
 export { s as registerHooks };

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