@webskill/sdk 0.6.0 → 0.8.0

package/dist/{dist-8oQRa8Xz.js → dist-59XlqDuv.js}

@@ -714,6 +714,87 @@ function parseSkillPackManifest(text) {
 	}
 	return raw;
 }
+const SKILL_FILE = "SKILL.md";
+function normalize(path) {
+	return path.replace(/^\.?\//, "");
+}
+/**
+* 按归档条目表判定包结构。
+*
+* 入参是条目表而不是文件系统：预览侧只有解压后的 entries，没有落盘的目录。
+* 只看路径，不读内容——内容合法性由 checkSkillRules 负责，两者不重叠。
+*/
+function detectSkillArchiveShape(entries) {
+	const paths = [];
+	for (const raw of entries) {
+		const p = normalize(raw);
+		if (p !== "") paths.push(p);
+	}
+	if (paths.length === 0) return {
+		shape: "invalid",
+		reason: "Archive is empty."
+	};
+	if (paths.includes("webskill.skill-pack.json")) return { shape: "pack-set" };
+	if (paths.includes(SKILL_FILE)) return { shape: "flat" };
+	const topLevels = /* @__PURE__ */ new Set();
+	let hasLooseRootFile = false;
+	for (const p of paths) {
+		const slash = p.indexOf("/");
+		if (slash <= 0) hasLooseRootFile = true;
+		else topLevels.add(p.slice(0, slash));
+	}
+	if (!hasLooseRootFile && topLevels.size === 1) {
+		const [dir] = [...topLevels];
+		if (dir !== void 0) {
+			if (paths.includes(`${dir}/webskill.skill-pack.json`)) return {
+				shape: "pack-set",
+				rootDir: dir
+			};
+			if (paths.includes(`${dir}/${SKILL_FILE}`)) return {
+				shape: "nested-single",
+				rootDir: dir
+			};
+		}
+	}
+	return {
+		shape: "invalid",
+		reason: `Archive does not contain a ${SKILL_FILE} at its root or in a single top-level directory.`
+	};
+}
+/** nested-single 时剥掉顶层目录，其余形态原样返回 */
+function stripArchiveRoot(entries, detection) {
+	if (detection.rootDir === void 0) return entries;
+	const prefix = `${detection.rootDir}/`;
+	const out = {};
+	for (const [path, value] of Object.entries(entries)) {
+		const p = normalize(path);
+		if (!p.startsWith(prefix)) continue;
+		const rel = p.slice(prefix.length);
+		if (rel !== "") out[rel] = value;
+	}
+	return out;
+}
+/**
+* 文件系统入口：安装管线拿到的是解压后的目录，不是条目表。
+*
+* 只探测判定所需的少量路径（不递归全量列举），再交给上面的纯函数——
+* 判定规则仍然只有一份，这正是 S7 的目的。
+*/
+async function detectSkillArchiveShapeFromFs(fs, contentDir) {
+	const sample = [];
+	const top = await fs.list(contentDir);
+	for (const entry of top) {
+		const name = entry.path.slice(contentDir.length + 1);
+		if (entry.type !== "directory") {
+			sample.push(name);
+			continue;
+		}
+		if (await fs.exists(`${entry.path}/${SKILL_FILE}`)) sample.push(`${name}/${SKILL_FILE}`);
+		else if (await fs.exists(`${entry.path}/webskill.skill-pack.json`)) sample.push(`${name}/${SKILL_PACK_FILE}`);
+		else sample.push(`${name}/`);
+	}
+	return detectSkillArchiveShape(sample);
+}
 const DEFAULT_ARCHIVE_LIMITS = {
 	maxDownloadBytes: 64 * 1024 * 1024,
 	maxEntryBytes: 64 * 1024 * 1024,
@@ -854,12 +935,15 @@ const baseName = (path) => path.split("/").pop() ?? path;
 var SkillDiscovery = class {
 	#fs;
 	#roots;
+	/** 扫描范围之外已知存在的技能名：只影响 dependencies 存在性判定，不产生目录项 */
+	#extraKnownSkillNames;
 	/** name → skillRoot，与 SkillReader 共享同一 Map 引用 */
 	#index = /* @__PURE__ */ new Map();
 	#reader;
-	constructor(fs, roots) {
+	constructor(fs, roots, options) {
 		this.#fs = fs;
 		this.#roots = roots;
+		this.#extraKnownSkillNames = options?.extraKnownSkillNames ?? [];
 		this.#reader = new SkillReader(fs, this.#index);
 	}
 	async discover() {
@@ -867,7 +951,7 @@ var SkillDiscovery = class {
 		const entries = [];
 		const issues = [];
 		const candidates = [];
-		const knownSkillNames = /* @__PURE__ */ new Set();
+		const knownSkillNames = new Set(this.#extraKnownSkillNames);
 		const adjacency = /* @__PURE__ */ new Map();
 		for (const [rootIndex, root] of this.#roots.entries()) {
 			if (!await this.#fs.exists(root)) {
@@ -940,7 +1024,7 @@ var SkillDiscovery = class {
 			});
 		}
 		issues.push(...cycles.issues);
-		const admitted = new Set(entries.map((e) => e.name));
+		const admitted = /* @__PURE__ */ new Set([...entries.map((e) => e.name), ...this.#extraKnownSkillNames]);
 		let changed = true;
 		while (changed) {
 			changed = false;
@@ -996,9 +1080,12 @@ var SkillDiscovery = class {
 /**
 * 合规校验。内部直接复用 SkillDiscovery 的扫描逻辑，
 * 规则判定同样落在 checkSkillRules 单一来源上。
+*
+* `extraKnownSkillNames`：扫描范围之外已存在的技能名。安装时只扫刚解出来的那一个目录，
+* 不告诉它库里还有谁，任何指向包外的 dependencies 都会被判成不存在。
 */
-async function validateSkills(fs, roots) {
-	const { issues } = await new SkillDiscovery(fs, roots).discover();
+async function validateSkills(fs, roots, options) {
+	const { issues } = await new SkillDiscovery(fs, roots, options).discover();
 	return {
 		ok: !issues.some((i) => i.severity === "error"),
 		issues
@@ -1035,4 +1122,4 @@ const xmlRenderer = {
 };
 
 //#endregion
-export { parseSkillMarkdown as A, unzipWithLimits as B, escapeXml as C, keyIdOf as D, jsonRenderer as E, renderCatalogJson as F, verifyManifest as H, resolveArchiveLimits as I, resolveInsideRoot as L, readResponseWithLimit as M, readSkillSignature as N, messageOf as O, renderAvailableSkillsXml as P, signSkill as R, computeDigest as S, isValidSkillName as T, verifySkillSignature as U, validateSkills as V, xmlRenderer as W, atomicWriteText as _, SIGNATURE_SCHEMA_VERSION as a, checkDependencyCycles as b, SKILL_NAME_MAX_LENGTH as c, SKILL_SIGNATURE_FILE as d, SkillDiscovery as f, assertSafePathSegment as g, assertRemoteUrlAllowed as h, MemoryFS as i, parseSkillPackManifest as j, normalizePath as k, SKILL_NAME_PATTERN as l, WebSkillError as m, FsTrustedKeyStore as n, SKILLS_LOCKFILE as o, SkillReader as p, MANIFEST_EXCLUDED_FILES as r, SKILL_MANIFEST_FILE as s, DEFAULT_ARCHIVE_LIMITS as t, SKILL_PACK_FILE as u, buildCatalog as v, exportSkills as w, checkSkillRules as x, buildManifest as y, signaturePayloadBytes as z };
+export { messageOf as A, signSkill as B, detectSkillArchiveShape as C, isValidSkillName as D, exportSkills as E, readSkillSignature as F, verifyManifest as G, stripArchiveRoot as H, renderAvailableSkillsXml as I, verifySkillSignature as K, renderCatalogJson as L, parseSkillMarkdown as M, parseSkillPackManifest as N, jsonRenderer as O, readResponseWithLimit as P, resolveArchiveLimits as R, computeDigest as S, escapeXml as T, unzipWithLimits as U, signaturePayloadBytes as V, validateSkills as W, atomicWriteText as _, SIGNATURE_SCHEMA_VERSION as a, checkDependencyCycles as b, SKILL_NAME_MAX_LENGTH as c, SKILL_SIGNATURE_FILE as d, SkillDiscovery as f, assertSafePathSegment as g, assertRemoteUrlAllowed as h, MemoryFS as i, normalizePath as j, keyIdOf as k, SKILL_NAME_PATTERN as l, WebSkillError as m, FsTrustedKeyStore as n, SKILLS_LOCKFILE as o, SkillReader as p, xmlRenderer as q, MANIFEST_EXCLUDED_FILES as r, SKILL_MANIFEST_FILE as s, DEFAULT_ARCHIVE_LIMITS as t, SKILL_PACK_FILE as u, buildCatalog as v, detectSkillArchiveShapeFromFs as w, checkSkillRules as x, buildManifest as y, resolveInsideRoot as z };