@honor-claw/yoyo 1.4.2-alpha.1 → 1.5.1-beta.1

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

@@ -97,7 +97,7 @@ var r = { style: "SOUL.md" }, i = "[yoyoclaw-channel]", a = class {
 			return;
 		}
 		let r = this.sessionManager.getHardwareDeviceId(n);
-		if (!r) {
+		if (e().info(`${i} received user message, session: ${n}, hardware device: ${r}`), !r) {
 			e().warn(`${i} user message missing hardwareDeviceId, session: ${n}`);
 			return;
 		}

package/dist/honor-auth/callback-server.mjs

@@ -1,7 +1,7 @@
 import e from "./assets/favicon.mjs";
 import { ASSET_URLS as t, getResultHtml as n } from "./auth-result-html.mjs";
-import { createServer as r } from "http";
-import { URL as i } from "node:url";
+import { URL as r } from "node:url";
+import { createServer as i } from "http";
 //#region src/honor-auth/callback-server.ts
 var a = { "favicon.png": e };
 function o(e, t) {
@@ -26,11 +26,11 @@ function s(e) {
 			setTimeout(() => {
 				g();
 			}, e);
-		}, y = r((e, r) => {
+		}, y = i((e, i) => {
 			try {
-				let a = new i(e.url || "", `http://localhost:${c}`);
+				let a = new r(e.url || "", `http://localhost:${c}`);
 				if (e.method !== "GET") {
-					r.writeHead(405, { "Content-Type": "text/html; charset=utf-8" }), r.end(n({
+					i.writeHead(405, { "Content-Type": "text/html; charset=utf-8" }), i.end(n({
 						pageTitle: "请求方式不支持",
 						statusClass: "error",
 						title: "不支持的请求方式",
@@ -39,16 +39,16 @@ function s(e) {
 					return;
 				}
 				if (a.pathname === "/favicon.ico" || a.pathname === t.favicon) {
-					o(r, "favicon.png");
+					o(i, "favicon.png");
 					return;
 				}
 				let s = a.searchParams.get("code") || "", l = a.searchParams.get("error") || "", d = a.searchParams.get("error_description") || a.searchParams.get("error_message") || "";
-				s && !m ? (m = !0, r.writeHead(200, { "Content-Type": "text/html; charset=utf-8" }), r.end(n({
+				s && !m ? (m = !0, i.writeHead(200, { "Content-Type": "text/html; charset=utf-8" }), i.end(n({
 					pageTitle: "授权成功",
 					statusClass: "success",
 					title: "登录已完成",
 					hintText: "请返回 OpenClaw，登录流程会继续完成。"
-				})), v(), u(s)) : l && !m ? (r.writeHead(400, { "Content-Type": "text/html; charset=utf-8" }), r.end(n({
+				})), v(), u(s)) : l && !m ? (i.writeHead(400, { "Content-Type": "text/html; charset=utf-8" }), i.end(n({
 					pageTitle: "授权失败",
 					statusClass: "error",
 					title: "未能完成授权",
@@ -62,12 +62,12 @@ function s(e) {
 					}] : []]
 				})), setTimeout(() => {
 					_(/* @__PURE__ */ Error(d ? `authorization failed: ${l} (${d})` : `authorization failed: ${l}`));
-				}, 120)) : m ? (r.writeHead(200, { "Content-Type": "text/html; charset=utf-8" }), r.end(n({
+				}, 120)) : m ? (i.writeHead(200, { "Content-Type": "text/html; charset=utf-8" }), i.end(n({
 					pageTitle: "登录已完成",
 					statusClass: "success",
 					title: "授权已经处理完成",
 					hintText: "请返回 OpenClaw，登录流程会继续完成。"
-				}))) : (r.writeHead(400, { "Content-Type": "text/html; charset=utf-8" }), r.end(n({
+				}))) : (i.writeHead(400, { "Content-Type": "text/html; charset=utf-8" }), i.end(n({
 					pageTitle: "授权失败",
 					statusClass: "error",
 					title: "回调参数不完整",
@@ -76,7 +76,7 @@ function s(e) {
 					_(/* @__PURE__ */ Error("authorization failed: no code in callback"));
 				}, 120));
 			} catch (e) {
-				console.error("authorize callback error:", e), r.writeHead(500, { "Content-Type": "text/html; charset=utf-8" }), r.end(n({
+				console.error("authorize callback error:", e), i.writeHead(500, { "Content-Type": "text/html; charset=utf-8" }), i.end(n({
 					pageTitle: "服务异常",
 					statusClass: "error",
 					title: "回调服务出现异常",

package/dist/hooks/index.mjs

@@ -22,12 +22,15 @@ function c(e) {
 }
 function l(e) {
 	e.on("after_tool_call", async (t) => {
-		if (!(t.toolName !== "read" || t.error || !n(t.params.path))) try {
+		if (!(t.toolName !== "read" || t.error || !u(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);
+}
 //#endregion
 export { s as registerHooks };

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

@@ -5,8 +5,9 @@ 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";
 //#region src/modules/configs/config-manager.ts
-var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__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".split(","), f = class {
+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".split(","), p = class {
 	loadConfig() {
 		try {
 			return t().config.loadConfig();
@@ -44,7 +45,7 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 	}
 	getUserConfig() {
 		try {
-			return this.loadConfig().plugins?.entries?.[c]?.config?.user;
+			return this.loadConfig().plugins?.entries?.[d]?.config?.user;
 		} catch (e) {
 			console.error(`[claw-configs] Failed to read user config: ${e}`);
 			return;
@@ -52,7 +53,7 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 	}
 	getEnvInfo() {
 		try {
-			let e = this.loadConfig().plugins?.entries?.[c]?.config, t = e?.envInfo;
+			let e = this.loadConfig().plugins?.entries?.[d]?.config, t = e?.envInfo;
 			if (t?.env) return t;
 			let n = e?.env;
 			if (n) return {
@@ -76,7 +77,7 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 	}
 	getGrayTag() {
 		try {
-			return this.loadConfig().plugins?.entries?.[c]?.config?.gray;
+			return this.loadConfig().plugins?.entries?.[d]?.config?.gray;
 		} catch (e) {
 			console.error(`[claw-configs] Failed to read gray tag config: ${e}`);
 			return;
@@ -84,7 +85,7 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 	}
 	getDeviceConfig() {
 		try {
-			return this.loadConfig().plugins?.entries?.[c]?.config?.device;
+			return this.loadConfig().plugins?.entries?.[d]?.config?.device;
 		} catch (e) {
 			console.error(`[claw-configs] Failed to read device config: ${e}`);
 			return;
@@ -92,17 +93,17 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 	}
 	async updateDeviceConfig(e) {
 		try {
-			let t = this.loadConfig(), n = t.plugins?.entries?.[c]?.config?.device || {}, r = {
+			let t = this.loadConfig(), n = t.plugins?.entries?.[d]?.config?.device || {}, r = {
 				...t,
 				plugins: {
 					...t.plugins,
 					entries: {
 						...t.plugins?.entries,
-						[c]: {
-							...t.plugins?.entries?.[c],
+						[d]: {
+							...t.plugins?.entries?.[d],
 							enabled: !0,
 							config: {
-								...t.plugins?.entries?.[c]?.config,
+								...t.plugins?.entries?.[d]?.config,
 								device: {
 									...n,
 									...e
@@ -125,11 +126,11 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 					...t.plugins,
 					entries: {
 						...t.plugins?.entries,
-						[c]: {
-							...t.plugins?.entries?.[c],
+						[d]: {
+							...t.plugins?.entries?.[d],
 							enabled: !0,
 							config: {
-								...t.plugins?.entries?.[c]?.config,
+								...t.plugins?.entries?.[d]?.config,
 								envInfo: {
 									env: e,
 									source: "manual"
@@ -147,7 +148,7 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 	}
 	async resetEnv() {
 		try {
-			let e = this.loadConfig(), t = e.plugins?.entries?.[c]?.config?.envInfo;
+			let e = this.loadConfig(), t = e.plugins?.entries?.[d]?.config?.envInfo;
 			if (!t?.env) return;
 			let n = {
 				...e,
@@ -155,11 +156,11 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 					...e.plugins,
 					entries: {
 						...e.plugins?.entries,
-						[c]: {
-							...e.plugins?.entries?.[c],
+						[d]: {
+							...e.plugins?.entries?.[d],
 							enabled: !0,
 							config: {
-								...e.plugins?.entries?.[c]?.config,
+								...e.plugins?.entries?.[d]?.config,
 								envInfo: {
 									env: t.env,
 									source: "env"
@@ -182,11 +183,11 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 					...t.plugins,
 					entries: {
 						...t.plugins?.entries,
-						[c]: {
-							...t.plugins?.entries?.[c],
+						[d]: {
+							...t.plugins?.entries?.[d],
 							enabled: !0,
 							config: {
-								...t.plugins?.entries?.[c]?.config,
+								...t.plugins?.entries?.[d]?.config,
 								...e && { gray: e }
 							}
 						}
@@ -206,11 +207,11 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 					...t.plugins,
 					entries: {
 						...t.plugins?.entries,
-						[c]: {
-							...t.plugins?.entries?.[c],
+						[d]: {
+							...t.plugins?.entries?.[d],
 							enabled: !0,
 							config: {
-								...t.plugins?.entries?.[c]?.config,
+								...t.plugins?.entries?.[d]?.config,
 								user: e
 							}
 						}
@@ -230,10 +231,10 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 					...e.plugins,
 					entries: {
 						...e.plugins?.entries,
-						[c]: {
-							...e.plugins?.entries?.[c],
+						[d]: {
+							...e.plugins?.entries?.[d],
 							config: {
-								...e.plugins?.entries?.[c]?.config,
+								...e.plugins?.entries?.[d]?.config,
 								user: void 0
 							}
 						}
@@ -247,30 +248,26 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 	}
 	async initializePluginConfig(t) {
 		try {
-			let i = this.loadConfig(), c = i.plugins?.allow || [], f = !c.includes(t), p = c.includes(t) ? c : [...c, t], m = i.gateway?.nodes?.allowCommands || [], h = Array.from(new Set([...m, ...d])), g = !n(m, h), _ = i.skills || {}, v = _.load || {}, y = v.watch !== l.watch || v.watchDebounceMs === void 0, b = y ? {
-				...v,
-				...l,
-				watchDebounceMs: v.watchDebounceMs ?? u
-			} : v, x = i.plugins?.entries?.[t]?.config?.envInfo, S = i.plugins?.entries?.[t]?.config?.env, C = !!(x?.env || S), w = r(), T = !!x?.env && x.source === "env", E = !x?.env && !!S || T && w && x.env !== w, D = !C || E, O = {
-				env: w || S || (e() ? "test" : "production"),
+			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"),
 				source: "env"
-			}, k = i.plugins?.entries?.[t]?.config || {}, A = D ? {
-				...k,
-				envInfo: O,
+			}, j = i.plugins?.entries?.[t]?.config || {}, M = k ? {
+				...j,
+				envInfo: A,
 				env: void 0
-			} : k, j = i.plugins?.entries?.[t]?.enabled !== !0, M = o(i), N = Object.keys(M).length > 0;
-			if (N && a().info(`[claw-configs] Found ${Object.keys(M).length} providers to rename: ${Object.entries(M).map(([e, t]) => `${e} -> ${t}`).join(", ")}`), !f && !g && !y && !D && !j && !N) return;
-			let P = {
+			} : 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;
+			let I = {
 				...i,
 				plugins: {
 					...i.plugins,
-					allow: p,
+					allow: v,
 					entries: {
 						...i.plugins?.entries,
 						[t]: {
 							...i.plugins?.entries?.[t],
 							enabled: !0,
-							config: A
+							config: M
 						}
 					}
 				},
@@ -278,22 +275,27 @@ var c = "yoyo", l = { watch: !0 }, u = 250, d = /* @__PURE__ */ "alarm.create,al
 					...i.gateway,
 					nodes: {
 						...i.gateway?.nodes,
-						allowCommands: h
+						allowCommands: b
 					}
-				},
-				skills: {
-					..._,
-					load: b
 				}
 			};
-			N && (P = s(P, M), a().info("[claw-configs] Provider renaming completed")), await this.saveConfig(P);
+			S && (I = {
+				...I,
+				skills: {
+					...d,
+					load: {
+						...p,
+						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);
 		} catch (e) {
 			throw i(e, "failed to initialize plugin config");
 		}
 	}
-}, p = null;
-function m() {
-	return p ||= new f(), p;
+}, m = null;
+function h() {
+	return m ||= new p(), m;
 }
 //#endregion
-export { f as ConfigManager, m as getConfigManager };
+export { p as ConfigManager, h as getConfigManager };

package/dist/modules/configs/index.mjs

@@ -1,2 +1,3 @@
+import "./state-flags.mjs";
 import "./config-manager.mjs";
 import "./identity-persist.mjs";

package/dist/modules/configs/state-flags.mjs

@@ -0,0 +1,66 @@
+import { useClawLogger as e } from "../../utils/logger.mjs";
+import { SafeFsError as t, 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/state-flags.ts
+var o = { DISABLE_SKILLS_LOAD_WATCH_MIGRATION_DONE: "disableSkillsLoadWatchMigrationDone" }, s = ".openclaw", c = "yoyo", l = "state.json", u = 64 * 1024;
+function d() {
+	return a.join(s, c, l);
+}
+async function f(r) {
+	try {
+		let e = await n({
+			rootDir: r,
+			relativePath: d(),
+			maxBytes: u
+		});
+		return v(JSON.parse(e.buffer.toString("utf8")));
+	} catch (n) {
+		return n instanceof t && n.code === "not-found" || e().warn(`[yoyo-state] failed to read state: ${String(n)}`), null;
+	}
+}
+async function p() {
+	let t = i();
+	return t ? f(t) : (e().warn("[yoyo-state] failed to find home dir"), null);
+}
+async function m(t) {
+	let n = i();
+	if (!n) return e().warn("[yoyo-state] failed to find home dir"), null;
+	let a = {
+		...await f(n) ?? _(),
+		version: 1
+	};
+	return t.flags && (a.flags = {
+		...a.flags,
+		...y(t.flags)
+	}), await r({
+		rootDir: n,
+		relativePath: d(),
+		data: JSON.stringify(a, null, 2),
+		encoding: "utf8",
+		mkdir: !0
+	}), a;
+}
+async function h(e) {
+	return (await p())?.flags?.[e] === !0;
+}
+async function g(e) {
+	return m({ flags: { [e]: !0 } });
+}
+function _() {
+	return { version: 1 };
+}
+function v(e) {
+	return !e || typeof e != "object" || Array.isArray(e) ? _() : {
+		..._(),
+		flags: y(e.flags)
+	};
+}
+function y(e) {
+	if (!e || typeof e != "object" || Array.isArray(e)) return;
+	let t = {};
+	for (let [n, r] of Object.entries(e)) typeof r == "boolean" && (t[n] = r);
+	return Object.keys(t).length > 0 ? t : void 0;
+}
+//#endregion
+export { o as STATE_FLAG, p as getPersistedPluginState, h as hasPersistedStateFlag, g as markPersistedStateFlag, m as updatePersistedPluginState };

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

@@ -1,34 +1,45 @@
-import { safeWriteFile as e } from "../../utils/fs-safe.mjs";
-import { INVALID_TOOL_FILENAME_CHAR_PATTERN as t, TOOL_ARCHIVE_DIR as n } from "./consts.mjs";
-import r from "node:path";
+import { hasNodeErrorCode as e } from "../../utils/error.mjs";
+import { safeWriteFile as t } from "../../utils/fs-safe.mjs";
+import { INVALID_TOOL_FILENAME_CHAR_PATTERN as n, TOOL_ARCHIVE_DIR as r } from "./consts.mjs";
+import i from "node:path";
+import a from "node:fs/promises";
 //#region src/modules/device-toolset/archive.ts
-async function i(t, i) {
-	let s = 0;
-	for (let a of i) {
-		let i = o(a.name);
-		i && (await e({
-			rootDir: t,
-			relativePath: r.join(n, i),
-			data: JSON.stringify(a, null, 2),
+async function o(e, n) {
+	let a = 0, o = await c(e);
+	for (let o of n) {
+		let n = l(o.name);
+		n && (await t({
+			rootDir: e,
+			relativePath: i.join(r, n),
+			data: JSON.stringify(o, null, 2),
 			encoding: "utf8",
 			mkdir: !0
-		}), s += 1);
+		}), a += 1);
 	}
 	return {
-		archiveDir: a(t),
-		writtenCount: s
+		archiveDir: s(e),
+		writtenCount: a,
+		createdArchiveDir: !o && a > 0
 	};
 }
-function a(e) {
-	return r.join(e, n);
+function s(e) {
+	return i.join(e, r);
+}
+async function c(t) {
+	try {
+		return (await a.stat(s(t))).isDirectory();
+	} catch (t) {
+		if (e(t, "ENOENT", "ENOTDIR")) return !1;
+		throw t;
+	}
 }
-function o(e) {
-	let n = e.trim();
-	if (!(!n || t.test(n) || s(n))) return `${n}.json`;
+function l(e) {
+	let t = e.trim();
+	if (!(!t || n.test(t) || u(t))) return `${t}.json`;
 }
-function s(e) {
+function u(e) {
 	for (let t of e) if (t.codePointAt(0) < 32) return !0;
 	return !1;
 }
 //#endregion
-export { i as refreshToolArchive, a as resolveToolArchiveDir };
+export { o as refreshToolArchive, s as resolveToolArchiveDir };

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

@@ -1,43 +1,43 @@
 import { useClawLogger as e } from "../../utils/logger.mjs";
 import { resolveEffectiveHomeDir as t, resolveExtensionRoot as n } from "../../utils/home-dir.mjs";
-import { clearYoyoControlSkillReadMarker as r } from "./skill-refresh-marker.mjs";
-import { refreshToolArchive as i } from "./archive.mjs";
-import { ensureMcpToolsMapping as a, resolveMcpToolsTargetDir as o } from "./link.mjs";
-import { mergeDeviceToolSetCache as s } from "./persist.mjs";
-import { refreshYoyoControlSkill as c } from "./skill-inject.mjs";
-import { ensureDeviceToolSetArtifacts as l } from "./artifacts.mjs";
-import { computeDeviceToolSetMd5 as u, getDeviceToolSetChangeState as d, writeToolSetMd5Entry as f } from "./md5-index.mjs";
-import { assertDeviceToolSetPayload as p, normalizeDeviceToolSet as m } from "./normalize.mjs";
+import { clearYoyoControlSkillReadMarker as r, markYoyoControlSkillRead as i } from "./skill-refresh-marker.mjs";
+import { refreshToolArchive as a } from "./archive.mjs";
+import { ensureMcpToolsMapping as o, resolveMcpToolsTargetDir as s } from "./link.mjs";
+import { mergeDeviceToolSetCache as c } from "./persist.mjs";
+import { refreshYoyoControlSkill as l } from "./skill-inject.mjs";
+import { ensureDeviceToolSetArtifacts as u } from "./artifacts.mjs";
+import { computeDeviceToolSetMd5 as d, getDeviceToolSetChangeState as f, writeToolSetMd5Entry as p } from "./md5-index.mjs";
+import { assertDeviceToolSetPayload as m, normalizeDeviceToolSet as h } from "./normalize.mjs";
 //#region src/modules/device-toolset/processor.ts
-var h = n();
-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}, 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}`), {
+var g = n();
+async function _(n) {
+	let _ = m(n), v = t();
+	if (!v) throw Error("Unable to resolve home directory for DeviceToolSet persistence");
+	let y = h(_);
+	e().info(`[yoyoclaw-device-toolset] process start, nodeId: ${y.nodeId}, raw: ${_.toolSet.length}, valid: ${y.tools.length}`);
+	let b = d(y.tools);
+	if (e().debug?.(`[yoyoclaw-device-toolset] computed md5, nodeId: ${y.nodeId}, md5: ${b}`), !(await f(v, y.nodeId, b)).changed) {
+		let t = await u(v, g);
+		return e().info(`[yoyoclaw-device-toolset] unchanged, skip refresh, nodeId: ${y.nodeId}, artifactsRestored: ${t.restored}`), {
 			changed: !1,
-			nodeId: v.nodeId,
-			rawCount: g.toolSet.length,
-			validCount: v.tools.length
+			nodeId: y.nodeId,
+			rawCount: _.toolSet.length,
+			validCount: y.tools.length
 		};
 	}
-	let b = await s(_, v.nodeId, v.tools);
-	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}`);
-	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}`), {
+	let x = await c(v, y.nodeId, y.tools);
+	e().info(`[yoyoclaw-device-toolset] cache merged, nodeId: ${y.nodeId}, processed: ${y.tools.length}`);
+	let S = x.cache.tools, C = await a(v, y.tools);
+	e().info(`[yoyoclaw-device-toolset] archive refreshed, nodeId: ${y.nodeId}, written: ${C.writtenCount}, createdArchiveDir: ${C.createdArchiveDir}`);
+	let w = await l(g, S);
+	e().info(`[yoyoclaw-device-toolset] skill refreshed, nodeId: ${y.nodeId}, rows: ${w.rowCount}, updated: ${w.updated}`), C.createdArchiveDir ? await i(g, "clean_install") : w.updated && await r(g, y.nodeId);
+	let T = await o(C.archiveDir, s(g));
+	return e().info(`[yoyoclaw-device-toolset] mapping ready, nodeId: ${y.nodeId}, mode: ${T.mode}`), await p(v, y.nodeId, b, Date.now()), e().info(`[yoyoclaw-device-toolset] process complete, nodeId: ${y.nodeId}`), {
 		changed: !0,
-		nodeId: v.nodeId,
-		rawCount: g.toolSet.length,
-		validCount: v.tools.length
+		nodeId: y.nodeId,
+		rawCount: _.toolSet.length,
+		validCount: y.tools.length
 	};
 }
 //#endregion
-export { g as processDeviceToolSet };
+export { _ as processDeviceToolSet };

package/dist/modules/device-toolset/skill-inject.mjs

@@ -1,38 +1,39 @@
-import { MCP_TOOLS_END_MARKER as e, MCP_TOOLS_PLACEHOLDER as t, MCP_TOOLS_START_MARKER as n, YOYO_CONTROL_SKILL_RELATIVE_PATH as r, YOYO_CONTROL_SUB_SKILLS_RELATIVE_PATH as i } from "./consts.mjs";
-import a from "node:path";
-import o from "node:fs/promises";
+import { hasNodeErrorCode as e } from "../../utils/error.mjs";
+import { MCP_TOOLS_END_MARKER as t, MCP_TOOLS_PLACEHOLDER as n, MCP_TOOLS_START_MARKER as r, YOYO_CONTROL_SKILL_RELATIVE_PATH as i, YOYO_CONTROL_SUB_SKILLS_RELATIVE_PATH as a } from "./consts.mjs";
+import o from "node:path";
+import s from "node:fs/promises";
 //#region src/modules/device-toolset/skill-inject.ts
-async function s(e, t) {
-	let n = a.join(e, r), i = await o.readFile(n, "utf8"), s = l(t, await c(e)), p = f(i, u(s));
-	return p !== i && await o.writeFile(n, p, "utf8"), {
+async function c(e, t) {
+	let n = o.join(e, i), r = await s.readFile(n, "utf8"), a = u(t, await l(e)), c = p(r, d(a));
+	return c !== r && await s.writeFile(n, c, "utf8"), {
 		skillPath: n,
-		rowCount: d(s).length,
-		updated: p !== i
+		rowCount: f(a).length,
+		updated: c !== r
 	};
 }
-async function c(e) {
-	let t = a.join(e, i), n;
+async function l(t) {
+	let n = o.join(t, a), r;
 	try {
-		n = await o.readFile(t, "utf8");
-	} catch (e) {
-		if (h(e) && e.code === "ENOENT") return /* @__PURE__ */ new Set();
-		throw e;
+		r = await s.readFile(n, "utf8");
+	} catch (t) {
+		if (e(t, "ENOENT")) return /* @__PURE__ */ new Set();
+		throw t;
 	}
-	let r = JSON.parse(n);
-	if (!Array.isArray(r) || r.some((e) => typeof e != "string")) throw Error("sub-skills config must be a JSON array of tool names");
-	return new Set(r.map((e) => e.trim()).filter(Boolean));
+	let i = JSON.parse(r);
+	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 l(e, t) {
+function u(e, t) {
 	return t.size === 0 ? e : Object.fromEntries(Object.entries(e).filter(([e, n]) => !t.has(e) && !t.has(n.name)));
 }
-function u(t) {
+function d(e) {
 	return [
-		n,
-		...d(t).map((e) => `| ${p(e.name)} | ${p(e.description)} | ${p(e.nodeId)} |`),
-		e
+		r,
+		...f(e).map((e) => `| ${m(e.name)} | ${m(e.description)} | ${m(e.nodeId)} |`),
+		t
 	].join("\n");
 }
-function d(e) {
+function f(e) {
 	return Object.values(e).flatMap((e) => e.supportedNodeIds.map((t) => ({
 		name: e.name,
 		description: e.description,
@@ -42,20 +43,17 @@ function d(e) {
 		return n === 0 ? e.nodeId.localeCompare(t.nodeId) : n;
 	});
 }
-function f(r, i) {
-	let a = RegExp(`${m(n)}[\\s\\S]*?${m(e)}`);
-	if (a.test(r)) return r.replace(a, i);
-	if (r.includes("{{full-mcp-tool-list}}")) return r.replace(t, i);
+function p(e, i) {
+	let a = RegExp(`${h(r)}[\\s\\S]*?${h(t)}`);
+	if (a.test(e)) return e.replace(a, i);
+	if (e.includes("{{full-mcp-tool-list}}")) return e.replace(n, i);
 	throw Error("Unable to find MCP tools placeholder or generated block in yoyo-control skill");
 }
-function p(e) {
-	return e.replaceAll("|", "\\|").replace(/\r?\n/g, " ");
-}
 function m(e) {
-	return e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return e.replaceAll("|", "\\|").replace(/\r?\n/g, " ");
 }
 function h(e) {
-	return e instanceof Error && "code" in e;
+	return e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 //#endregion
-export { s as refreshYoyoControlSkill };
+export { c as refreshYoyoControlSkill };