@honor-claw/yoyo 1.4.1-alpha.1 → 1.4.1-alpha.2

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

@@ -1,6 +1,6 @@
 import { useClawLogger as e } from "../utils/logger.mjs";
 import { StatusEventType as t } from "../services/connection/status-tracker/events.mjs";
-import { processDeviceToolSet as n } from "../modules/device-toolset/processor.mjs";
+import { createDeviceToolSetUpdateAck as n } from "../modules/device-toolset/ack.mjs";
 import "../modules/device-toolset/index.mjs";
 //#region src/cloud-channel/message-handler.ts
 var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
@@ -167,7 +167,7 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 				this.sendMessage("deviceControl", t, n, "", void 0, o), e().info(`${i} auto pair is completed, requestId: ${r}`);
 				return;
 			}
-			e().debug?.(`${i} trans gateway msg to cloud, session: ${t}, data: ${r.slice(0, 3e3)}`), this.sendMessage("userMessage", t, n, r) || (e().error(`${i} failed to send message, cloud socket closed, session ${t}, device ${s}`), this.sessionManager.closeNodeGatewayClient(t));
+			this.sendMessage("userMessage", t, n, r) || (e().error(`${i} failed to send message, cloud socket closed, session ${t}, device ${s}`), this.sessionManager.closeNodeGatewayClient(t));
 		} catch (t) {
 			e().error(`${i} failed to handle gateway message: ${String(t)}`);
 		}
@@ -206,10 +206,10 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 				e().info(`${i} ${o ? "update" : "fetch"} context '${u}' processed (no reply)`);
 				return;
 			}
-			d.ok ? (e().info(`${i} ${o ? "update" : "fetch"} context successfully`), this.sendContextResponse(a, n, r, s, {
+			d.ok ? (e().info(`${i} ${o ? "update" : "fetch"} context successfully`), this.sendContextResponse(a, n, r, s, d.responsePayload ?? {
 				ok: !0,
 				...d.data
-			})) : (e().error(`${i} failed to ${o ? "update" : "fetch"} context: ${d.error}`), this.sendContextResponse(a, n, r, s, {
+			})) : (e().error(`${i} failed to ${o ? "update" : "fetch"} context: ${d.error}`), this.sendContextResponse(a, n, r, s, d.responsePayload ?? {
 				ok: !1,
 				error: d.error,
 				...d?.data,
@@ -220,20 +220,20 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 			e().error(`${i} error ${o ? "updating" : "fetching"} context '${u}': ${c}`), this.replyContextError(a, n, r, s, c);
 		}
 	}
-	sendMessage(e, t, n, r, i, a) {
-		let o = {
-			msgType: e,
+	sendMessage(t, n, r, a, o, s) {
+		let c = {
+			msgType: t,
 			sourceRole: "yoyoclaw",
 			sourceDeviceId: this.config.deviceInfo.deviceId,
-			traceInfo: n,
+			traceInfo: r,
 			targetRole: "node",
-			targetDeviceId: t,
+			targetDeviceId: n,
 			port: this.config.deviceInfo.port,
-			data: typeof r == "string" ? r : JSON.stringify(r),
-			contexts: i,
-			bizExtInfo: a
+			data: typeof a == "string" ? a : JSON.stringify(a),
+			contexts: o,
+			bizExtInfo: s
 		};
-		return this.config.onReply(o, t);
+		return e().debug?.(`${i} sending message to cloud, msgType: ${c.msgType}, targetDeviceId: ${c.targetDeviceId}, data: ${JSON.stringify(c).slice(0, 3e3)}`), this.config.onReply(c, n);
 	}
 	validateContext(e) {
 		return e?.header?.name ? {
@@ -367,13 +367,14 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 		return !e || t !== "DeviceToolSet" && t !== "UniversalToolSet";
 	}
 	async updateDeviceToolSetContext(e, t, r) {
-		return r?.header.namespace === "yoyoclaw" ? {
-			ok: !0,
-			data: await n(t),
-			noReply: !0
-		} : {
-			ok: !1,
-			error: `Unsupported DeviceToolSet namespace: ${r?.header.namespace ?? "unknown"}`
+		let i = await n({
+			namespace: r?.header.namespace,
+			payload: t
+		});
+		return {
+			ok: i.ok,
+			error: i.error,
+			responsePayload: i.payload
 		};
 	}
 };

package/dist/modules/device-toolset/ack.mjs

@@ -0,0 +1,54 @@
+import { processDeviceToolSet as e } from "./processor.mjs";
+//#region src/modules/device-toolset/ack.ts
+var t = "200", n = "500", r = "DeviceToolSet payload missing nodeId";
+async function i(t) {
+	let n = a(t.payload);
+	if (t.namespace !== "yoyoclaw") {
+		let e = `Unsupported DeviceToolSet namespace: ${t.namespace ?? "unknown"}`;
+		return {
+			ok: !1,
+			error: e,
+			payload: s(n, e)
+		};
+	}
+	if (!n) return {
+		ok: !1,
+		error: r,
+		payload: s("", r)
+	};
+	try {
+		return {
+			ok: !0,
+			payload: o(await e(t.payload))
+		};
+	} catch (e) {
+		let t = e instanceof Error ? e.message : String(e);
+		return {
+			ok: !1,
+			error: t,
+			payload: s(n, t)
+		};
+	}
+}
+function a(e) {
+	let t = e?.nodeId;
+	return typeof t == "string" && t.trim() ? t : "";
+}
+function o(e) {
+	return {
+		nodeId: e.nodeId,
+		errorCode: t,
+		changed: e.changed,
+		rawCount: e.rawCount,
+		validCount: e.validCount
+	};
+}
+function s(e, t) {
+	return {
+		nodeId: e,
+		errorCode: n,
+		errorMessage: t
+	};
+}
+//#endregion
+export { i as createDeviceToolSetUpdateAck };

package/dist/modules/device-toolset/archive.mjs

@@ -3,25 +3,20 @@ import { INVALID_TOOL_FILENAME_CHAR_PATTERN as t, TOOL_ARCHIVE_DIR as n } from "
 import r from "node:path";
 //#region src/modules/device-toolset/archive.ts
 async function i(t, i) {
-	let s = 0, c = 0;
+	let s = 0;
 	for (let a of i) {
 		let i = o(a.name);
-		if (!i) {
-			c += 1;
-			continue;
-		}
-		await e({
+		i && (await e({
 			rootDir: t,
 			relativePath: r.join(n, i),
 			data: JSON.stringify(a, null, 2),
 			encoding: "utf8",
 			mkdir: !0
-		}), s += 1;
+		}), s += 1);
 	}
 	return {
 		archiveDir: a(t),
-		writtenCount: s,
-		skippedCount: c
+		writtenCount: s
 	};
 }
 function a(e) {

package/dist/modules/device-toolset/index.mjs

@@ -1,2 +1,3 @@
 import "./normalize.mjs";
 import "./processor.mjs";
+import "./ack.mjs";

package/dist/modules/device-toolset/normalize.mjs

@@ -10,15 +10,14 @@ function t(t) {
 	return t;
 }
 function n(e) {
-	let t = e.nodeId, n = /* @__PURE__ */ new Map(), i = 0;
+	let t = e.nodeId, n = /* @__PURE__ */ new Map();
 	for (let t of e.toolSet) {
 		let e = r(t);
-		e ? n.set(e.name, e) : i += 1;
+		e && n.set(e.name, e);
 	}
 	return {
 		nodeId: t,
-		tools: Array.from(n.values()),
-		skippedCount: i
+		tools: Array.from(n.values())
 	};
 }
 function r(t) {

package/dist/modules/device-toolset/persist.mjs

@@ -36,8 +36,6 @@ async function s(e, t, r) {
 		mkdir: !0
 	}), {
 		changed: !0,
-		nodeCount: d(a.tools),
-		toolCount: Object.keys(a.tools).length,
 		cache: a
 	};
 }
@@ -72,10 +70,5 @@ function l(e, t) {
 function u(e, t) {
 	return [...new Set([...e, t])];
 }
-function d(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
 export { o as loadDeviceToolSetCache, s as mergeDeviceToolSetCache };

package/dist/modules/device-toolset/processor.mjs

@@ -14,29 +14,29 @@ async function g(n) {
 	let g = p(n), _ = t();
 	if (!_) throw Error("Unable to resolve home directory for DeviceToolSet persistence");
 	let v = m(g);
-	e().info(`[yoyoclaw-device-toolset] process start, nodeId: ${v.nodeId}, tools: ${v.tools.length}, skipped: ${v.skippedCount}`);
+	e().info(`[yoyoclaw-device-toolset] process start, nodeId: ${v.nodeId}, raw: ${g.toolSet.length}, valid: ${v.tools.length}`);
 	let y = u(v.tools);
 	if (e().debug?.(`[yoyoclaw-device-toolset] computed md5, nodeId: ${v.nodeId}, md5: ${y}`), !(await d(_, v.nodeId, y)).changed) {
 		let t = await l(_, h);
 		return e().info(`[yoyoclaw-device-toolset] unchanged, skip refresh, nodeId: ${v.nodeId}, artifactsRestored: ${t.restored}`), {
 			changed: !1,
 			nodeId: v.nodeId,
-			skippedCount: v.skippedCount
+			rawCount: g.toolSet.length,
+			validCount: v.tools.length
 		};
 	}
 	let b = await s(_, v.nodeId, v.tools);
-	e().info(`[yoyoclaw-device-toolset] cache merged, nodeId: ${v.nodeId}, supportedNodes: ${b.nodeCount}, tools: ${b.toolCount}`);
+	e().info(`[yoyoclaw-device-toolset] cache merged, nodeId: ${v.nodeId}, processed: ${v.tools.length}`);
 	let x = b.cache.tools, S = await i(_, v.tools);
-	e().info(`[yoyoclaw-device-toolset] archive refreshed, nodeId: ${v.nodeId}, written: ${S.writtenCount}, skipped: ${S.skippedCount}`);
+	e().info(`[yoyoclaw-device-toolset] archive refreshed, nodeId: ${v.nodeId}, written: ${S.writtenCount}`);
 	let C = await c(h, x);
 	e().info(`[yoyoclaw-device-toolset] skill refreshed, nodeId: ${v.nodeId}, rows: ${C.rowCount}, updated: ${C.updated}`), C.updated && await r(h, v.nodeId);
 	let w = await a(S.archiveDir, o(h));
 	return e().info(`[yoyoclaw-device-toolset] mapping ready, nodeId: ${v.nodeId}, mode: ${w.mode}`), await f(_, v.nodeId, y, Date.now()), e().info(`[yoyoclaw-device-toolset] process complete, nodeId: ${v.nodeId}`), {
 		changed: !0,
 		nodeId: v.nodeId,
-		nodeCount: b.nodeCount,
-		toolCount: b.toolCount,
-		skippedCount: v.skippedCount
+		rawCount: g.toolSet.length,
+		validCount: v.tools.length
 	};
 }
 //#endregion

package/dist/utils/version.mjs

@@ -1,7 +1,7 @@
 //#region src/utils/version.ts
 var e = null, t = null;
 function n() {
-	return e === null && (e = "1.4.1-alpha.1".includes("beta") || "1.4.1-alpha.1".includes("alpha")), !!e;
+	return e === null && (e = "1.4.1-alpha.2".includes("beta") || "1.4.1-alpha.2".includes("alpha")), !!e;
 }
 function r(e) {
 	if (!e) return 0;
@@ -10,7 +10,7 @@ function r(e) {
 }
 function i() {
 	if (t !== null) return t;
-	let [e, n, i] = "1.4.1-alpha.1".split("-", 1)[0].split("."), a = r(e), o = r(n), s = r(i);
+	let [e, n, i] = "1.4.1-alpha.2".split("-", 1)[0].split("."), a = r(e), o = r(n), s = r(i);
 	return t = a * 1e6 + o * 1e3 + s, t;
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.4.1-alpha.1",
+  "version": "1.4.1-alpha.2",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",