zidane 7.2.5 → 8.0.4

package/dist/{skills-BC3dodWp.js → skills-DKqZJm4X.js}

@@ -1,116 +1,55 @@
 import { o as AgentToolNotAllowedError, u as errorMessage } from "./errors-DKiMrOKq.js";
 import { t as escapeXml } from "./xml-D5HBhJle.js";
-import { basename, delimiter, dirname, join, resolve, sep } from "node:path";
+import { t as projectUserPaths } from "./project-user-paths-BSgtrRxl.js";
 import { cpSync, existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { basename, delimiter, dirname, join, resolve, sep } from "node:path";
 import { homedir, tmpdir } from "node:os";
 import { realpath } from "node:fs/promises";
 import { execFile } from "node:child_process";
-//#region src/chat/project-root.ts
-/**
-* Git root detection — walks parents from `cwd` looking for a `.git`
-* entry, returning the absolute path of the repo root or `null` when
-* the search reaches the filesystem root.
-*
-* Why parent-walk over `git rev-parse --show-toplevel`:
-*
-*   - Zero dependencies (no shell-out, no git binary requirement,
-*     works even when `git` is missing from `PATH`).
-*   - Pure-sync, deterministic, easy to test against tmp dirs.
-*   - Equally fast in practice — most lookups are a single `existsSync`.
-*
-* Recognizes `.git` as either:
-*
-*   - A directory (standard repo layout).
-*   - A file containing `gitdir: …` (worktrees + submodules).
-*
-* Bare repos (no working tree) are intentionally NOT detected here —
-* the TUI's data dir contract is "project working tree", and a bare
-* repo has no working files to scope sessions against.
-*/
-/**
-* Walk parents of `cwd` looking for a `.git` entry. Returns the
-* absolute path of the directory containing `.git`, or `null` when no
-* git repo is found above `cwd`.
-*
-* Stops at the filesystem root (`/`) — no infinite loop on `dirname`'s
-* idempotent root case (`dirname('/')` returns `/`).
-*/
-function findGitRoot(cwd = process.cwd()) {
-	let dir = resolve(cwd);
-	for (let depth = 0; depth < 64; depth++) {
-		if (hasGitMarker(dir)) return dir;
-		const parent = dirname(dir);
-		if (parent === dir) return null;
-		dir = parent;
-	}
-	return null;
-}
-/**
-* `.git` exists as a directory (standard repo) OR as a file containing
-* a `gitdir:` pointer (worktree / submodule). Tolerant on stat failures
-* — a permission error on a parent directory shouldn't crash the walk.
-*/
-function hasGitMarker(dir) {
-	const candidate = resolve(dir, ".git");
-	try {
-		if (!existsSync(candidate)) return false;
-		const stat = statSync(candidate);
-		return stat.isDirectory() || stat.isFile();
-	} catch {
-		return false;
-	}
-}
-//#endregion
-//#region src/chat/project-user-paths.ts
-/**
-* Shared search-path builder for project + user config discovery.
-*
-* Both Skills (`skills/<name>/SKILL.md`) and MCP servers (`mcps.json`)
-* follow the same first-found-wins order:
-*
-*   1. `{project-root}/.agents/<sub>`   — project, agnostic convention
-*   2. `{project-root}/.{prefix}/<sub>` — project, zidane (`.zidane` default)
-*   3. `~/.agents/<sub>`                — user, agnostic
-*   4. `~/.{prefix}/<sub>`              — user, zidane
-*
-* `{project-root}` is the git root walked up from `cwd` when present,
-* else `cwd` itself. This pairs with the project-scoped session
-* storage (`resolveStoragePaths`) so all three project-aware surfaces
-* — sessions, mcps, skills — anchor at the same `.{prefix}/`.
-*
-* Centralizing the pattern keeps the four paths in one place — a third
-* discovery surface (hooks, rules, …) gets the same convention for free
-* and stays in lock-step on a prefix bump.
-*/
+//#region src/skills/catalog.ts
 /**
-* Resolve the four search paths for a given subdirectory (`skills`,
-* `mcps.json`, …). Returns absolute paths regardless of whether they
-* exist — the caller chooses to `existsSync`-filter or feed straight
-* into a tolerant discovery routine.
+* Build the skill catalog XML and behavioral instructions for the system prompt.
 */
-function projectUserPaths(opts) {
-	const cwd = opts.cwd ?? process.cwd();
-	const home = opts.home ?? homedir();
-	const projectRoot = findGitRoot(cwd) ?? cwd;
-	const prefix = (opts.prefix ?? ".zidane").replace(/^\./, "");
-	return [
-		{
-			path: resolve(projectRoot, `.agents/${opts.subPath}`),
-			source: "project"
-		},
-		{
-			path: resolve(projectRoot, `.${prefix}/${opts.subPath}`),
-			source: "project"
-		},
-		{
-			path: resolve(home, `.agents/${opts.subPath}`),
-			source: "user"
-		},
-		{
-			path: resolve(home, `.${prefix}/${opts.subPath}`),
-			source: "user"
-		}
+function buildCatalog(skills, options = {}) {
+	if (skills.length === 0) return "";
+	const skillsToolRegistered = options.skillsToolRegistered ?? true;
+	const readToolName = options.readToolName ?? "read_file";
+	const entries = skills.map((skill) => {
+		const locationLine = skill.location ? `\n    <location>${escapeXml(skill.location)}</location>` : "";
+		return `  <skill>
+    <name>${escapeXml(skill.name)}</name>
+    <description>${escapeXml(skill.description)}</description>${locationLine}
+  </skill>`;
+	}).join("\n");
+	const hasFsSkills = skills.some((s) => s.location);
+	const hasInlineSkills = skills.some((s) => !s.location);
+	const behavioralParts = [];
+	behavioralParts.push("The following skills provide specialized instructions for specific tasks.", "When a task matches a skill's description, activate the skill to load its full instructions before proceeding.");
+	if (skillsToolRegistered) behavioralParts.push("To activate a skill, call the `skills_use` tool with the skill's name. The response contains the full instructions and any bundled resources you can then load via `skills_read` (reference files) or execute via `skills_run_script` (scripts/ directory).", "Relative paths referenced in a skill's instructions resolve against the skill directory noted in the `skills_use` response.");
+	else if (hasFsSkills) behavioralParts.push(`For skills with a <location>, use the ${readToolName} tool to read the SKILL.md file at that path.`, "When a skill references relative paths, resolve them against the skill's directory (the parent of SKILL.md) and use absolute paths in tool calls.");
+	if (hasInlineSkills && !skillsToolRegistered) behavioralParts.push("Skills without a <location> have their instructions included directly in <instructions> tags below.");
+	const parts = [
+		behavioralParts.join("\n"),
+		"",
+		"<available_skills>",
+		entries,
+		"</available_skills>"
 	];
+	if (hasInlineSkills && !skillsToolRegistered) {
+		parts.push("");
+		for (const skill of skills) if (!skill.location && skill.instructions) {
+			parts.push(`<skill_instructions name="${escapeXml(skill.name)}">`);
+			parts.push(skill.instructions);
+			if (skill.resources && skill.resources.length > 0) {
+				parts.push("");
+				parts.push("<skill_resources>");
+				for (const res of skill.resources) parts.push(`  <file type="${res.type}">${escapeXml(res.path)}</file>`);
+				parts.push("</skill_resources>");
+			}
+			parts.push("</skill_instructions>");
+		}
+	}
+	return parts.join("\n");
 }
 //#endregion
 //#region src/skills/validate.ts
@@ -327,155 +266,9 @@ function isToolAllowedByUnion(displayName, input, union) {
 	return union.some((pattern) => matchesAllowedTool(displayName, input, pattern));
 }
 //#endregion
-//#region src/skills/activation.ts
-function createSkillActivationState(options = {}) {
-	const byName = /* @__PURE__ */ new Map();
-	const maxActive = typeof options.maxActive === "number" && options.maxActive > 0 ? options.maxActive : void 0;
-	return {
-		active() {
-			return [...byName.values()];
-		},
-		isActive(name) {
-			return byName.has(name);
-		},
-		get(name) {
-			return byName.get(name);
-		},
-		activate(skill, via) {
-			if (byName.has(skill.name)) return "already-active";
-			if (maxActive !== void 0 && byName.size >= maxActive) return "cap-reached";
-			byName.set(skill.name, {
-				skill,
-				activatedAt: Date.now(),
-				activatedVia: via
-			});
-			return "ok";
-		},
-		deactivate(name) {
-			const existing = byName.get(name);
-			if (!existing) return void 0;
-			byName.delete(name);
-			return existing;
-		},
-		clear() {
-			const snapshot = [...byName.values()];
-			byName.clear();
-			return snapshot;
-		}
-	};
-}
-//#endregion
-//#region src/skills/allowed-tools.ts
-/** Tools that are always allowed regardless of the active skills' allow-list. */
-const IMPLICITLY_ALLOWED_SKILL_TOOLS = [
-	"skills_use",
-	"skills_read",
-	"skills_run_script"
-];
-/**
-* Register `tool:gate` / `mcp:tool:gate` handlers that enforce the union of
-* `allowedTools` across active skills.
-*
-* No-op when no active skill declares an allow-list (permissive default —
-* matches the spec's "experimental" note for `allowed-tools`).
-*
-* Returns an `uninstall` fn. The agent calls this at run end to detach the
-* handlers and prevent cross-run hook leaks.
-*/
-function installAllowedToolsGate(hooks, state) {
-	function effectiveUnion() {
-		const active = state.active();
-		const declared = [];
-		for (const record of active) if (record.skill.allowedTools?.length) declared.push(...record.skill.allowedTools);
-		return {
-			union: declared.length > 0 ? [...declared, ...IMPLICITLY_ALLOWED_SKILL_TOOLS] : [],
-			active: active.map((a) => a.skill.name)
-		};
-	}
-	function gateHandler(ctx) {
-		if (ctx.block) return;
-		const { union, active } = effectiveUnion();
-		if (union.length === 0) return;
-		if (isToolAllowedByUnion(ctx.displayName, ctx.input, union)) return;
-		const err = new AgentToolNotAllowedError({
-			toolName: ctx.name,
-			displayName: ctx.displayName,
-			allowedUnion: union,
-			activeSkills: active
-		});
-		ctx.block = true;
-		ctx.reason = err.message;
-	}
-	function mcpGateHandler(ctx) {
-		if (ctx.block) return;
-		const { union, active } = effectiveUnion();
-		if (union.length === 0) return;
-		if (isToolAllowedByUnion(ctx.displayName, ctx.input, union)) return;
-		const err = new AgentToolNotAllowedError({
-			toolName: `mcp_${ctx.server}_${ctx.tool}`,
-			displayName: ctx.displayName,
-			allowedUnion: union,
-			activeSkills: active
-		});
-		ctx.block = true;
-		ctx.reason = err.message;
-	}
-	const unregisterTool = hooks.hook("tool:gate", gateHandler);
-	const unregisterMcp = hooks.hook("mcp:tool:gate", mcpGateHandler);
-	return function uninstall() {
-		unregisterTool();
-		unregisterMcp();
-	};
-}
-//#endregion
-//#region src/skills/catalog.ts
-/**
-* Build the skill catalog XML and behavioral instructions for the system prompt.
-*/
-function buildCatalog(skills, options = {}) {
-	if (skills.length === 0) return "";
-	const skillsToolRegistered = options.skillsToolRegistered ?? true;
-	const readToolName = options.readToolName ?? "read_file";
-	const entries = skills.map((skill) => {
-		const locationLine = skill.location ? `\n    <location>${escapeXml(skill.location)}</location>` : "";
-		return `  <skill>
-    <name>${escapeXml(skill.name)}</name>
-    <description>${escapeXml(skill.description)}</description>${locationLine}
-  </skill>`;
-	}).join("\n");
-	const hasFsSkills = skills.some((s) => s.location);
-	const hasInlineSkills = skills.some((s) => !s.location);
-	const behavioralParts = [];
-	behavioralParts.push("The following skills provide specialized instructions for specific tasks.", "When a task matches a skill's description, activate the skill to load its full instructions before proceeding.");
-	if (skillsToolRegistered) behavioralParts.push("To activate a skill, call the `skills_use` tool with the skill's name. The response contains the full instructions and any bundled resources you can then load via `skills_read` (reference files) or execute via `skills_run_script` (scripts/ directory).", "Relative paths referenced in a skill's instructions resolve against the skill directory noted in the `skills_use` response.");
-	else if (hasFsSkills) behavioralParts.push(`For skills with a <location>, use the ${readToolName} tool to read the SKILL.md file at that path.`, "When a skill references relative paths, resolve them against the skill's directory (the parent of SKILL.md) and use absolute paths in tool calls.");
-	if (hasInlineSkills && !skillsToolRegistered) behavioralParts.push("Skills without a <location> have their instructions included directly in <instructions> tags below.");
-	const parts = [
-		behavioralParts.join("\n"),
-		"",
-		"<available_skills>",
-		entries,
-		"</available_skills>"
-	];
-	if (hasInlineSkills && !skillsToolRegistered) {
-		parts.push("");
-		for (const skill of skills) if (!skill.location && skill.instructions) {
-			parts.push(`<skill_instructions name="${escapeXml(skill.name)}">`);
-			parts.push(skill.instructions);
-			if (skill.resources && skill.resources.length > 0) {
-				parts.push("");
-				parts.push("<skill_resources>");
-				for (const res of skill.resources) parts.push(`  <file type="${res.type}">${escapeXml(res.path)}</file>`);
-				parts.push("</skill_resources>");
-			}
-			parts.push("</skill_instructions>");
-		}
-	}
-	return parts.join("\n");
-}
-//#endregion
 //#region src/skills/discovery.ts
-const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
+const FRONTMATTER_RE = /^---[ \t]*\r?\n(?:([\s\S]*?)\r?\n)?---\r?\n?([\s\S]*)$/;
+const LEADING_BOM_AND_BLANK_RE = /^\uFEFF?(?:[ \t]*\r?\n)*/;
 const INDENT_RE = /^[ \t]{2,}/;
 const KV_RE = /^([^:]+):(.*)$/;
 const DOUBLE_QUOTED_RE = /^"((?:\\.|[^"\\])*)"$/;
@@ -543,7 +336,7 @@ function normalizeKeyAliases(frontmatter, diagnostics) {
 			diagnostics.push({
 				severity: "warning",
 				code: "frontmatter-key-alt-spelling",
-				message: `Frontmatter field "${alias}" is not a spec key — the spec uses "${canonical}" (kebab-case). Reading the value from "${alias}" as a courtesy; rename it to "${canonical}" to silence this warning.`,
+				message: `Frontmatter field "${alias}" is not a spec key; the spec uses "${canonical}" (kebab-case). Reading the value from "${alias}" as a courtesy; rename it to "${canonical}" to silence this warning.`,
 				field: alias
 			});
 			break;
@@ -568,15 +361,18 @@ function normalizeKeyAliases(frontmatter, diagnostics) {
 */
 function parseFrontmatter(content) {
 	const diagnostics = [];
-	const match = content.match(FRONTMATTER_RE);
+	const blankKeys = [];
+	const match = content.replace(LEADING_BOM_AND_BLANK_RE, "").match(FRONTMATTER_RE);
 	if (!match) return {
 		frontmatter: {},
-		body: content.trim(),
-		diagnostics
+		body: content.replace(/^\uFEFF/, "").trim(),
+		diagnostics,
+		blankKeys
 	};
-	const yamlBlock = match[1];
-	const body = match[2].trim();
+	const yamlBlock = match[1] ?? "";
+	const body = (match[2] ?? "").trim();
 	const frontmatter = {};
+	const seenKeys = /* @__PURE__ */ new Set();
 	let currentKey = null;
 	let currentMap = null;
 	let currentList = null;
@@ -584,20 +380,24 @@ function parseFrontmatter(content) {
 		if (currentKey === null) return;
 		if (currentList !== null) frontmatter[currentKey] = currentList;
 		else if (currentMap !== null) frontmatter[currentKey] = currentMap;
+		else {
+			frontmatter[currentKey] = "";
+			blankKeys.push(currentKey);
+		}
 		currentKey = null;
 		currentMap = null;
 		currentList = null;
 	};
 	for (const line of yamlBlock.split("\n")) {
 		if (!line.trim() || line.trim().startsWith("#")) continue;
-		if (currentKey !== null && INDENT_RE.test(line)) {
+		if (currentKey !== null && (INDENT_RE.test(line) || LIST_ITEM_RE.test(line.trimStart()))) {
 			const stripped = line.trim();
 			if (LIST_ITEM_RE.test(stripped)) {
 				if (currentMap !== null && Object.keys(currentMap).length > 0) {
 					diagnostics.push({
 						severity: "warning",
 						code: "mixed-list-and-map",
-						message: `Frontmatter field "${currentKey}" mixes list items and map entries — keeping the map and dropping the list items.`,
+						message: `Frontmatter field "${currentKey}" mixes list items and map entries, keeping the map.`,
 						field: currentKey
 					});
 					continue;
@@ -612,7 +412,7 @@ function parseFrontmatter(content) {
 					diagnostics.push({
 						severity: "warning",
 						code: "mixed-list-and-map",
-						message: `Frontmatter field "${currentKey}" mixes list items and map entries — keeping the list and dropping the map entries.`,
+						message: `Frontmatter field "${currentKey}" mixes list items and map entries, keeping the list.`,
 						field: currentKey
 					});
 					continue;
@@ -628,6 +428,17 @@ function parseFrontmatter(content) {
 		if (!kvMatch) continue;
 		const key = kvMatch.key.trim();
 		const rawValue = kvMatch.value.trim();
+		if (seenKeys.has(key)) {
+			diagnostics.push({
+				severity: "warning",
+				code: "duplicate-key",
+				message: `Frontmatter field "${key}" appears more than once; the last value wins.`,
+				field: key
+			});
+			const blankIdx = blankKeys.indexOf(key);
+			if (blankIdx >= 0) blankKeys.splice(blankIdx, 1);
+		}
+		seenKeys.add(key);
 		if (!rawValue) currentKey = key;
 		else frontmatter[key] = unquoteYaml(rawValue);
 	}
@@ -635,7 +446,8 @@ function parseFrontmatter(content) {
 	return {
 		frontmatter,
 		body,
-		diagnostics
+		diagnostics,
+		blankKeys
 	};
 }
 function matchFirstColon(line) {
@@ -751,7 +563,8 @@ function enumerateResources(baseDir) {
 			const files = readdirSync(dirPath, { recursive: true });
 			for (const file of files) {
 				const rel = typeof file === "string" ? file : file.toString("utf-8");
-				if (statSync(join(dirPath, rel)).isFile()) resources.push({
+				const fullPath = join(dirPath, rel);
+				if (statSync(fullPath).isFile()) resources.push({
 					path: join(dir, rel),
 					type
 				});
@@ -761,7 +574,8 @@ function enumerateResources(baseDir) {
 	try {
 		for (const entry of readdirSync(baseDir)) {
 			if (entry === "SKILL.md") continue;
-			if (statSync(join(baseDir, entry)).isFile()) resources.push({
+			const entryPath = join(baseDir, entry);
+			if (statSync(entryPath).isFile()) resources.push({
 				path: entry,
 				type: "other"
 			});
@@ -783,7 +597,19 @@ function enumerateResources(baseDir) {
 async function parseSkillFile(filePath, options = {}) {
 	const absPath = resolve(filePath);
 	if (!existsSync(absPath)) return null;
-	const { frontmatter, body, diagnostics } = parseFrontmatter(readFileSync(absPath, "utf-8"));
+	return parseSkillContent(readFileSync(absPath, "utf-8"), absPath, {
+		...options,
+		resources: enumerateResources(dirname(absPath))
+	});
+}
+/**
+* {@link parseSkillFile} over content already read: a SKILL.md that is not
+* on this filesystem (a machine's, `docs/MACHINES.md`). `absPath` is where it
+* lives there; `resources` what its folder holds (none when unknown).
+*/
+function parseSkillContent(content, absPath, options = {}) {
+	const { frontmatter, body, diagnostics, blankKeys } = parseFrontmatter(content);
+	for (const key of blankKeys) if (frontmatter[key] === "") delete frontmatter[key];
 	normalizeKeyAliases(frontmatter, diagnostics);
 	let description = takeString(frontmatter, "description", diagnostics);
 	if (!description && body) {
@@ -826,7 +652,7 @@ async function parseSkillFile(filePath, options = {}) {
 		source: options.source ?? "project",
 		location: absPath,
 		baseDir,
-		resources: enumerateResources(baseDir)
+		resources: options.resources ?? []
 	};
 	const license = takeString(frontmatter, "license", diagnostics);
 	if (license) config.license = license;
@@ -867,7 +693,7 @@ async function parseSkillFile(filePath, options = {}) {
 		diagnostics.push({
 			severity: "warning",
 			code: "deprecated-top-level-field",
-			message: "`paths` is not a spec field and is deprecated — moved to `metadata[\"zidane.paths\"]`.",
+			message: "`paths` is not a spec field and is deprecated, moved to `metadata[\"zidane.paths\"]`.",
 			field: "paths"
 		});
 	}
@@ -877,7 +703,7 @@ async function parseSkillFile(filePath, options = {}) {
 		diagnostics.push({
 			severity: "warning",
 			code: "deprecated-top-level-field",
-			message: "`model` is not a spec field and is deprecated — moved to `metadata[\"zidane.model\"]`.",
+			message: "`model` is not a spec field and is deprecated, moved to `metadata[\"zidane.model\"]`.",
 			field: "model"
 		});
 	}
@@ -889,7 +715,7 @@ async function parseSkillFile(filePath, options = {}) {
 		diagnostics.push({
 			severity: "warning",
 			code: "deprecated-top-level-field",
-			message: `\`${thinkingField ? "thinking" : "effort"}\` is not a spec field and is deprecated — moved to \`metadata["zidane.thinking"]\`.`,
+			message: `\`${thinkingField ? "thinking" : "effort"}\` is not a spec field and is deprecated, moved to \`metadata["zidane.thinking"]\`.`,
 			field: thinkingField ? "thinking" : "effort"
 		});
 	}
@@ -943,52 +769,296 @@ function getDefaultScanPaths() {
 			path: join(home, ".agents", "skills"),
 			source: "user"
 		},
-		{
-			path: join(home, ".zidane", "skills"),
-			source: "user"
+		{
+			path: join(home, ".zidane", "skills"),
+			source: "user"
+		}
+	];
+}
+/**
+* Infer a source tag for a user-provided scan path.
+* Paths under `$HOME` are treated as 'user'; everything else as 'project'.
+*/
+function inferSource(path) {
+	return path.startsWith(homedir()) ? "user" : "project";
+}
+/**
+* Discover skills from sourced filesystem paths.
+* Each path is scanned for subdirectories containing SKILL.md.
+* Earlier paths have higher priority (first-found wins on name collision).
+*
+* `signal` is checked between each `parseSkillFile` so a rapid `cwd` switch
+* in the host (TUI / GUI) can stop a long scan without leaking I/O. Aborts
+* reject with the signal's `reason` (or a default `AbortError`) — same shape
+* `AbortSignal.throwIfAborted()` produces in modern runtimes.
+*/
+async function discoverSkills(paths, signal) {
+	const skillsByName = /* @__PURE__ */ new Map();
+	for (const { path: scanPath, source } of paths) {
+		signal?.throwIfAborted?.();
+		const skillFiles = findSkillDirs(resolve(scanPath));
+		for (const file of skillFiles) {
+			signal?.throwIfAborted?.();
+			const skill = await parseSkillFile(file, { source });
+			if (!skill) continue;
+			if (skillsByName.has(skill.name)) {
+				const existing = skillsByName.get(skill.name);
+				const diag = {
+					severity: "warning",
+					code: "name-collision-shadowed",
+					message: `A skill with name "${skill.name}" was also found at ${file} (source: ${source}); shadowed by ${existing.location} (source: ${existing.source}).`
+				};
+				existing.diagnostics = [...existing.diagnostics ?? [], diag];
+				continue;
+			}
+			skillsByName.set(skill.name, skill);
+		}
+	}
+	return [...skillsByName.values()];
+}
+//#endregion
+//#region src/skills/writer.ts
+const YAML_RESERVED_RE = /[:#&*!|>%@`]/;
+const YAML_EDGE_OR_QUOTE_RE = /^\s|\s$|["']/;
+const DQUOTE_RE = /"/g;
+const LEADING_NEWLINES_RE = /^\n+/;
+function yamlEscape(value) {
+	if (YAML_RESERVED_RE.test(value) || YAML_EDGE_OR_QUOTE_RE.test(value) || value === "") return `"${value.replace(DQUOTE_RE, "\\\"")}"`;
+	return value;
+}
+function serializeFrontmatter(skill) {
+	const lines = ["---"];
+	lines.push(`name: ${yamlEscape(skill.name)}`);
+	lines.push(`description: ${yamlEscape(skill.description)}`);
+	if (skill.license) lines.push(`license: ${yamlEscape(skill.license)}`);
+	if (skill.compatibility) lines.push(`compatibility: ${yamlEscape(skill.compatibility)}`);
+	if (skill.allowedTools?.length) lines.push(`allowed-tools: ${skill.allowedTools.join(" ")}`);
+	if (skill.metadata && Object.keys(skill.metadata).length > 0) {
+		lines.push("metadata:");
+		for (const [key, value] of Object.entries(skill.metadata)) lines.push(`  ${key}: "${value.replace(DQUOTE_RE, "\\\"")}"`);
+	}
+	lines.push("---");
+	return lines.join("\n");
+}
+/**
+* Write a `SkillConfig` to disk as a proper skill directory with SKILL.md.
+* Returns the path to the written SKILL.md file.
+*
+* Throws if the skill fails `validateSkillForWrite` — the authoring path is
+* strict on purpose. For loading third-party skills, use `parseSkillFile`
+* directly (lenient).
+*/
+function writeSkillToDisk(skill, targetDir) {
+	const result = validateSkillForWrite(skill);
+	if (!result.valid) {
+		const summary = result.errors.map((e) => `  - [${e.code}] ${e.message}`).join("\n");
+		throw new Error(`Cannot write invalid skill "${skill.name}":\n${summary}`);
+	}
+	const skillDir = join(targetDir, skill.name);
+	mkdirSync(skillDir, { recursive: true });
+	const frontmatter = serializeFrontmatter(skill);
+	const bodyTrimmed = skill.instructions ? skill.instructions.replace(LEADING_NEWLINES_RE, "") : "";
+	const content = bodyTrimmed ? `${frontmatter}\n\n${bodyTrimmed}\n` : `${frontmatter}\n`;
+	const skillPath = join(skillDir, "SKILL.md");
+	writeFileSync(skillPath, content);
+	return skillPath;
+}
+/**
+* Write multiple `SkillConfig` objects to a target directory.
+* Each skill gets its own subdirectory with a SKILL.md file.
+* Returns the target directory path (for use as a scan path).
+*/
+function writeSkillsToDisk(skills, targetDir) {
+	mkdirSync(targetDir, { recursive: true });
+	for (const skill of skills) writeSkillToDisk(skill, targetDir);
+	return targetDir;
+}
+//#endregion
+//#region src/skills/resolve.ts
+/**
+* Resolve all skills from a SkillsConfig:
+*
+* 1. Materialize `config.write` entries to a temp directory, tagged as `inline`
+* 2. Combine with default + user-provided scan paths (project-first, user-next)
+* 3. Run lenient disk discovery
+* 4. Merge with any host-provided `config.catalog`. Catalog entries seed the
+*    resolution map FIRST, so they shadow disk-discovered skills with the
+*    same name (shadow diagnostic attached to the winner — same shape as
+*    the disk-vs-disk collision case).
+* 5. Apply filters: optional project-skill trust gate, `exclude`,
+*    `enabled` allowlist
+*
+* Returns `{ skills, cleanup }` — call `cleanup()` on agent destroy to remove
+* the temp directory created for inline `config.write` skills. The agent
+* factory wires this automatically; standalone callers must invoke it
+* themselves to avoid leaking OS temp.
+*/
+async function resolveSkills(config) {
+	const sourcedPaths = [];
+	let writeDir;
+	if (!config.skipDefaultPaths) sourcedPaths.push(...getDefaultScanPaths());
+	for (const p of config.scan ?? []) sourcedPaths.push(typeof p === "string" ? {
+		path: p,
+		source: inferSource(p)
+	} : p);
+	if (config.write?.length) {
+		writeDir = mkdtempSync(join(tmpdir(), "zidane-skills-"));
+		writeSkillsToDisk(config.write, writeDir);
+		sourcedPaths.push({
+			path: writeDir,
+			source: "inline"
+		});
+	}
+	const diskSkills = await discoverSkills(sourcedPaths);
+	const skillsByName = /* @__PURE__ */ new Map();
+	for (const entry of config.catalog ?? []) {
+		const winner = { ...entry };
+		const shadowed = skillsByName.get(entry.name);
+		if (shadowed) {
+			const diag = {
+				severity: "warning",
+				code: "name-collision-shadowed",
+				message: `A skill with name "${entry.name}" was also supplied in the catalog by ${shadowed.location ?? "(catalog)"} (source: ${shadowed.source ?? "inline"}); shadowed by ${winner.location ?? "(catalog)"} (source: ${winner.source ?? "inline"}).`
+			};
+			winner.diagnostics = [...winner.diagnostics ?? [], diag];
+		}
+		skillsByName.set(entry.name, winner);
+	}
+	for (const skill of diskSkills) {
+		const existing = skillsByName.get(skill.name);
+		if (existing) {
+			const loserLoc = skill.location ?? "(unknown)";
+			const winnerLoc = existing.location ?? "(catalog)";
+			const diag = {
+				severity: "warning",
+				code: "name-collision-shadowed",
+				message: `A skill with name "${skill.name}" was also found at ${loserLoc} (source: ${skill.source ?? "project"}); shadowed by ${winnerLoc} (source: ${existing.source ?? "inline"}).`
+			};
+			existing.diagnostics = [...existing.diagnostics ?? [], diag];
+			continue;
+		}
+		skillsByName.set(skill.name, skill);
+	}
+	let skills = [...skillsByName.values()];
+	if (config.trustProjectSkills === false) skills = skills.filter((s) => s.source !== void 0 && s.source !== "project");
+	const exclude = new Set(config.exclude ?? []);
+	let filtered = skills.filter((s) => !exclude.has(s.name));
+	if (Array.isArray(config.enabled)) {
+		const allowlist = new Set(config.enabled);
+		filtered = filtered.filter((s) => allowlist.has(s.name));
+	}
+	return {
+		skills: filtered,
+		cleanup: writeDir ? () => {
+			try {
+				rmSync(writeDir, {
+					recursive: true,
+					force: true
+				});
+			} catch {}
+		} : () => {}
+	};
+}
+//#endregion
+//#region src/skills/activation.ts
+function createSkillActivationState(options = {}) {
+	const byName = /* @__PURE__ */ new Map();
+	const maxActive = typeof options.maxActive === "number" && options.maxActive > 0 ? options.maxActive : void 0;
+	return {
+		active() {
+			return [...byName.values()];
+		},
+		isActive(name) {
+			return byName.has(name);
+		},
+		get(name) {
+			return byName.get(name);
+		},
+		activate(skill, via) {
+			if (byName.has(skill.name)) return "already-active";
+			if (maxActive !== void 0 && byName.size >= maxActive) return "cap-reached";
+			byName.set(skill.name, {
+				skill,
+				activatedAt: Date.now(),
+				activatedVia: via
+			});
+			return "ok";
+		},
+		deactivate(name) {
+			const existing = byName.get(name);
+			if (!existing) return void 0;
+			byName.delete(name);
+			return existing;
+		},
+		clear() {
+			const snapshot = [...byName.values()];
+			byName.clear();
+			return snapshot;
 		}
-	];
-}
-/**
-* Infer a source tag for a user-provided scan path.
-* Paths under `$HOME` are treated as 'user'; everything else as 'project'.
-*/
-function inferSource(path) {
-	return path.startsWith(homedir()) ? "user" : "project";
+	};
 }
+//#endregion
+//#region src/skills/allowed-tools.ts
+/** Tools that are always allowed regardless of the active skills' allow-list. */
+const IMPLICITLY_ALLOWED_SKILL_TOOLS = [
+	"skills_use",
+	"skills_read",
+	"skills_run_script"
+];
 /**
-* Discover skills from sourced filesystem paths.
-* Each path is scanned for subdirectories containing SKILL.md.
-* Earlier paths have higher priority (first-found wins on name collision).
+* Register `tool:gate` / `mcp:tool:gate` handlers that enforce the union of
+* `allowedTools` across active skills.
 *
-* `signal` is checked between each `parseSkillFile` so a rapid `cwd` switch
-* in the host (TUI / GUI) can stop a long scan without leaking I/O. Aborts
-* reject with the signal's `reason` (or a default `AbortError`) — same shape
-* `AbortSignal.throwIfAborted()` produces in modern runtimes.
+* No-op when no active skill declares an allow-list (permissive default —
+* matches the spec's "experimental" note for `allowed-tools`).
+*
+* Returns an `uninstall` fn. The agent calls this at run end to detach the
+* handlers and prevent cross-run hook leaks.
 */
-async function discoverSkills(paths, signal) {
-	const skillsByName = /* @__PURE__ */ new Map();
-	for (const { path: scanPath, source } of paths) {
-		signal?.throwIfAborted?.();
-		const skillFiles = findSkillDirs(resolve(scanPath));
-		for (const file of skillFiles) {
-			signal?.throwIfAborted?.();
-			const skill = await parseSkillFile(file, { source });
-			if (!skill) continue;
-			if (skillsByName.has(skill.name)) {
-				const existing = skillsByName.get(skill.name);
-				const diag = {
-					severity: "warning",
-					code: "name-collision-shadowed",
-					message: `A skill with name "${skill.name}" was also found at ${file} (source: ${source}); shadowed by ${existing.location} (source: ${existing.source}).`
-				};
-				existing.diagnostics = [...existing.diagnostics ?? [], diag];
-				continue;
-			}
-			skillsByName.set(skill.name, skill);
-		}
+function installAllowedToolsGate(hooks, state) {
+	function effectiveUnion() {
+		const active = state.active();
+		const declared = [];
+		for (const record of active) if (record.skill.allowedTools?.length) declared.push(...record.skill.allowedTools);
+		return {
+			union: declared.length > 0 ? [...declared, ...IMPLICITLY_ALLOWED_SKILL_TOOLS] : [],
+			active: active.map((a) => a.skill.name)
+		};
 	}
-	return [...skillsByName.values()];
+	function gateHandler(ctx) {
+		if (ctx.block) return;
+		const { union, active } = effectiveUnion();
+		if (union.length === 0) return;
+		if (isToolAllowedByUnion(ctx.displayName, ctx.input, union)) return;
+		const err = new AgentToolNotAllowedError({
+			toolName: ctx.name,
+			displayName: ctx.displayName,
+			allowedUnion: union,
+			activeSkills: active
+		});
+		ctx.block = true;
+		ctx.reason = err.message;
+	}
+	function mcpGateHandler(ctx) {
+		if (ctx.block) return;
+		const { union, active } = effectiveUnion();
+		if (union.length === 0) return;
+		if (isToolAllowedByUnion(ctx.displayName, ctx.input, union)) return;
+		const err = new AgentToolNotAllowedError({
+			toolName: `mcp_${ctx.server}_${ctx.tool}`,
+			displayName: ctx.displayName,
+			allowedUnion: union,
+			activeSkills: active
+		});
+		ctx.block = true;
+		ctx.reason = err.message;
+	}
+	const unregisterTool = hooks.hook("tool:gate", gateHandler);
+	const unregisterMcp = hooks.hook("mcp:tool:gate", mcpGateHandler);
+	return function uninstall() {
+		unregisterTool();
+		unregisterMcp();
+	};
 }
 //#endregion
 //#region src/install/source.ts
@@ -1032,6 +1102,38 @@ var InstallSourceError = class extends Error {
 		if (candidates) this.candidates = candidates;
 	}
 };
+/**
+* `io` stopped by `signal` (a bounded install, `catalog.install` on a
+* server): every exec gets it (the child is killed), every fetch too, and
+* once it fired no further step starts and the current one throws, so the
+* installer's own rollback (staging dir, transactional target) runs.
+*/
+function abortableInstallIo(io, signal) {
+	const exec = io?.exec ?? defaultExec;
+	const fetchImpl = io?.fetch ?? fetch;
+	const stopped = () => {
+		if (signal.aborted) throw new InstallSourceError("fetch-failed", "The install was stopped.");
+	};
+	return {
+		...io,
+		exec: async (cmd, args, opts) => {
+			stopped();
+			const result = await exec(cmd, args, {
+				...opts,
+				signal
+			});
+			stopped();
+			return result;
+		},
+		fetch: (async (input, init) => {
+			stopped();
+			return fetchImpl(input, {
+				...init,
+				signal
+			});
+		})
+	};
+}
 const GITHUB_TREE_URL_RE = /^(?:https?:\/\/)?(?:www\.)?github\.com\/([^/\s]+)\/([^/\s#@:]+?)(?:\.git)?\/tree\/([^/\s:]+)(?:\/([^\s:]+?))?\/?$/;
 const GITHUB_URL_RE = /^(?:https?:\/\/)?(?:www\.)?github\.com\/([^/\s]+)\/([^/\s#@:]+?)(?:\.git)?\/?$/;
 const OWNER_REPO_RE = /^([\w.-]+)\/([\w.-]+)$/;
@@ -1041,7 +1143,7 @@ const NPM_NAME_RE = /^(@[\w.-]+\/[\w.-]+|[\w.-]+)(?:@([\w.^~><=*-]+))?$/;
 function parseSubdir(rawSubdir, raw) {
 	const subdir = rawSubdir.replace(/^\.\//, "").replace(/\/+$/, "");
 	const segments = subdir.split("/");
-	if (subdir.length === 0 || subdir.startsWith("/") || subdir.includes("\\") || segments.some((s) => s.length === 0 || s === "." || s === "..")) throw new InstallSourceError("invalid-source", `"${raw}" has an invalid subdirectory — expected a repo-relative path (no leading /, no ..).`);
+	if (subdir.length === 0 || subdir.startsWith("/") || subdir.includes("\\") || segments.some((s) => s.length === 0 || s === "." || s === "..")) throw new InstallSourceError("invalid-source", `"${raw}" has an invalid subdirectory. Use a repo-relative path (no leading /, no ..).`);
 	return subdir;
 }
 /**
@@ -1148,7 +1250,7 @@ async function fetchInstallSource(source, destDir, io = {}, onProgress) {
 					force: true
 				});
 				mkdirSync(destDir, { recursive: true });
-				onProgress?.(`anonymous clone rejected — retrying via SSH (git@github.com:${source.owner}/${source.repo})…`);
+				onProgress?.(`anonymous clone rejected, retrying over SSH (git@github.com:${source.owner}/${source.repo})…`);
 				const ssh = await exec("git", cloneArgs(`git@github.com:${source.owner}/${source.repo}.git`), { env: {
 					GIT_TERMINAL_PROMPT: "0",
 					GIT_SSH_COMMAND: sshCommandWithBatchMode(process.env.GIT_SSH_COMMAND)
@@ -1205,7 +1307,7 @@ async function resolveNpmVersion(source, fetchImpl) {
 	}
 	const version = source.version && meta.versions?.[source.version] ? source.version : meta["dist-tags"]?.[source.version ?? "latest"];
 	const tarball = version ? meta.versions?.[version]?.dist?.tarball : void 0;
-	if (!version || !tarball) throw new InstallSourceError("fetch-failed", `npm package "${source.pkg}" has no ${source.version ? `version/tag "${source.version}"` : "latest version"} (exact versions and dist-tags only — ranges are not resolved).`);
+	if (!version || !tarball) throw new InstallSourceError("fetch-failed", `npm package "${source.pkg}" has no ${source.version ? `version/tag "${source.version}"` : "latest version"} (only exact versions and dist-tags, not ranges).`);
 	return {
 		version,
 		tarball
@@ -1216,16 +1318,16 @@ async function resolveNpmVersion(source, fetchImpl) {
 * unexpectedly huge (or hostile) URL must fail fast instead of ballooning
 * RSS. Install sources are source trees — 64MB is already generous.
 */
-const MAX_DOWNLOAD_BYTES = 64 * 1024 * 1024;
+const MAX_DOWNLOAD_BYTES = 67108864;
 async function downloadAndExtract(url, destDir, opts) {
 	let bytes;
 	try {
 		const res = await opts.fetchImpl(url);
 		if (!res.ok) throw new Error(`download returned ${res.status}`);
 		const declared = Number(res.headers.get("content-length") ?? "0");
-		if (declared > 67108864) throw new Error(`archive is ${Math.round(declared / 1024 / 1024)}MB — larger than the ${MAX_DOWNLOAD_BYTES / 1024 / 1024}MB limit`);
+		if (declared > 67108864) throw new Error(`archive is ${Math.round(declared / 1024 / 1024)}MB, over the ${MAX_DOWNLOAD_BYTES / 1024 / 1024}MB limit`);
 		bytes = await res.arrayBuffer();
-		if (bytes.byteLength > 67108864) throw new Error(`archive is ${Math.round(bytes.byteLength / 1024 / 1024)}MB — larger than the ${MAX_DOWNLOAD_BYTES / 1024 / 1024}MB limit`);
+		if (bytes.byteLength > 67108864) throw new Error(`archive is ${Math.round(bytes.byteLength / 1024 / 1024)}MB, over the ${MAX_DOWNLOAD_BYTES / 1024 / 1024}MB limit`);
 	} catch (err) {
 		throw new InstallSourceError("fetch-failed", `Download failed for ${opts.what}: ${errorText(err)}`);
 	}
@@ -1291,7 +1393,8 @@ function defaultExec(cmd, args, opts) {
 		execFile(cmd, [...args], {
 			cwd: opts.cwd,
 			env,
-			maxBuffer: 16 * 1024 * 1024
+			maxBuffer: 16777216,
+			...opts.signal ? { signal: opts.signal } : {}
 		}, (err, stdout, stderr) => {
 			resolvePromise({
 				ok: !err,
@@ -1438,7 +1541,7 @@ function parseCliAddCommand(rest) {
 		if (token.startsWith("-")) continue;
 		if (sourceToken === void 0) sourceToken = token;
 	}
-	if (sourceToken === void 0) throw new SkillInstallError("invalid-source", "Pasted skills command has no source — expected “skills add <owner/repo>”.");
+	if (sourceToken === void 0) throw new SkillInstallError("invalid-source", "The pasted command has no source. Expected “skills add <owner/repo>”.");
 	const parsed = parseSkillInstallSpec(sourceToken);
 	return {
 		...parsed,
@@ -1598,14 +1701,14 @@ async function installNatively(spec, skillSelector, opts) {
 			fallbackName = basename(resolve(fetchedInto, source.subdir));
 		}
 		const candidates = listSkillCandidates(candidateRoot, fallbackName);
-		if (candidates.length === 0) throw new SkillInstallError("no-skill", `No skill found in ${opts.source} — no SKILL.md anywhere in the tree (searched ${CANDIDATE_WALK_MAX_DEPTH} levels deep).`);
+		if (candidates.length === 0) throw new SkillInstallError("no-skill", `No skill found in ${opts.source}: no SKILL.md in the tree (searched ${CANDIDATE_WALK_MAX_DEPTH} levels deep).`);
 		let picked;
 		if (!skillSelector && opts.skills && opts.skills.length > 0) {
 			const byRel = /* @__PURE__ */ new Map();
 			for (const sel of opts.skills) {
 				const matches = candidates.filter((c) => c.name === sel || c.rel === sel);
 				if (matches.length === 0) throw new SkillInstallError("no-skill", `No skill named "${sel}" in ${opts.source}. Available: ${describeCandidates(candidates)}`, candidates.map((c) => c.rel));
-				if (matches.length > 1) throw new SkillInstallError("multiple-candidates", `"${sel}" is ambiguous in ${opts.source} — pick a path: ${matches.map((c) => c.rel).join(", ")}`, matches.map((c) => c.rel));
+				if (matches.length > 1) throw new SkillInstallError("multiple-candidates", `"${sel}" matches several skills in ${opts.source}. Pick a path: ${matches.map((c) => c.rel).join(", ")}`, matches.map((c) => c.rel));
 				const match = matches[0];
 				byRel.set(match.rel, match);
 			}
@@ -1613,9 +1716,9 @@ async function installNatively(spec, skillSelector, opts) {
 		} else if (skillSelector) {
 			const matches = candidates.filter((c) => c.name === skillSelector || c.rel === skillSelector);
 			if (matches.length === 0) throw new SkillInstallError("no-skill", `No skill named "${skillSelector}" in ${opts.source}. Available: ${describeCandidates(candidates)}`, candidates.map((c) => c.rel));
-			if (matches.length > 1) throw new SkillInstallError("multiple-candidates", `"${skillSelector}" is ambiguous in ${opts.source} — pick a path: ${matches.map((c) => c.rel).join(", ")}`, matches.map((c) => c.rel));
+			if (matches.length > 1) throw new SkillInstallError("multiple-candidates", `"${skillSelector}" matches several skills in ${opts.source}. Pick a path: ${matches.map((c) => c.rel).join(", ")}`, matches.map((c) => c.rel));
 			picked = [matches[0]];
-		} else if (candidates.length > 1 && !opts.all) throw new SkillInstallError("multiple-candidates", `${opts.source} contains ${candidates.length} skills — pick one: ${describeCandidates(candidates)}`, candidates.map((c) => c.rel), await candidateDetails(candidates));
+		} else if (candidates.length > 1 && !opts.all) throw new SkillInstallError("multiple-candidates", `${opts.source} contains ${candidates.length} skills. Pick one: ${describeCandidates(candidates)}`, candidates.map((c) => c.rel), await candidateDetails(candidates));
 		else picked = [...candidates];
 		const root = scopeRoot(opts);
 		const installed = [];
@@ -1630,7 +1733,7 @@ async function installNatively(spec, skillSelector, opts) {
 			const conflict = nameToRel.get(name);
 			if (conflict !== void 0) {
 				failed.push(candidate.rel);
-				opts.onProgress?.(`skipping "${candidate.rel}" — name "${name}" conflicts with "${conflict}"`);
+				opts.onProgress?.(`skipped "${candidate.rel}": the name "${name}" conflicts with "${conflict}"`);
 				continue;
 			}
 			nameToRel.set(name, candidate.rel);
@@ -1641,7 +1744,7 @@ async function installNatively(spec, skillSelector, opts) {
 		} catch (err) {
 			if (!batch) throw err;
 			failed.push(candidate.rel);
-			opts.onProgress?.(`skipping "${candidate.rel}" — ${errorMessage(err)}`);
+			opts.onProgress?.(`skipped "${candidate.rel}": ${errorMessage(err)}`);
 		}
 		for (const { candidate, name } of resolved) {
 			const targetDir = join(root, name);
@@ -1649,7 +1752,7 @@ async function installNatively(spec, skillSelector, opts) {
 			if (existsSync(targetDir) && !opts.overwrite) {
 				if (batch) {
 					skipped.push(name);
-					opts.onProgress?.(`skipping "${name}" — already installed`);
+					opts.onProgress?.(`skipped "${name}": already installed`);
 					continue;
 				}
 				throw new SkillInstallError("exists", `Skill "${name}" is already installed at ${targetDir}. Overwrite to replace it.`);
@@ -1692,7 +1795,7 @@ async function installNatively(spec, skillSelector, opts) {
 			if (batch) opts.onProgress?.(`installed "${name}" (${installed.length}/${resolved.length})`);
 		}
 		if (installed.length === 0 && skipped.length > 0) throw new SkillInstallError("exists", `All ${skipped.length} installable skills from ${opts.source} are already installed: ${skipped.join(", ")}. Overwrite to replace them.`);
-		if (installed.length === 0 && failed.length > 0) throw new SkillInstallError("validate-failed", `No skill from ${opts.source} was installable — invalid: ${failed.join(", ")}.`);
+		if (installed.length === 0 && failed.length > 0) throw new SkillInstallError("validate-failed", `No skill from ${opts.source} could be installed. Invalid: ${failed.join(", ")}.`);
 		return {
 			installed,
 			...skipped.length > 0 ? { skipped } : {},
@@ -1829,149 +1932,6 @@ async function interpolateShellCommands(instructions, execution, handle, options
 	return result;
 }
 //#endregion
-//#region src/skills/writer.ts
-const YAML_RESERVED_RE = /[:#&*!|>%@`]/;
-const YAML_EDGE_OR_QUOTE_RE = /^\s|\s$|["']/;
-const DQUOTE_RE = /"/g;
-const LEADING_NEWLINES_RE = /^\n+/;
-function yamlEscape(value) {
-	if (YAML_RESERVED_RE.test(value) || YAML_EDGE_OR_QUOTE_RE.test(value) || value === "") return `"${value.replace(DQUOTE_RE, "\\\"")}"`;
-	return value;
-}
-function serializeFrontmatter(skill) {
-	const lines = ["---"];
-	lines.push(`name: ${yamlEscape(skill.name)}`);
-	lines.push(`description: ${yamlEscape(skill.description)}`);
-	if (skill.license) lines.push(`license: ${yamlEscape(skill.license)}`);
-	if (skill.compatibility) lines.push(`compatibility: ${yamlEscape(skill.compatibility)}`);
-	if (skill.allowedTools?.length) lines.push(`allowed-tools: ${skill.allowedTools.join(" ")}`);
-	if (skill.metadata && Object.keys(skill.metadata).length > 0) {
-		lines.push("metadata:");
-		for (const [key, value] of Object.entries(skill.metadata)) lines.push(`  ${key}: "${value.replace(DQUOTE_RE, "\\\"")}"`);
-	}
-	lines.push("---");
-	return lines.join("\n");
-}
-/**
-* Write a `SkillConfig` to disk as a proper skill directory with SKILL.md.
-* Returns the path to the written SKILL.md file.
-*
-* Throws if the skill fails `validateSkillForWrite` — the authoring path is
-* strict on purpose. For loading third-party skills, use `parseSkillFile`
-* directly (lenient).
-*/
-function writeSkillToDisk(skill, targetDir) {
-	const result = validateSkillForWrite(skill);
-	if (!result.valid) {
-		const summary = result.errors.map((e) => `  - [${e.code}] ${e.message}`).join("\n");
-		throw new Error(`Cannot write invalid skill "${skill.name}":\n${summary}`);
-	}
-	const skillDir = join(targetDir, skill.name);
-	mkdirSync(skillDir, { recursive: true });
-	const frontmatter = serializeFrontmatter(skill);
-	const bodyTrimmed = skill.instructions ? skill.instructions.replace(LEADING_NEWLINES_RE, "") : "";
-	const content = bodyTrimmed ? `${frontmatter}\n\n${bodyTrimmed}\n` : `${frontmatter}\n`;
-	const skillPath = join(skillDir, "SKILL.md");
-	writeFileSync(skillPath, content);
-	return skillPath;
-}
-/**
-* Write multiple `SkillConfig` objects to a target directory.
-* Each skill gets its own subdirectory with a SKILL.md file.
-* Returns the target directory path (for use as a scan path).
-*/
-function writeSkillsToDisk(skills, targetDir) {
-	mkdirSync(targetDir, { recursive: true });
-	for (const skill of skills) writeSkillToDisk(skill, targetDir);
-	return targetDir;
-}
-//#endregion
-//#region src/skills/resolve.ts
-/**
-* Resolve all skills from a SkillsConfig:
-*
-* 1. Materialize `config.write` entries to a temp directory, tagged as `inline`
-* 2. Combine with default + user-provided scan paths (project-first, user-next)
-* 3. Run lenient disk discovery
-* 4. Merge with any host-provided `config.catalog`. Catalog entries seed the
-*    resolution map FIRST, so they shadow disk-discovered skills with the
-*    same name (shadow diagnostic attached to the winner — same shape as
-*    the disk-vs-disk collision case).
-* 5. Apply filters: optional project-skill trust gate, `exclude`,
-*    `enabled` allowlist
-*
-* Returns `{ skills, cleanup }` — call `cleanup()` on agent destroy to remove
-* the temp directory created for inline `config.write` skills. The agent
-* factory wires this automatically; standalone callers must invoke it
-* themselves to avoid leaking OS temp.
-*/
-async function resolveSkills(config) {
-	const sourcedPaths = [];
-	let writeDir;
-	if (!config.skipDefaultPaths) sourcedPaths.push(...getDefaultScanPaths());
-	for (const p of config.scan ?? []) sourcedPaths.push({
-		path: p,
-		source: inferSource(p)
-	});
-	if (config.write?.length) {
-		writeDir = mkdtempSync(join(tmpdir(), "zidane-skills-"));
-		writeSkillsToDisk(config.write, writeDir);
-		sourcedPaths.push({
-			path: writeDir,
-			source: "inline"
-		});
-	}
-	const diskSkills = await discoverSkills(sourcedPaths);
-	const skillsByName = /* @__PURE__ */ new Map();
-	for (const entry of config.catalog ?? []) {
-		const winner = { ...entry };
-		const shadowed = skillsByName.get(entry.name);
-		if (shadowed) {
-			const diag = {
-				severity: "warning",
-				code: "name-collision-shadowed",
-				message: `A skill with name "${entry.name}" was also supplied in the catalog by ${shadowed.location ?? "(catalog)"} (source: ${shadowed.source ?? "inline"}); shadowed by ${winner.location ?? "(catalog)"} (source: ${winner.source ?? "inline"}).`
-			};
-			winner.diagnostics = [...winner.diagnostics ?? [], diag];
-		}
-		skillsByName.set(entry.name, winner);
-	}
-	for (const skill of diskSkills) {
-		const existing = skillsByName.get(skill.name);
-		if (existing) {
-			const loserLoc = skill.location ?? "(unknown)";
-			const winnerLoc = existing.location ?? "(catalog)";
-			const diag = {
-				severity: "warning",
-				code: "name-collision-shadowed",
-				message: `A skill with name "${skill.name}" was also found at ${loserLoc} (source: ${skill.source ?? "project"}); shadowed by ${winnerLoc} (source: ${existing.source ?? "inline"}).`
-			};
-			existing.diagnostics = [...existing.diagnostics ?? [], diag];
-			continue;
-		}
-		skillsByName.set(skill.name, skill);
-	}
-	let skills = [...skillsByName.values()];
-	if (config.trustProjectSkills === false) skills = skills.filter((s) => s.source !== void 0 && s.source !== "project");
-	const exclude = new Set(config.exclude ?? []);
-	let filtered = skills.filter((s) => !exclude.has(s.name));
-	if (Array.isArray(config.enabled)) {
-		const allowlist = new Set(config.enabled);
-		filtered = filtered.filter((s) => allowlist.has(s.name));
-	}
-	return {
-		skills: filtered,
-		cleanup: writeDir ? () => {
-			try {
-				rmSync(writeDir, {
-					recursive: true,
-					force: true
-				});
-			} catch {}
-		} : () => {}
-	};
-}
-//#endregion
 //#region src/skills/index.ts
 /**
 * Define an inline skill configuration.
@@ -1992,6 +1952,6 @@ function defineSkill(config) {
 	return normalized;
 }
 //#endregion
-export { isToolAllowedByUnion as A, inferSource as C, IMPLICITLY_ALLOWED_SKILL_TOOLS as D, buildCatalog as E, validateSkillForWrite as F, validateSkillName as I, projectUserPaths as L, parseAllowedToolPattern as M, validateResourcePath as N, installAllowedToolsGate as O, validateResourcePathReal as P, findGitRoot as R, getDefaultScanPaths as S, parseSkillFile as T, lastLine as _, interpolateShellCommands as a, resolveSubdirRoot as b, SkillInstallError as c, parseSkillInstallSpec as d, readSkillProvenance as f, fetchInstallSource as g, defaultWhich as h, writeSkillsToDisk as i, matchesAllowedTool as j, createSkillActivationState as k, installSkillFromSpec as l, defaultExec as m, resolveSkills as n, stripShellInterpolations as o, InstallSourceError as p, writeSkillToDisk as r, SKILL_PROVENANCE_FILE as s, defineSkill as t, listSkillCandidates as u, parseInstallSource as v, parseFrontmatter as w, discoverSkills as x, resolveNpmVersion as y };
+export { parseSkillFile as A, writeSkillToDisk as C, inferSource as D, getDefaultScanPaths as E, validateResourcePathReal as F, validateSkillForWrite as I, validateSkillName as L, matchesAllowedTool as M, parseAllowedToolPattern as N, parseFrontmatter as O, validateResourcePath as P, buildCatalog as R, resolveSkills as S, discoverSkills as T, resolveNpmVersion as _, SkillInstallError as a, installAllowedToolsGate as b, parseSkillInstallSpec as c, abortableInstallIo as d, defaultExec as f, parseInstallSource as g, lastLine as h, SKILL_PROVENANCE_FILE as i, isToolAllowedByUnion as j, parseSkillContent as k, readSkillProvenance as l, fetchInstallSource as m, interpolateShellCommands as n, installSkillFromSpec as o, defaultWhich as p, stripShellInterpolations as r, listSkillCandidates as s, defineSkill as t, InstallSourceError as u, resolveSubdirRoot as v, writeSkillsToDisk as w, createSkillActivationState as x, IMPLICITLY_ALLOWED_SKILL_TOOLS as y };
 
-//# sourceMappingURL=skills-BC3dodWp.js.map
+//# sourceMappingURL=skills-DKqZJm4X.js.map