@honor-claw/yoyo 1.4.0-beta.7 → 1.4.0-beta.9

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

@@ -1,39 +1,50 @@
-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, c = 0;
-	for (let a of i) {
-		let i = o(a.name);
-		if (!i) {
-			c += 1;
+async function o(e, n) {
+	let a = 0, o = 0, u = await c(e);
+	for (let s of n) {
+		let n = l(s.name);
+		if (!n) {
+			o += 1;
 			continue;
 		}
-		await e({
-			rootDir: t,
-			relativePath: r.join(n, i),
-			data: JSON.stringify(a, null, 2),
+		await t({
+			rootDir: e,
+			relativePath: i.join(r, n),
+			data: JSON.stringify(s, null, 2),
 			encoding: "utf8",
 			mkdir: !0
-		}), s += 1;
+		}), a += 1;
 	}
 	return {
-		archiveDir: a(t),
-		writtenCount: s,
-		skippedCount: c
+		archiveDir: s(e),
+		writtenCount: a,
+		skippedCount: o,
+		createdArchiveDir: !u && 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}, tools: ${v.tools.length}, skipped: ${v.skippedCount}`);
-	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}, tools: ${y.tools.length}, skipped: ${y.skippedCount}`);
+	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,
-			skippedCount: v.skippedCount
+			nodeId: y.nodeId,
+			skippedCount: y.skippedCount
 		};
 	}
-	let b = await s(_, v.nodeId, v.tools);
-	e().info(`[yoyoclaw-device-toolset] cache merged, nodeId: ${v.nodeId}, supportedNodes: ${b.nodeCount}, tools: ${b.toolCount}`);
-	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}`);
-	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}, supportedNodes: ${x.nodeCount}, tools: ${x.toolCount}`);
+	let S = x.cache.tools, C = await a(v, y.tools);
+	e().info(`[yoyoclaw-device-toolset] archive refreshed, nodeId: ${y.nodeId}, written: ${C.writtenCount}, skipped: ${C.skippedCount}, 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,
-		nodeCount: b.nodeCount,
-		toolCount: b.toolCount,
-		skippedCount: v.skippedCount
+		nodeId: y.nodeId,
+		nodeCount: x.nodeCount,
+		toolCount: x.toolCount,
+		skippedCount: y.skippedCount
 	};
 }
 //#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 };

package/dist/modules/device-toolset/skill-refresh-marker.mjs

@@ -1,44 +1,42 @@
-import { useClawLogger as e } from "../../utils/logger.mjs";
-import { YOYO_CONTROL_SKILL_READ_MARKER_RELATIVE_PATH as t } from "./consts.mjs";
-import n from "node:path";
-import r from "node:fs/promises";
+import { hasNodeErrorCode as e } from "../../utils/error.mjs";
+import { useClawLogger as t } from "../../utils/logger.mjs";
+import { YOYO_CONTROL_SKILL_READ_MARKER_RELATIVE_PATH as n } from "./consts.mjs";
+import r from "node:path";
+import i from "node:fs/promises";
 //#region src/modules/device-toolset/skill-refresh-marker.ts
-var i = /(?:^|[\\/])skills[\\/]yoyo-control[\\/]SKILL\.md$/i, a, o = "## Mandatory yoyo_phone_control skill refresh\n\nThis is a one-shot instruction for the same user message that contains this notice.\n\nThe yoyo_phone_control skill changed after your cached context was built. If that same user message involves or may involve phone control:\n\n1. Your next tool call MUST read exactly skills/yoyo-control/SKILL.md.\n2. Until that read succeeds, DO NOT read skills/yoyo-control/references/*, read skills/yoyo-control/mcptools/*, run openclaw commands, or invoke any phone-control action.\n3. Ignore all previously cached yoyo_phone_control instructions, tool tables, reference paths, command formats, and parameter schemas. They are stale even if they look relevant.\n4. After reading SKILL.md, use only the freshly read workflow to decide which reference or tool definition file to read next.\n\nThis instruction expires as soon as you either successfully read skills/yoyo-control/SKILL.md or finish responding to that same user message. If you see this notice only in conversation history, and it is not included in the latest user message you are answering, ignore it and do not re-read SKILL.md because of this old notice.\n\nThinking or saying that you should re-read the skill is not enough while this one-shot instruction is active; the first phone-control tool call after the active notice must be the SKILL.md read.";
-function s(e) {
-	return typeof e == "string" && i.test(e);
+var a = /(?:^|[\\/])skills[\\/]yoyo-control[\\/]SKILL\.md$/i, o, s = "## Mandatory yoyo_phone_control skill refresh\n\nThis is a one-shot instruction for the same user message that contains this notice.\n\nThe yoyo_phone_control skill may have changed after your cached context was built. Your next tool call MUST read exactly skills/yoyo-control/SKILL.md, even if the current user message does not involve phone control.\n\n1. Until that read succeeds, DO NOT read skills/yoyo-control/references/*, read skills/yoyo-control/mcptools/*, run openclaw commands, or invoke any phone-control action.\n2. Ignore all previously cached yoyo_phone_control instructions, tool tables, reference paths, command formats, and parameter schemas. They are stale even if they look relevant.\n3. After reading SKILL.md, use only the freshly read workflow to decide whether any yoyo_phone_control follow-up is needed. If the user message is unrelated to phone control, continue answering normally without performing phone-control actions.\n\nThis instruction expires as soon as you either successfully read skills/yoyo-control/SKILL.md or finish responding to that same user message. If you see this notice only in conversation history, and it is not included in the latest user message you are answering, ignore it and do not re-read SKILL.md because of this old notice.\n\nThinking or saying that you should re-read the skill is not enough while this one-shot instruction is active; the first tool call after the active notice must be the SKILL.md read.";
+function c(e) {
+	return typeof e == "string" && a.test(e);
 }
-async function c(t) {
-	if (a !== void 0) return e().debug?.(`[yoyoclaw-skill-refresh] skill marker state resolved from memory, exists: ${a}`), !a;
-	try {
-		await r.access(d(t)), a = !0, e().debug?.("[yoyoclaw-skill-refresh] skill marker state resolved from file, exists: true");
-	} catch (t) {
-		if (p(t) && t.code === "ENOENT") a = !1, e().debug?.("[yoyoclaw-skill-refresh] skill marker state resolved from file, exists: false");
-		else throw t;
+async function l(n) {
+	if (o === !0) return t().debug?.(`[yoyoclaw-skill-refresh] skill marker state resolved from memory, exists: ${o}`), !1;
+	if (o === void 0) try {
+		return await i.access(f(n)), o = !0, t().debug?.("[yoyoclaw-skill-refresh] skill marker state resolved from file, exists: true"), !1;
+	} catch (n) {
+		if (e(n, "ENOENT")) o = !1, t().debug?.("[yoyoclaw-skill-refresh] skill marker state resolved from file, exists: false");
+		else throw n;
 	}
-	return !a;
+	return t().debug?.("[yoyoclaw-skill-refresh] skill marker missing; refresh prompt required"), !0;
 }
-async function l(e, t) {
-	let i = d(e), o = {
+async function u(e, t) {
+	let n = f(e), a = {
 		updateTime: Date.now(),
 		triggerReason: t
 	};
-	await r.mkdir(n.dirname(i), { recursive: !0 }), await r.writeFile(i, JSON.stringify(o, null, 2), "utf8"), a = !0;
+	await i.mkdir(r.dirname(n), { recursive: !0 }), await i.writeFile(n, JSON.stringify(a, null, 2), "utf8"), o = !0;
 }
-async function u(t, n) {
+async function d(e, n) {
 	try {
-		await r.rm(d(t), { force: !0 }), a = !1, e().info(`[yoyoclaw-skill-refresh] skill read marker cleared${f(n)}`);
-	} catch (t) {
-		e().warn(`[yoyoclaw-skill-refresh] failed to clear skill read marker${f(n)}, error: ${String(t)}`);
+		await i.rm(f(e), { force: !0 }), o = !1, t().info(`[yoyoclaw-skill-refresh] skill read marker cleared${p(n)}`);
+	} catch (e) {
+		t().warn(`[yoyoclaw-skill-refresh] failed to clear skill read marker${p(n)}, error: ${String(e)}`);
 	}
 }
-function d(e) {
-	return n.join(e, t);
-}
 function f(e) {
-	return e ? `, nodeId: ${e}` : "";
+	return r.join(e, n);
 }
 function p(e) {
-	return e instanceof Error && "code" in e;
+	return e ? `, nodeId: ${e}` : "";
 }
 //#endregion
-export { o as YOYO_CONTROL_SKILL_REFRESH_PROMPT, u as clearYoyoControlSkillReadMarker, s as isYoyoControlSkillReadPath, l as markYoyoControlSkillRead, c as shouldRefreshYoyoControlSkillPrompt };
+export { s as YOYO_CONTROL_SKILL_REFRESH_PROMPT, d as clearYoyoControlSkillReadMarker, c as isYoyoControlSkillReadPath, u as markYoyoControlSkillRead, l as shouldRefreshYoyoControlSkillPrompt };

package/dist/utils/error.mjs

@@ -3,5 +3,11 @@ function e(e, t) {
 	let n = e instanceof Error ? e.message : String(e);
 	return Error(`${t}: ${n}`, { cause: e });
 }
+function t(e) {
+	return e instanceof Error && "code" in e;
+}
+function n(e, ...n) {
+	return t(e) && typeof e.code == "string" && n.includes(e.code);
+}
 //#endregion
-export { e as wrapError };
+export { n as hasNodeErrorCode, t as isNodeError, e as wrapError };