@honor-claw/yoyo 1.3.0-beta.3 → 1.3.0-beta.4

package/dist/index.mjs

@@ -23,7 +23,7 @@ import { Buffer as ie } from "node:buffer";
 //#region src/utils/version.ts
 var ae = null;
 function oe() {
-	return ae === null && (ae = "1.3.0-beta.3".includes("beta") || "1.3.0-beta.3".includes("alpha")), !!ae;
+	return ae === null && (ae = "1.3.0-beta.4".includes("beta") || "1.3.0-beta.4".includes("alpha")), !!ae;
 }
 //#endregion
 //#region src/runtime.ts
@@ -2951,7 +2951,7 @@ function Cr(e) {
 	return JSON.stringify(Or(e));
 }
 function wr(e) {
-	return g("md5").update(Cr(e)).digest("hex");
+	return e.length === 0 ? "" : g("md5").update(Cr(e)).digest("hex");
 }
 async function Tr(e) {
 	try {
@@ -3016,7 +3016,7 @@ function kr(e) {
 	let t = e;
 	if (!Y(t.nodeId)) throw Error("DeviceToolSet payload missing nodeId");
 	if (!Array.isArray(t.toolSet)) throw Error("DeviceToolSet payload toolSet must be an array");
-	return e;
+	return O().debug?.(`DeviceToolSet payload received: ${JSON.stringify(t, null, 2)}`), e;
 }
 function Ar(e) {
 	let t = e.nodeId, n = [], r = 0;
@@ -3081,83 +3081,94 @@ async function Ir(e, t, n) {
 		mkdir: !0
 	}), {
 		changed: !0,
-		nodeCount: zr(r.tools),
+		nodeCount: Br(r.tools),
 		toolCount: Object.keys(r.tools).length,
 		cache: r
 	};
 }
 function Lr(e, t, n) {
-	let r = { ...e };
+	let r = Rr(e, t);
 	for (let e of n) {
 		let n = r[e.id];
 		r[e.id] = {
 			id: e.id,
 			name: e.name,
 			description: e.description,
-			supportedNodeIds: Rr(n?.supportedNodeIds ?? [], t)
+			supportedNodeIds: zr(n?.supportedNodeIds ?? [], t)
 		};
 	}
 	return r;
 }
 function Rr(e, t) {
+	let n = {};
+	for (let [r, i] of Object.entries(e)) {
+		let e = i.supportedNodeIds.filter((e) => e !== t);
+		e.length > 0 && (n[r] = {
+			...i,
+			supportedNodeIds: e
+		});
+	}
+	return n;
+}
+function zr(e, t) {
 	return [...new Set([...e, t])];
 }
-function zr(e) {
+function Br(e) {
 	let t = /* @__PURE__ */ new Set();
 	for (let n of Object.values(e)) for (let e of n.supportedNodeIds) t.add(e);
 	return t.size;
 }
 //#endregion
 //#region src/modules/device-toolset/skill-inject.ts
-var Br = r.join("skills", "yoyo-control", "SKILL.md"), Vr = r.join("skills", "yoyo-control", "configs", "sub-skills.json"), Hr = "{{full-mcp-tool-list}}", Ur = "<!-- yoyo-mcp-tools:start -->", Wr = "<!-- yoyo-mcp-tools:end -->";
-async function Gr(e, t) {
-	let n = r.join(e, Br), i = await v.readFile(n, "utf8"), a = qr(t, await Kr(e)), o = Yr(i, Jr(a));
+var Vr = r.join("skills", "yoyo-control", "SKILL.md"), Hr = r.join("skills", "yoyo-control", "configs", "sub-skills.json"), Ur = "{{full-mcp-tool-list}}", Wr = "<!-- yoyo-mcp-tools:start -->", Gr = "<!-- yoyo-mcp-tools:end -->";
+async function Kr(e, t) {
+	let n = r.join(e, Vr), i = await v.readFile(n, "utf8"), a = Jr(t, await qr(e)), o = Xr(i, Yr(a));
 	return o !== i && await v.writeFile(n, o, "utf8"), {
 		skillPath: n,
 		rowCount: Object.keys(a).length
 	};
 }
-async function Kr(e) {
-	let t = r.join(e, Vr), n;
+async function qr(e) {
+	let t = r.join(e, Hr), n;
 	try {
 		n = await v.readFile(t, "utf8");
 	} catch (e) {
-		if (Qr(e) && e.code === "ENOENT") return /* @__PURE__ */ new Set();
+		if ($r(e) && e.code === "ENOENT") return /* @__PURE__ */ new Set();
 		throw e;
 	}
 	let i = JSON.parse(n);
 	if (!Array.isArray(i) || i.some((e) => typeof e != "string")) throw Error("sub-skills config must be a JSON array of tool names");
 	return new Set(i.map((e) => e.trim()).filter(Boolean));
 }
-function qr(e, t) {
+function Jr(e, t) {
 	return t.size === 0 ? e : Object.fromEntries(Object.entries(e).filter(([e, n]) => !t.has(e) && !t.has(n.name)));
 }
-function Jr(e) {
+function Yr(e) {
 	return [
-		Ur,
-		...Object.values(e).toSorted((e, t) => e.name.localeCompare(t.name)).map((e) => `| ${Xr(e.name)} | ${Xr(e.description)} | ${Xr(e.supportedNodeIds.join(", "))} |`),
-		Wr
+		Wr,
+		...Object.values(e).toSorted((e, t) => e.name.localeCompare(t.name)).map((e) => `| ${Zr(e.name)} | ${Zr(e.description)} | ${Zr(e.supportedNodeIds.join(", "))} |`),
+		Gr
 	].join("\n");
 }
-function Yr(e, t) {
-	let n = RegExp(`${Zr(Ur)}[\\s\\S]*?${Zr(Wr)}`);
+function Xr(e, t) {
+	let n = RegExp(`${Qr(Wr)}[\\s\\S]*?${Qr(Gr)}`);
 	if (n.test(e)) return e.replace(n, t);
-	if (e.includes(Hr)) return e.replace(Hr, t);
+	if (e.includes(Ur)) return e.replace(Ur, t);
 	throw Error("Unable to find MCP tools placeholder or generated block in yoyo-control skill");
 }
-function Xr(e) {
+function Zr(e) {
 	return e.replaceAll("|", "\\|").replace(/\r?\n/g, " ");
 }
-function Zr(e) {
+function Qr(e) {
 	return e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function Qr(e) {
+function $r(e) {
 	return e instanceof Error && "code" in e;
 }
 //#endregion
 //#region src/modules/device-toolset/processor.ts
-var $r = Ct();
-async function ei(e) {
+var ei = Ct();
+async function ti(e) {
 	let t = kr(e), n = wt();
 	if (!n) throw Error("Unable to resolve home directory for DeviceToolSet persistence");
 	let i = Ar(t);
@@ -3172,9 +3183,9 @@ async function ei(e) {
 	O().info(`[yoyoclaw-device-toolset] cache merged, nodeId: ${i.nodeId}, supportedNodes: ${o.nodeCount}, tools: ${o.toolCount}`);
 	let s = o.cache.tools, c = await ar(n, i.tools);
 	O().info(`[yoyoclaw-device-toolset] archive refreshed, nodeId: ${i.nodeId}, written: ${c.writtenCount}, skipped: ${c.skippedCount}`);
-	let l = await Gr($r, s);
+	let l = await Kr(ei, s);
 	O().info(`[yoyoclaw-device-toolset] skill refreshed, nodeId: ${i.nodeId}, rows: ${l.rowCount}`);
-	let u = await mr(c.archiveDir, r.join($r, "skills", "yoyo-control", "mcptools"));
+	let u = await mr(c.archiveDir, r.join(ei, "skills", "yoyo-control", "mcptools"));
 	return O().info(`[yoyoclaw-device-toolset] mapping ready, nodeId: ${i.nodeId}, mode: ${u.mode}`), await Dr(n, i.nodeId, a, Date.now()), O().info(`[yoyoclaw-device-toolset] process complete, nodeId: ${i.nodeId}`), {
 		changed: !0,
 		nodeId: i.nodeId,
@@ -3185,7 +3196,7 @@ async function ei(e) {
 }
 //#endregion
 //#region src/cloud-channel/message-handler.ts
-var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
+var ni = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ri = class {
 	sessionManager;
 	adminClientManager;
 	config;
@@ -3462,7 +3473,7 @@ var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
 			ok: !1,
 			error: "Missing content in context payload"
 		};
-		let r = ti.style, i = await e.setAgentFile(r, n);
+		let r = ni.style, i = await e.setAgentFile(r, n);
 		return i.ok ? {
 			ok: !0,
 			data: { name: "style" }
@@ -3551,14 +3562,14 @@ var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
 	async updateDeviceToolSetContext(e, t, n) {
 		return n?.header.namespace === "yoyoclaw" ? {
 			ok: !0,
-			data: await ei(t),
+			data: await ti(t),
 			noReply: !0
 		} : {
 			ok: !1,
 			error: `Unsupported DeviceToolSet namespace: ${n?.header.namespace ?? "unknown"}`
 		};
 	}
-}, ri = class extends Pn {
+}, ii = class extends Pn {
 	nodeOpts;
 	sessionId;
 	hardwareDeviceId;
@@ -3600,7 +3611,7 @@ var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
 	onError(e) {
 		O().error(`[yoyoclaw-nodeGatewayClient] error for session: ${this.sessionId}, device: ${this.hardwareDeviceId}: ${e.message}`);
 	}
-}, ii = class {
+}, ai = class {
 	nodeGatewayClientsMap = /* @__PURE__ */ new Map();
 	deviceSessionsMap = /* @__PURE__ */ new Map();
 	sessionIdToHardwareDeviceMap = /* @__PURE__ */ new Map();
@@ -3633,7 +3644,7 @@ var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
 		this.nodeGatewayClientsMap.set(e, t);
 	}
 	createNodeGatewayClient(e) {
-		let t = new ri({
+		let t = new ii({
 			sessionId: e.sessionId,
 			hardwareDeviceId: e.hardwareDeviceId,
 			deviceInfo: e.deviceInfo,
@@ -3665,14 +3676,14 @@ var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
 	getSessionCount() {
 		return this.sessionIdToHardwareDeviceMap.size;
 	}
-}, ai = class {
+}, oi = class {
 	cloudClient;
 	sessionManager;
 	adminClientManager;
 	messageHandler;
 	config;
 	constructor(e) {
-		this.config = e, this.sessionManager = new ii(), this.adminClientManager = new Kn({ onStatusEvent: this.handleStatusEvent }), this.messageHandler = new ni({
+		this.config = e, this.sessionManager = new ai(), this.adminClientManager = new Kn({ onStatusEvent: this.handleStatusEvent }), this.messageHandler = new ri({
 			sessionManager: this.sessionManager,
 			adminClientManager: this.adminClientManager,
 			config: {
@@ -3719,7 +3730,7 @@ var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
 }, Z = {
 	channel: null,
 	status: "idle"
-}, Q = null, oi = (e) => ({
+}, Q = null, si = (e) => ({
 	id: "yoyoclaw-connection",
 	async start() {
 		O().info("[yoyoclaw] plugin service enabled"), Q = new Cn(!0);
@@ -3736,7 +3747,7 @@ var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
 		}
 		try {
 			let e = await mn();
-			e?.token ? (O().info("[yoyoclaw-conn] token found, creating channel"), await si(await W(), e)) : O().info("[yoyoclaw-conn] no token found, skipping channel creation");
+			e?.token ? (O().info("[yoyoclaw-conn] token found, creating channel"), await ci(await W(), e)) : O().info("[yoyoclaw-conn] no token found, skipping channel creation");
 		} catch (e) {
 			O().error(`[yoyoclaw-conn] failed to initialize connection: ${String(e)}`);
 		}
@@ -3745,7 +3756,7 @@ var ti = { style: "SOUL.md" }, X = "[yoyoclaw-channel]", ni = class {
 		$(), O().info("[yoyoclaw-conn] stopping connection service"), Q &&= (await Q.destroy(), null);
 	}
 });
-async function si(e, t) {
+async function ci(e, t) {
 	O().info(`[yoyoclaw-conn] creating new channel for device: ${e.deviceId}`), await Xt(e, t);
 	let n = Z.status;
 	return Z.status = "connecting", Q && await Q.handleEvent({
@@ -3756,7 +3767,7 @@ async function si(e, t) {
 			previousStatus: n
 		}
 	}), new Promise((n, r) => {
-		Z.channel = new ai({
+		Z.channel = new oi({
 			deviceInfo: e,
 			userInfo: t,
 			onOpen: () => {
@@ -3787,7 +3798,7 @@ async function si(e, t) {
 					return;
 				}
 				try {
-					O().info("[yoyoclaw-conn] attempting to register device"), await Yt(e, t), O().info("[yoyoclaw-conn] device registered successfully, reconnecting..."), $(), await si(e, t);
+					O().info("[yoyoclaw-conn] attempting to register device"), await Yt(e, t), O().info("[yoyoclaw-conn] device registered successfully, reconnecting..."), $(), await ci(e, t);
 				} catch (e) {
 					O().error(`[yoyoclaw-conn] device registration failed: ${String(e)}`), O().info("[yoyoclaw-conn] clearing token and destroying channel");
 					try {
@@ -3831,14 +3842,14 @@ function $() {
 }
 //#endregion
 //#region index.ts
-var ci = {
+var li = {
 	id: "yoyo",
 	name: "YOYOClaw",
 	description: "OpenClaw Honor Yoyo connection plugin",
 	configSchema: Mn,
 	register(e) {
-		ce(e.runtime), _e(e.logger), e.registerService(oi(e)), e.on("before_prompt_build", async () => ({ prependSystemContext: kn })), On(e);
+		ce(e.runtime), _e(e.logger), e.registerService(si(e)), e.on("before_prompt_build", async () => ({ prependSystemContext: kn })), On(e);
 	}
 };
 //#endregion
-export { ci as default };
+export { li as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.3.0-beta.3",
+  "version": "1.3.0-beta.4",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",