skills 1.4.1 → 1.4.3

package/README.md

@@ -214,7 +214,7 @@ Skills can be installed to any of these agents:
 | Augment | `augment` | `.augment/skills/` | `~/.augment/skills/` |
 | Claude Code | `claude-code` | `.claude/skills/` | `~/.claude/skills/` |
 | OpenClaw | `openclaw` | `skills/` | `~/.openclaw/skills/` |
-| Cline | `cline` | `.cline/skills/` | `~/.cline/skills/` |
+| Cline | `cline` | `.agents/skills/` | `~/.agents/skills/` |
 | CodeBuddy | `codebuddy` | `.codebuddy/skills/` | `~/.codebuddy/skills/` |
 | Codex | `codex` | `.agents/skills/` | `~/.codex/skills/` |
 | Command Code | `command-code` | `.commandcode/skills/` | `~/.commandcode/skills/` |
@@ -321,7 +321,6 @@ The CLI searches for skills in these locations within a repository:
 - `.augment/skills/`
 - `.claude/skills/`
 - `./skills/`
-- `.cline/skills/`
 - `.codebuddy/skills/`
 - `.commandcode/skills/`
 - `.continue/skills/`

package/dist/_chunks/libs/@clack/prompts.mjs

@@ -129,6 +129,65 @@ ${s}
 				}).join(`
 ${import_picocolors.default.cyan(o)}  `)}
 ${import_picocolors.default.cyan(d)}
+`;
+			}
+		}
+	}).prompt();
+}, be = (t) => {
+	const { selectableGroups: n = !0 } = t, r = (i, s, c = []) => {
+		const a = i.label ?? String(i.value), l = typeof i.group == "string", $ = l && (c[c.indexOf(i) + 1] ?? { group: !0 }), g = l && $.group === !0, p = l ? n ? `${g ? d : o} ` : "  " : "";
+		if (s === "active") return `${import_picocolors.default.dim(p)}${import_picocolors.default.cyan(A)} ${a} ${i.hint ? import_picocolors.default.dim(`(${i.hint})`) : ""}`;
+		if (s === "group-active") return `${p}${import_picocolors.default.cyan(A)} ${import_picocolors.default.dim(a)}`;
+		if (s === "group-active-selected") return `${p}${import_picocolors.default.green(T)} ${import_picocolors.default.dim(a)}`;
+		if (s === "selected") {
+			const f = l || n ? import_picocolors.default.green(T) : "";
+			return `${import_picocolors.default.dim(p)}${f} ${import_picocolors.default.dim(a)} ${i.hint ? import_picocolors.default.dim(`(${i.hint})`) : ""}`;
+		}
+		if (s === "cancelled") return `${import_picocolors.default.strikethrough(import_picocolors.default.dim(a))}`;
+		if (s === "active-selected") return `${import_picocolors.default.dim(p)}${import_picocolors.default.green(T)} ${a} ${i.hint ? import_picocolors.default.dim(`(${i.hint})`) : ""}`;
+		if (s === "submitted") return `${import_picocolors.default.dim(a)}`;
+		const v = l || n ? import_picocolors.default.dim(F) : "";
+		return `${import_picocolors.default.dim(p)}${v} ${import_picocolors.default.dim(a)}`;
+	};
+	return new _D({
+		options: t.options,
+		initialValues: t.initialValues,
+		required: t.required ?? !0,
+		cursorAt: t.cursorAt,
+		selectableGroups: n,
+		validate(i) {
+			if (this.required && i.length === 0) return `Please select at least one option.
+${import_picocolors.default.reset(import_picocolors.default.dim(`Press ${import_picocolors.default.gray(import_picocolors.default.bgWhite(import_picocolors.default.inverse(" space ")))} to select, ${import_picocolors.default.gray(import_picocolors.default.bgWhite(import_picocolors.default.inverse(" enter ")))} to submit`))}`;
+		},
+		render() {
+			const i = `${import_picocolors.default.gray(o)}
+${b(this.state)}  ${t.message}
+`;
+			switch (this.state) {
+				case "submit": return `${i}${import_picocolors.default.gray(o)}  ${this.options.filter(({ value: s }) => this.value.includes(s)).map((s) => r(s, "submitted")).join(import_picocolors.default.dim(", "))}`;
+				case "cancel": {
+					const s = this.options.filter(({ value: c }) => this.value.includes(c)).map((c) => r(c, "cancelled")).join(import_picocolors.default.dim(", "));
+					return `${i}${import_picocolors.default.gray(o)}  ${s.trim() ? `${s}
+${import_picocolors.default.gray(o)}` : ""}`;
+				}
+				case "error": {
+					const s = this.error.split(`
+`).map((c, a) => a === 0 ? `${import_picocolors.default.yellow(d)}  ${import_picocolors.default.yellow(c)}` : `   ${c}`).join(`
+`);
+					return `${i}${import_picocolors.default.yellow(o)}  ${this.options.map((c, a, l) => {
+						const $ = this.value.includes(c.value) || c.group === !0 && this.isGroupSelected(`${c.value}`), g = a === this.cursor;
+						return !g && typeof c.group == "string" && this.options[this.cursor].value === c.group ? r(c, $ ? "group-active-selected" : "group-active", l) : g && $ ? r(c, "active-selected", l) : $ ? r(c, "selected", l) : r(c, g ? "active" : "inactive", l);
+					}).join(`
+${import_picocolors.default.yellow(o)}  `)}
+${s}
+`;
+				}
+				default: return `${i}${import_picocolors.default.cyan(o)}  ${this.options.map((s, c, a) => {
+					const l = this.value.includes(s.value) || s.group === !0 && this.isGroupSelected(`${s.value}`), $ = c === this.cursor;
+					return !$ && typeof s.group == "string" && this.options[this.cursor].value === s.group ? r(s, l ? "group-active-selected" : "group-active", a) : $ && l ? r(s, "active-selected", a) : l ? r(s, "selected", a) : r(s, $ ? "active" : "inactive", a);
+				}).join(`
+${import_picocolors.default.cyan(o)}  `)}
+${import_picocolors.default.cyan(d)}
 `;
 			}
 		}
@@ -272,4 +331,4 @@ ${J}${i.trimStart()}`), r = 3 + stripVTControlCharacters(i.trimStart()).length);
 		}
 	};
 };
-export { Y as a, xe as c, Se as i, ye as l, M as n, fe as o, Me as r, ve as s, Ie as t };
+export { Y as a, ve as c, Se as i, xe as l, M as n, be as o, Me as r, fe as s, Ie as t, ye as u };

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { r as __toESM } from "./_chunks/rolldown-runtime.mjs";
 import { l as pD, u as require_picocolors } from "./_chunks/libs/@clack/core.mjs";
-import { a as Y, c as xe, i as Se, l as ye, n as M, o as fe, r as Me, s as ve, t as Ie } from "./_chunks/libs/@clack/prompts.mjs";
+import { a as Y, c as ve, i as Se, l as xe, n as M, o as be, r as Me, s as fe, t as Ie, u as ye } from "./_chunks/libs/@clack/prompts.mjs";
 import "./_chunks/libs/@kwsites/file-exists.mjs";
 import "./_chunks/libs/@kwsites/promise-deferred.mjs";
 import { t as esm_default } from "./_chunks/libs/simple-git.mjs";
@@ -49,15 +49,6 @@ async function isRepoPrivate(owner, repo) {
 function isLocalPath(input) {
 	return isAbsolute(input) || input.startsWith("./") || input.startsWith("../") || input === "." || input === ".." || /^[a-zA-Z]:[/\\]/.test(input);
 }
-function isDirectSkillUrl(input) {
-	if (!input.startsWith("http://") && !input.startsWith("https://")) return false;
-	if (!input.toLowerCase().endsWith("/skill.md")) return false;
-	if (input.includes("github.com/") && !input.includes("raw.githubusercontent.com")) {
-		if (!input.includes("/blob/") && !input.includes("/raw/")) return false;
-	}
-	if (input.includes("gitlab.com/") && !input.includes("/-/raw/")) return false;
-	return true;
-}
 const SOURCE_ALIASES = { "coinbase/agentWallet": "coinbase/agentic-wallet-skills" };
 function parseSource(input) {
 	const alias = SOURCE_ALIASES[input];
@@ -70,10 +61,6 @@ function parseSource(input) {
 			localPath: resolvedPath
 		};
 	}
-	if (isDirectSkillUrl(input)) return {
-		type: "direct-url",
-		url: input
-	};
 	const githubTreeWithPathMatch = input.match(/github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)\/(.+)/);
 	if (githubTreeWithPathMatch) {
 		const [, owner, repo, ref, subpath] = githubTreeWithPathMatch;
@@ -162,10 +149,8 @@ function isWellKnownUrl(input) {
 		if ([
 			"github.com",
 			"gitlab.com",
-			"huggingface.co",
 			"raw.githubusercontent.com"
 		].includes(parsed.hostname)) return false;
-		if (input.toLowerCase().endsWith("/skill.md")) return false;
 		if (input.endsWith(".git")) return false;
 		return true;
 	} catch {
@@ -424,6 +409,36 @@ async function getPluginSkillPaths(basePath) {
 	} catch {}
 	return searchDirs;
 }
+async function getPluginGroupings(basePath) {
+	const groupings = /* @__PURE__ */ new Map();
+	try {
+		const content = await readFile(join(basePath, ".claude-plugin/marketplace.json"), "utf-8");
+		const manifest = JSON.parse(content);
+		const pluginRoot = manifest.metadata?.pluginRoot;
+		if (pluginRoot === void 0 || isValidRelativePath(pluginRoot)) for (const plugin of manifest.plugins ?? []) {
+			if (!plugin.name) continue;
+			if (typeof plugin.source !== "string" && plugin.source !== void 0) continue;
+			if (plugin.source !== void 0 && !isValidRelativePath(plugin.source)) continue;
+			const pluginBase = join(basePath, pluginRoot ?? "", plugin.source ?? "");
+			if (!isContainedIn(pluginBase, basePath)) continue;
+			if (plugin.skills && plugin.skills.length > 0) for (const skillPath of plugin.skills) {
+				if (!isValidRelativePath(skillPath)) continue;
+				const skillDir = join(pluginBase, skillPath);
+				if (isContainedIn(skillDir, basePath)) groupings.set(resolve(skillDir), plugin.name);
+			}
+		}
+	} catch {}
+	try {
+		const content = await readFile(join(basePath, ".claude-plugin/plugin.json"), "utf-8");
+		const manifest = JSON.parse(content);
+		if (manifest.name && manifest.skills && manifest.skills.length > 0) for (const skillPath of manifest.skills) {
+			if (!isValidRelativePath(skillPath)) continue;
+			const skillDir = join(basePath, skillPath);
+			if (isContainedIn(skillDir, basePath)) groupings.set(resolve(skillDir), manifest.name);
+		}
+	} catch {}
+	return groupings;
+}
 const SKIP_DIRS = [
 	"node_modules",
 	".git",
@@ -475,9 +490,16 @@ async function discoverSkills(basePath, subpath, options) {
 	const skills = [];
 	const seenNames = /* @__PURE__ */ new Set();
 	const searchPath = subpath ? join(basePath, subpath) : basePath;
+	const pluginGroupings = await getPluginGroupings(searchPath);
+	const enhanceSkill = (skill) => {
+		const resolvedPath = resolve(skill.path);
+		if (pluginGroupings.has(resolvedPath)) skill.pluginName = pluginGroupings.get(resolvedPath);
+		return skill;
+	};
 	if (await hasSkillMd(searchPath)) {
-		const skill = await parseSkillMd(join(searchPath, "SKILL.md"), options);
+		let skill = await parseSkillMd(join(searchPath, "SKILL.md"), options);
 		if (skill) {
+			skill = enhanceSkill(skill);
 			skills.push(skill);
 			seenNames.add(skill.name);
 			if (!options?.fullDepth) return skills;
@@ -520,8 +542,9 @@ async function discoverSkills(basePath, subpath, options) {
 		for (const entry of entries) if (entry.isDirectory()) {
 			const skillDir = join(dir, entry.name);
 			if (await hasSkillMd(skillDir)) {
-				const skill = await parseSkillMd(join(skillDir, "SKILL.md"), options);
+				let skill = await parseSkillMd(join(skillDir, "SKILL.md"), options);
 				if (skill && !seenNames.has(skill.name)) {
+					skill = enhanceSkill(skill);
 					skills.push(skill);
 					seenNames.add(skill.name);
 				}
@@ -531,8 +554,9 @@ async function discoverSkills(basePath, subpath, options) {
 	if (skills.length === 0 || options?.fullDepth) {
 		const allSkillDirs = await findSkillDirs(searchPath);
 		for (const skillDir of allSkillDirs) {
-			const skill = await parseSkillMd(join(skillDir, "SKILL.md"), options);
+			let skill = await parseSkillMd(join(skillDir, "SKILL.md"), options);
 			if (skill && !seenNames.has(skill.name)) {
+				skill = enhanceSkill(skill);
 				skills.push(skill);
 				seenNames.add(skill.name);
 			}
@@ -610,8 +634,8 @@ const agents = {
 	cline: {
 		name: "cline",
 		displayName: "Cline",
-		skillsDir: ".cline/skills",
-		globalSkillsDir: join(home, ".cline/skills"),
+		skillsDir: ".agents/skills",
+		globalSkillsDir: join(home, ".agents", "skills"),
 		detectInstalled: async () => {
 			return existsSync(join(home, ".cline"));
 		}
@@ -1140,78 +1164,6 @@ function getCanonicalPath(skillName, options = {}) {
 	if (!isPathSafe(canonicalBase, canonicalPath)) throw new Error("Invalid skill name: potential path traversal detected");
 	return canonicalPath;
 }
-async function installRemoteSkillForAgent(skill, agentType, options = {}) {
-	const agent = agents[agentType];
-	const isGlobal = options.global ?? false;
-	const cwd = options.cwd || process.cwd();
-	const installMode = options.mode ?? "symlink";
-	if (isGlobal && agent.globalSkillsDir === void 0) return {
-		success: false,
-		path: "",
-		mode: installMode,
-		error: `${agent.displayName} does not support global skill installation`
-	};
-	const skillName = sanitizeName(skill.installName);
-	const canonicalBase = getCanonicalSkillsDir(isGlobal, cwd);
-	const canonicalDir = join(canonicalBase, skillName);
-	const agentBase = getAgentBaseDir(agentType, isGlobal, cwd);
-	const agentDir = join(agentBase, skillName);
-	if (!isPathSafe(canonicalBase, canonicalDir)) return {
-		success: false,
-		path: agentDir,
-		mode: installMode,
-		error: "Invalid skill name: potential path traversal detected"
-	};
-	if (!isPathSafe(agentBase, agentDir)) return {
-		success: false,
-		path: agentDir,
-		mode: installMode,
-		error: "Invalid skill name: potential path traversal detected"
-	};
-	try {
-		if (installMode === "copy") {
-			await cleanAndCreateDirectory(agentDir);
-			await writeFile(join(agentDir, "SKILL.md"), skill.content, "utf-8");
-			return {
-				success: true,
-				path: agentDir,
-				mode: "copy"
-			};
-		}
-		await cleanAndCreateDirectory(canonicalDir);
-		await writeFile(join(canonicalDir, "SKILL.md"), skill.content, "utf-8");
-		if (isGlobal && isUniversalAgent(agentType)) return {
-			success: true,
-			path: canonicalDir,
-			canonicalPath: canonicalDir,
-			mode: "symlink"
-		};
-		if (!await createSymlink(canonicalDir, agentDir)) {
-			await cleanAndCreateDirectory(agentDir);
-			await writeFile(join(agentDir, "SKILL.md"), skill.content, "utf-8");
-			return {
-				success: true,
-				path: agentDir,
-				canonicalPath: canonicalDir,
-				mode: "symlink",
-				symlinkFailed: true
-			};
-		}
-		return {
-			success: true,
-			path: agentDir,
-			canonicalPath: canonicalDir,
-			mode: "symlink"
-		};
-	} catch (error) {
-		return {
-			success: false,
-			path: agentDir,
-			mode: installMode,
-			error: error instanceof Error ? error.message : "Unknown error"
-		};
-	}
-}
 async function installWellKnownSkillForAgent(skill, agentType, options = {}) {
 	const agent = agents[agentType];
 	const isGlobal = options.global ?? false;
@@ -1456,108 +1408,7 @@ var ProviderRegistryImpl = class {
 		return [...this.providers];
 	}
 };
-const registry = new ProviderRegistryImpl();
-function registerProvider(provider) {
-	registry.register(provider);
-}
-function findProvider(url) {
-	return registry.findProvider(url);
-}
-var MintlifyProvider = class {
-	id = "mintlify";
-	displayName = "Mintlify";
-	match(url) {
-		if (!url.startsWith("http://") && !url.startsWith("https://")) return { matches: false };
-		if (!url.toLowerCase().endsWith("/skill.md")) return { matches: false };
-		if (url.includes("github.com") || url.includes("gitlab.com")) return { matches: false };
-		if (url.includes("huggingface.co")) return { matches: false };
-		return { matches: true };
-	}
-	async fetchSkill(url) {
-		try {
-			const response = await fetch(url, { signal: AbortSignal.timeout(3e4) });
-			if (!response.ok) return null;
-			const content = await response.text();
-			const { data } = (0, import_gray_matter.default)(content);
-			const mintlifySite = data.metadata?.["mintlify-proj"];
-			if (!mintlifySite) return null;
-			if (!data.name || !data.description) return null;
-			return {
-				name: data.name,
-				description: data.description,
-				content,
-				installName: mintlifySite,
-				sourceUrl: url,
-				metadata: data.metadata
-			};
-		} catch {
-			return null;
-		}
-	}
-	toRawUrl(url) {
-		return url;
-	}
-	getSourceIdentifier(url) {
-		return "mintlify/com";
-	}
-};
-const mintlifyProvider = new MintlifyProvider();
-var HuggingFaceProvider = class {
-	id = "huggingface";
-	displayName = "HuggingFace";
-	HOST = "huggingface.co";
-	match(url) {
-		if (!url.startsWith("http://") && !url.startsWith("https://")) return { matches: false };
-		try {
-			if (new URL(url).hostname !== this.HOST) return { matches: false };
-		} catch {
-			return { matches: false };
-		}
-		if (!url.toLowerCase().endsWith("/skill.md")) return { matches: false };
-		if (!url.includes("/spaces/")) return { matches: false };
-		return { matches: true };
-	}
-	async fetchSkill(url) {
-		try {
-			const rawUrl = this.toRawUrl(url);
-			const response = await fetch(rawUrl, { signal: AbortSignal.timeout(3e4) });
-			if (!response.ok) return null;
-			const content = await response.text();
-			const { data } = (0, import_gray_matter.default)(content);
-			if (!data.name || !data.description) return null;
-			const parsed = this.parseUrl(url);
-			if (!parsed) return null;
-			const installName = data.metadata?.["install-name"] || parsed.repo;
-			return {
-				name: data.name,
-				description: data.description,
-				content,
-				installName,
-				sourceUrl: url,
-				metadata: data.metadata
-			};
-		} catch {
-			return null;
-		}
-	}
-	toRawUrl(url) {
-		return url.replace("/blob/", "/raw/");
-	}
-	getSourceIdentifier(url) {
-		const parsed = this.parseUrl(url);
-		if (!parsed) return "huggingface/unknown";
-		return `huggingface/${parsed.owner}/${parsed.repo}`;
-	}
-	parseUrl(url) {
-		const match = url.match(/\/spaces\/([^/]+)\/([^/]+)/);
-		if (!match || !match[1] || !match[2]) return null;
-		return {
-			owner: match[1],
-			repo: match[2]
-		};
-	}
-};
-const huggingFaceProvider = new HuggingFaceProvider();
+new ProviderRegistryImpl();
 var WellKnownProvider = class {
 	id = "well-known";
 	displayName = "Well-Known Skills";
@@ -1714,15 +1565,9 @@ var WellKnownProvider = class {
 	}
 	getSourceIdentifier(url) {
 		try {
-			const parsed = new URL(url);
-			const hostParts = parsed.hostname.split(".");
-			if (hostParts.length >= 2) {
-				const tld = hostParts[hostParts.length - 1];
-				return `${hostParts[hostParts.length - 2]}/${tld}`;
-			}
-			return parsed.hostname.replace(".", "/");
+			return new URL(url).hostname.replace(/^www\./, "");
 		} catch {
-			return "unknown/unknown";
+			return "unknown";
 		}
 	}
 	async hasSkillsIndex(url) {
@@ -1730,28 +1575,6 @@ var WellKnownProvider = class {
 	}
 };
 const wellKnownProvider = new WellKnownProvider();
-registerProvider(mintlifyProvider);
-registerProvider(huggingFaceProvider);
-async function fetchMintlifySkill(url) {
-	try {
-		const response = await fetch(url, { signal: AbortSignal.timeout(3e4) });
-		if (!response.ok) return null;
-		const content = await response.text();
-		const { data } = (0, import_gray_matter.default)(content);
-		const mintlifySite = data.metadata?.["mintlify-proj"];
-		if (!mintlifySite) return null;
-		if (!data.name || !data.description) return null;
-		return {
-			name: data.name,
-			description: data.description,
-			content,
-			mintlifySite,
-			sourceUrl: url
-		};
-	} catch {
-		return null;
-	}
-}
 const AGENTS_DIR$1 = ".agents";
 const LOCK_FILE$1 = ".skill-lock.json";
 const CURRENT_VERSION$1 = 3;
@@ -1835,6 +1658,9 @@ async function removeSkillFromLock(skillName) {
 async function getSkillFromLock(skillName) {
 	return (await readSkillLock$1()).skills[skillName] ?? null;
 }
+async function getAllLockedSkills() {
+	return (await readSkillLock$1()).skills;
+}
 function createEmptyLockFile() {
 	return {
 		version: CURRENT_VERSION$1,
@@ -1925,7 +1751,7 @@ function createEmptyLocalLock() {
 		skills: {}
 	};
 }
-var version$1 = "1.4.1";
+var version$1 = "1.4.3";
 const isCancelled$1 = (value) => typeof value === "symbol";
 async function isSourcePrivate(source) {
 	const ownerRepo = parseOwnerRepo(source);
@@ -2091,232 +1917,6 @@ async function selectAgentsInteractive(options) {
 	return selected;
 }
 setVersion(version$1);
-async function handleRemoteSkill(source, url, options, spinner) {
-	const provider = findProvider(url);
-	if (!provider) {
-		await handleDirectUrlSkillLegacy(source, url, options, spinner);
-		return;
-	}
-	spinner.start(`Fetching skill.md from ${provider.displayName}...`);
-	const providerSkill = await provider.fetchSkill(url);
-	if (!providerSkill) {
-		spinner.stop(import_picocolors.default.red("Invalid skill"));
-		Se(import_picocolors.default.red("Could not fetch skill.md or missing required frontmatter (name, description)."));
-		process.exit(1);
-	}
-	const remoteSkill = {
-		name: providerSkill.name,
-		description: providerSkill.description,
-		content: providerSkill.content,
-		installName: providerSkill.installName,
-		sourceUrl: providerSkill.sourceUrl,
-		providerId: provider.id,
-		sourceIdentifier: provider.getSourceIdentifier(url),
-		metadata: providerSkill.metadata
-	};
-	spinner.stop(`Found skill: ${import_picocolors.default.cyan(remoteSkill.installName)}`);
-	M.info(`Skill: ${import_picocolors.default.cyan(remoteSkill.name)}`);
-	M.message(import_picocolors.default.dim(remoteSkill.description));
-	M.message(import_picocolors.default.dim(`Source: ${remoteSkill.sourceIdentifier}`));
-	if (options.list) {
-		console.log();
-		M.step(import_picocolors.default.bold("Skill Details"));
-		M.message(`  ${import_picocolors.default.cyan("Name:")} ${remoteSkill.name}`);
-		M.message(`  ${import_picocolors.default.cyan("Install as:")} ${remoteSkill.installName}`);
-		M.message(`  ${import_picocolors.default.cyan("Provider:")} ${provider.displayName}`);
-		M.message(`  ${import_picocolors.default.cyan("Description:")} ${remoteSkill.description}`);
-		console.log();
-		Se("Run without --list to install");
-		process.exit(0);
-	}
-	let targetAgents;
-	const validAgents = Object.keys(agents);
-	const universalAgents = getUniversalAgents();
-	if (options.agent?.includes("*")) {
-		targetAgents = validAgents;
-		M.info(`Installing to all ${targetAgents.length} agents`);
-	} else if (options.agent && options.agent.length > 0) {
-		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
-		if (invalidAgents.length > 0) {
-			M.error(`Invalid agents: ${invalidAgents.join(", ")}`);
-			M.info(`Valid agents: ${validAgents.join(", ")}`);
-			process.exit(1);
-		}
-		targetAgents = options.agent;
-	} else {
-		spinner.start("Loading agents...");
-		const installedAgents = await detectInstalledAgents();
-		const totalAgents = Object.keys(agents).length;
-		spinner.stop(`${totalAgents} agents`);
-		if (installedAgents.length === 0) if (options.yes) {
-			targetAgents = universalAgents;
-			M.info(`Installing to universal agents`);
-		} else {
-			const selected = await selectAgentsInteractive({ global: options.global });
-			if (pD(selected)) {
-				xe("Installation cancelled");
-				process.exit(0);
-			}
-			targetAgents = selected;
-		}
-		else if (installedAgents.length === 1 || options.yes) {
-			targetAgents = ensureUniversalAgents(installedAgents);
-			const { universal, symlinked } = splitAgentsByType(targetAgents);
-			if (symlinked.length > 0) M.info(`Installing to: ${import_picocolors.default.green("universal")} + ${symlinked.map((a) => import_picocolors.default.cyan(a)).join(", ")}`);
-			else M.info(`Installing to: ${import_picocolors.default.green("universal agents")}`);
-		} else {
-			const selected = await selectAgentsInteractive({ global: options.global });
-			if (pD(selected)) {
-				xe("Installation cancelled");
-				process.exit(0);
-			}
-			targetAgents = selected;
-		}
-	}
-	let installGlobally = options.global ?? false;
-	const supportsGlobal = targetAgents.some((a) => agents[a].globalSkillsDir !== void 0);
-	if (options.global === void 0 && !options.yes && supportsGlobal) {
-		const scope = await ve({
-			message: "Installation scope",
-			options: [{
-				value: false,
-				label: "Project",
-				hint: "Install in current directory (committed with your project)"
-			}, {
-				value: true,
-				label: "Global",
-				hint: "Install in home directory (available across all projects)"
-			}]
-		});
-		if (pD(scope)) {
-			xe("Installation cancelled");
-			process.exit(0);
-		}
-		installGlobally = scope;
-	}
-	let installMode = options.copy ? "copy" : "symlink";
-	if (!options.copy && !options.yes) {
-		const modeChoice = await ve({
-			message: "Installation method",
-			options: [{
-				value: "symlink",
-				label: "Symlink (Recommended)",
-				hint: "Single source of truth, easy updates"
-			}, {
-				value: "copy",
-				label: "Copy to all agents",
-				hint: "Independent copies for each agent"
-			}]
-		});
-		if (pD(modeChoice)) {
-			xe("Installation cancelled");
-			process.exit(0);
-		}
-		installMode = modeChoice;
-	}
-	const cwd = process.cwd();
-	const overwriteChecks = await Promise.all(targetAgents.map(async (agent) => ({
-		agent,
-		installed: await isSkillInstalled(remoteSkill.installName, agent, { global: installGlobally })
-	})));
-	const overwriteStatus = new Map(overwriteChecks.map(({ agent, installed }) => [agent, installed]));
-	const summaryLines = [];
-	const shortCanonical = shortenPath$2(getCanonicalPath(remoteSkill.installName, { global: installGlobally }), cwd);
-	summaryLines.push(`${import_picocolors.default.cyan(shortCanonical)}`);
-	summaryLines.push(...buildAgentSummaryLines(targetAgents, installMode));
-	const overwriteAgents = targetAgents.filter((a) => overwriteStatus.get(a)).map((a) => agents[a].displayName);
-	if (overwriteAgents.length > 0) summaryLines.push(`  ${import_picocolors.default.yellow("overwrites:")} ${formatList$1(overwriteAgents)}`);
-	console.log();
-	Me(summaryLines.join("\n"), "Installation Summary");
-	if (!options.yes) {
-		const confirmed = await ye({ message: "Proceed with installation?" });
-		if (pD(confirmed) || !confirmed) {
-			xe("Installation cancelled");
-			process.exit(0);
-		}
-	}
-	spinner.start("Installing skill...");
-	const results = [];
-	for (const agent of targetAgents) {
-		const result = await installRemoteSkillForAgent(remoteSkill, agent, {
-			global: installGlobally,
-			mode: installMode
-		});
-		results.push({
-			skill: remoteSkill.installName,
-			agent: agents[agent].displayName,
-			...result
-		});
-	}
-	spinner.stop("Installation complete");
-	console.log();
-	const successful = results.filter((r) => r.success);
-	const failed = results.filter((r) => !r.success);
-	if (await isSourcePrivate(remoteSkill.sourceIdentifier) !== true) track({
-		event: "install",
-		source: remoteSkill.sourceIdentifier,
-		skills: remoteSkill.installName,
-		agents: targetAgents.join(","),
-		...installGlobally && { global: "1" },
-		skillFiles: JSON.stringify({ [remoteSkill.installName]: url }),
-		sourceType: remoteSkill.providerId
-	});
-	if (successful.length > 0 && installGlobally) try {
-		let skillFolderHash = "";
-		if (remoteSkill.providerId === "github") {
-			const hash = await fetchSkillFolderHash(remoteSkill.sourceIdentifier, url);
-			if (hash) skillFolderHash = hash;
-		}
-		await addSkillToLock(remoteSkill.installName, {
-			source: remoteSkill.sourceIdentifier,
-			sourceType: remoteSkill.providerId,
-			sourceUrl: url,
-			skillFolderHash
-		});
-	} catch {}
-	if (successful.length > 0 && !installGlobally) try {
-		const firstResult = successful[0];
-		const computedHash = await computeSkillFolderHash(firstResult.canonicalPath || firstResult.path);
-		await addSkillToLocalLock(remoteSkill.installName, {
-			source: remoteSkill.sourceIdentifier,
-			sourceType: remoteSkill.providerId,
-			computedHash
-		}, cwd);
-	} catch {}
-	if (successful.length > 0) {
-		const resultLines = [];
-		const firstResult = successful[0];
-		if (firstResult.mode === "copy") {
-			resultLines.push(`${import_picocolors.default.green("✓")} ${remoteSkill.installName} ${import_picocolors.default.dim("(copied)")}`);
-			for (const r of successful) {
-				const shortPath = shortenPath$2(r.path, cwd);
-				resultLines.push(`  ${import_picocolors.default.dim("→")} ${shortPath}`);
-			}
-		} else {
-			if (firstResult.canonicalPath) {
-				const shortPath = shortenPath$2(firstResult.canonicalPath, cwd);
-				resultLines.push(`${import_picocolors.default.green("✓")} ${shortPath}`);
-			} else resultLines.push(`${import_picocolors.default.green("✓")} ${remoteSkill.installName}`);
-			resultLines.push(...buildResultLines(successful, targetAgents));
-		}
-		const title = import_picocolors.default.green("Installed 1 skill");
-		Me(resultLines.join("\n"), title);
-		const symlinkFailures = successful.filter((r) => r.mode === "symlink" && r.symlinkFailed);
-		if (symlinkFailures.length > 0) {
-			const copiedAgentNames = symlinkFailures.map((r) => r.agent);
-			M.warn(import_picocolors.default.yellow(`Symlinks failed for: ${formatList$1(copiedAgentNames)}`));
-			M.message(import_picocolors.default.dim("  Files were copied instead. On Windows, enable Developer Mode for symlink support."));
-		}
-	}
-	if (failed.length > 0) {
-		console.log();
-		M.error(import_picocolors.default.red(`Failed to install ${failed.length}`));
-		for (const r of failed) M.message(`  ${import_picocolors.default.red("✗")} ${r.skill} → ${r.agent}: ${import_picocolors.default.dim(r.error)}`);
-	}
-	console.log();
-	Se(import_picocolors.default.green("Done!") + import_picocolors.default.dim("  Review skills before use; they run with full agent permissions."));
-	await promptForFindSkills(options, targetAgents);
-}
 async function handleWellKnownSkills(source, url, options, spinner) {
 	spinner.start("Discovering skills from well-known endpoint...");
 	const skills = await wellKnownProvider.fetchAllSkills(url);
@@ -2355,7 +1955,6 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 			for (const s of skills) M.message(`  - ${s.installName}`);
 			process.exit(1);
 		}
-		M.info(`Selected ${selectedSkills.length} skill${selectedSkills.length !== 1 ? "s" : ""}: ${selectedSkills.map((s) => import_picocolors.default.cyan(s.installName)).join(", ")}`);
 	} else if (skills.length === 1) {
 		selectedSkills = skills;
 		const firstSkill = skills[0];
@@ -2598,188 +2197,6 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 	Se(import_picocolors.default.green("Done!") + import_picocolors.default.dim("  Review skills before use; they run with full agent permissions."));
 	await promptForFindSkills(options, targetAgents);
 }
-async function handleDirectUrlSkillLegacy(source, url, options, spinner) {
-	spinner.start("Fetching skill.md...");
-	const mintlifySkill = await fetchMintlifySkill(url);
-	if (!mintlifySkill) {
-		spinner.stop(import_picocolors.default.red("Invalid skill"));
-		Se(import_picocolors.default.red("Could not fetch skill.md or missing required frontmatter (name, description, mintlify-proj)."));
-		process.exit(1);
-	}
-	const remoteSkill = {
-		name: mintlifySkill.name,
-		description: mintlifySkill.description,
-		content: mintlifySkill.content,
-		installName: mintlifySkill.mintlifySite,
-		sourceUrl: mintlifySkill.sourceUrl,
-		providerId: "mintlify",
-		sourceIdentifier: "mintlify/com"
-	};
-	spinner.stop(`Found skill: ${import_picocolors.default.cyan(remoteSkill.installName)}`);
-	M.info(`Skill: ${import_picocolors.default.cyan(remoteSkill.name)}`);
-	M.message(import_picocolors.default.dim(remoteSkill.description));
-	if (options.list) {
-		console.log();
-		M.step(import_picocolors.default.bold("Skill Details"));
-		M.message(`  ${import_picocolors.default.cyan("Name:")} ${remoteSkill.name}`);
-		M.message(`  ${import_picocolors.default.cyan("Site:")} ${remoteSkill.installName}`);
-		M.message(`  ${import_picocolors.default.cyan("Description:")} ${remoteSkill.description}`);
-		console.log();
-		Se("Run without --list to install");
-		process.exit(0);
-	}
-	let targetAgents;
-	const validAgents = Object.keys(agents);
-	if (options.agent?.includes("*")) {
-		targetAgents = validAgents;
-		M.info(`Installing to all ${targetAgents.length} agents`);
-	} else if (options.agent && options.agent.length > 0) {
-		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
-		if (invalidAgents.length > 0) {
-			M.error(`Invalid agents: ${invalidAgents.join(", ")}`);
-			M.info(`Valid agents: ${validAgents.join(", ")}`);
-			process.exit(1);
-		}
-		targetAgents = options.agent;
-	} else {
-		spinner.start("Loading agents...");
-		const installedAgents = await detectInstalledAgents();
-		const totalAgents = Object.keys(agents).length;
-		spinner.stop(`${totalAgents} agents`);
-		if (installedAgents.length === 0) if (options.yes) {
-			targetAgents = validAgents;
-			M.info("Installing to all agents");
-		} else {
-			M.info("Select agents to install skills to");
-			const selected = await promptForAgents("Which agents do you want to install to?", Object.entries(agents).map(([key, config]) => ({
-				value: key,
-				label: config.displayName
-			})));
-			if (pD(selected)) {
-				xe("Installation cancelled");
-				process.exit(0);
-			}
-			targetAgents = selected;
-		}
-		else if (installedAgents.length === 1 || options.yes) {
-			targetAgents = ensureUniversalAgents(installedAgents);
-			if (installedAgents.length === 1) {
-				const firstAgent = installedAgents[0];
-				M.info(`Installing to: ${import_picocolors.default.cyan(agents[firstAgent].displayName)}`);
-			} else M.info(`Installing to: ${installedAgents.map((a) => import_picocolors.default.cyan(agents[a].displayName)).join(", ")}`);
-		} else {
-			const selected = await selectAgentsInteractive({ global: options.global });
-			if (pD(selected)) {
-				xe("Installation cancelled");
-				process.exit(0);
-			}
-			targetAgents = selected;
-		}
-	}
-	let installGlobally = options.global ?? false;
-	const supportsGlobal = targetAgents.some((a) => agents[a].globalSkillsDir !== void 0);
-	if (options.global === void 0 && !options.yes && supportsGlobal) {
-		const scope = await ve({
-			message: "Installation scope",
-			options: [{
-				value: false,
-				label: "Project",
-				hint: "Install in current directory (committed with your project)"
-			}, {
-				value: true,
-				label: "Global",
-				hint: "Install in home directory (available across all projects)"
-			}]
-		});
-		if (pD(scope)) {
-			xe("Installation cancelled");
-			process.exit(0);
-		}
-		installGlobally = scope;
-	}
-	const installMode = "symlink";
-	const cwd = process.cwd();
-	const overwriteChecks = await Promise.all(targetAgents.map(async (agent) => ({
-		agent,
-		installed: await isSkillInstalled(remoteSkill.installName, agent, { global: installGlobally })
-	})));
-	const overwriteStatus = new Map(overwriteChecks.map(({ agent, installed }) => [agent, installed]));
-	const summaryLines = [];
-	targetAgents.map((a) => agents[a].displayName);
-	const shortCanonical = shortenPath$2(getCanonicalPath(remoteSkill.installName, { global: installGlobally }), cwd);
-	summaryLines.push(`${import_picocolors.default.cyan(shortCanonical)}`);
-	summaryLines.push(...buildAgentSummaryLines(targetAgents, installMode));
-	const overwriteAgents = targetAgents.filter((a) => overwriteStatus.get(a)).map((a) => agents[a].displayName);
-	if (overwriteAgents.length > 0) summaryLines.push(`  ${import_picocolors.default.yellow("overwrites:")} ${formatList$1(overwriteAgents)}`);
-	console.log();
-	Me(summaryLines.join("\n"), "Installation Summary");
-	if (!options.yes) {
-		const confirmed = await ye({ message: "Proceed with installation?" });
-		if (pD(confirmed) || !confirmed) {
-			xe("Installation cancelled");
-			process.exit(0);
-		}
-	}
-	spinner.start("Installing skill...");
-	const results = [];
-	for (const agent of targetAgents) {
-		const result = await installRemoteSkillForAgent(remoteSkill, agent, {
-			global: installGlobally,
-			mode: installMode
-		});
-		results.push({
-			skill: remoteSkill.installName,
-			agent: agents[agent].displayName,
-			...result
-		});
-	}
-	spinner.stop("Installation complete");
-	console.log();
-	const successful = results.filter((r) => r.success);
-	const failed = results.filter((r) => !r.success);
-	track({
-		event: "install",
-		source: "mintlify/com",
-		skills: remoteSkill.installName,
-		agents: targetAgents.join(","),
-		...installGlobally && { global: "1" },
-		skillFiles: JSON.stringify({ [remoteSkill.installName]: url }),
-		sourceType: "mintlify"
-	});
-	if (successful.length > 0 && installGlobally) try {
-		await addSkillToLock(remoteSkill.installName, {
-			source: `mintlify/${remoteSkill.installName}`,
-			sourceType: "mintlify",
-			sourceUrl: url,
-			skillFolderHash: ""
-		});
-	} catch {}
-	if (successful.length > 0) {
-		const resultLines = [];
-		const firstResult = successful[0];
-		if (firstResult.canonicalPath) {
-			const shortPath = shortenPath$2(firstResult.canonicalPath, cwd);
-			resultLines.push(`${import_picocolors.default.green("✓")} ${shortPath}`);
-		} else resultLines.push(`${import_picocolors.default.green("✓")} ${remoteSkill.installName}`);
-		resultLines.push(...buildResultLines(successful, targetAgents));
-		const title = import_picocolors.default.green("Installed 1 skill");
-		Me(resultLines.join("\n"), title);
-		const symlinkFailures = successful.filter((r) => r.mode === "symlink" && r.symlinkFailed);
-		if (symlinkFailures.length > 0) {
-			const copiedAgentNames = symlinkFailures.map((r) => r.agent);
-			M.warn(import_picocolors.default.yellow(`Symlinks failed for: ${formatList$1(copiedAgentNames)}`));
-			M.message(import_picocolors.default.dim("  Files were copied instead. On Windows, enable Developer Mode for symlink support."));
-		}
-	}
-	if (failed.length > 0) {
-		console.log();
-		M.error(import_picocolors.default.red(`Failed to install ${failed.length}`));
-		for (const r of failed) M.message(`  ${import_picocolors.default.red("✗")} ${r.skill} → ${r.agent}: ${import_picocolors.default.dim(r.error)}`);
-	}
-	console.log();
-	Se(import_picocolors.default.green("Done!") + import_picocolors.default.dim("  Review skills before use; they run with full agent permissions."));
-	await promptForFindSkills(options, targetAgents);
-}
 async function runAdd(args, options = {}) {
 	const source = args[0];
 	let installTipShown = false;
@@ -2814,10 +2231,6 @@ async function runAdd(args, options = {}) {
 		spinner.start("Parsing source...");
 		const parsed = parseSource(source);
 		spinner.stop(`Source: ${parsed.type === "local" ? parsed.localPath : parsed.url}${parsed.ref ? ` @ ${import_picocolors.default.yellow(parsed.ref)}` : ""}${parsed.subpath ? ` (${parsed.subpath})` : ""}${parsed.skillFilter ? ` ${import_picocolors.default.dim("@")}${import_picocolors.default.cyan(parsed.skillFilter)}` : ""}`);
-		if (parsed.type === "direct-url") {
-			await handleRemoteSkill(source, parsed.url, options, spinner);
-			return;
-		}
 		if (parsed.type === "well-known") {
 			await handleWellKnownSkills(source, parsed.url, options, spinner);
 			return;
@@ -2858,9 +2271,29 @@ async function runAdd(args, options = {}) {
 		if (options.list) {
 			console.log();
 			M.step(import_picocolors.default.bold("Available Skills"));
-			for (const skill of skills) {
-				M.message(`  ${import_picocolors.default.cyan(getSkillDisplayName(skill))}`);
-				M.message(`    ${import_picocolors.default.dim(skill.description)}`);
+			const groupedSkills = {};
+			const ungroupedSkills = [];
+			for (const skill of skills) if (skill.pluginName) {
+				const group = skill.pluginName;
+				if (!groupedSkills[group]) groupedSkills[group] = [];
+				groupedSkills[group].push(skill);
+			} else ungroupedSkills.push(skill);
+			const sortedGroups = Object.keys(groupedSkills).sort();
+			for (const group of sortedGroups) {
+				const title = group.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+				console.log(import_picocolors.default.bold(title));
+				for (const skill of groupedSkills[group]) {
+					M.message(`  ${import_picocolors.default.cyan(getSkillDisplayName(skill))}`);
+					M.message(`    ${import_picocolors.default.dim(skill.description)}`);
+				}
+				console.log();
+			}
+			if (ungroupedSkills.length > 0) {
+				if (sortedGroups.length > 0) console.log(import_picocolors.default.bold("General"));
+				for (const skill of ungroupedSkills) {
+					M.message(`  ${import_picocolors.default.cyan(getSkillDisplayName(skill))}`);
+					M.message(`    ${import_picocolors.default.dim(skill.description)}`);
+				}
 			}
 			console.log();
 			Se("Use --skill <name> to install specific skills");
@@ -2890,9 +2323,34 @@ async function runAdd(args, options = {}) {
 			selectedSkills = skills;
 			M.info(`Installing all ${skills.length} skills`);
 		} else {
-			const selected = await multiselect({
+			const sortedSkills = [...skills].sort((a, b) => {
+				if (a.pluginName && !b.pluginName) return -1;
+				if (!a.pluginName && b.pluginName) return 1;
+				if (a.pluginName && b.pluginName && a.pluginName !== b.pluginName) return a.pluginName.localeCompare(b.pluginName);
+				return getSkillDisplayName(a).localeCompare(getSkillDisplayName(b));
+			});
+			const hasGroups = sortedSkills.some((s) => s.pluginName);
+			let selected;
+			if (hasGroups) {
+				const kebabToTitle = (s) => s.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+				const grouped = {};
+				for (const s of sortedSkills) {
+					const groupName = s.pluginName ? kebabToTitle(s.pluginName) : "Other";
+					if (!grouped[groupName]) grouped[groupName] = [];
+					grouped[groupName].push({
+						value: s,
+						label: getSkillDisplayName(s),
+						hint: s.description.length > 60 ? s.description.slice(0, 57) + "..." : s.description
+					});
+				}
+				selected = await be({
+					message: `Select skills to install ${import_picocolors.default.dim("(space to toggle)")}`,
+					options: grouped,
+					required: true
+				});
+			} else selected = await multiselect({
 				message: "Select skills to install",
-				options: skills.map((s) => ({
+				options: sortedSkills.map((s) => ({
 					value: s,
 					label: getSkillDisplayName(s),
 					hint: s.description.length > 60 ? s.description.slice(0, 57) + "..." : s.description
@@ -3015,14 +2473,37 @@ async function runAdd(args, options = {}) {
 			if (!overwriteStatus.has(skillName)) overwriteStatus.set(skillName, /* @__PURE__ */ new Map());
 			overwriteStatus.get(skillName).set(agent, installed);
 		}
-		for (const skill of selectedSkills) {
-			if (summaryLines.length > 0) summaryLines.push("");
-			const shortCanonical = shortenPath$2(getCanonicalPath(skill.name, { global: installGlobally }), cwd);
-			summaryLines.push(`${import_picocolors.default.cyan(shortCanonical)}`);
-			summaryLines.push(...buildAgentSummaryLines(targetAgents, installMode));
-			const skillOverwrites = overwriteStatus.get(skill.name);
-			const overwriteAgents = targetAgents.filter((a) => skillOverwrites?.get(a)).map((a) => agents[a].displayName);
-			if (overwriteAgents.length > 0) summaryLines.push(`  ${import_picocolors.default.yellow("overwrites:")} ${formatList$1(overwriteAgents)}`);
+		const groupedSummary = {};
+		const ungroupedSummary = [];
+		for (const skill of selectedSkills) if (skill.pluginName) {
+			const group = skill.pluginName;
+			if (!groupedSummary[group]) groupedSummary[group] = [];
+			groupedSummary[group].push(skill);
+		} else ungroupedSummary.push(skill);
+		const printSkillSummary = (skills) => {
+			for (const skill of skills) {
+				if (summaryLines.length > 0) summaryLines.push("");
+				const shortCanonical = shortenPath$2(getCanonicalPath(skill.name, { global: installGlobally }), cwd);
+				summaryLines.push(`${import_picocolors.default.cyan(shortCanonical)}`);
+				summaryLines.push(...buildAgentSummaryLines(targetAgents, installMode));
+				const skillOverwrites = overwriteStatus.get(skill.name);
+				const overwriteAgents = targetAgents.filter((a) => skillOverwrites?.get(a)).map((a) => agents[a].displayName);
+				if (overwriteAgents.length > 0) summaryLines.push(`  ${import_picocolors.default.yellow("overwrites:")} ${formatList$1(overwriteAgents)}`);
+			}
+		};
+		const sortedGroups = Object.keys(groupedSummary).sort();
+		for (const group of sortedGroups) {
+			const title = group.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+			summaryLines.push("");
+			summaryLines.push(import_picocolors.default.bold(title));
+			printSkillSummary(groupedSummary[group]);
+		}
+		if (ungroupedSummary.length > 0) {
+			if (sortedGroups.length > 0) {
+				summaryLines.push("");
+				summaryLines.push(import_picocolors.default.bold("General"));
+			}
+			printSkillSummary(ungroupedSummary);
 		}
 		console.log();
 		Me(summaryLines.join("\n"), "Installation Summary");
@@ -3054,6 +2535,7 @@ async function runAdd(args, options = {}) {
 			results.push({
 				skill: getSkillDisplayName(skill),
 				agent: agents[agent].displayName,
+				pluginName: skill.pluginName,
 				...result
 			});
 		}
@@ -3106,7 +2588,8 @@ async function runAdd(args, options = {}) {
 						sourceType: parsed.type,
 						sourceUrl: parsed.url,
 						skillPath: skillPathValue,
-						skillFolderHash
+						skillFolderHash,
+						pluginName: skill.pluginName
 					});
 				} catch {}
 			}
@@ -3127,30 +2610,54 @@ async function runAdd(args, options = {}) {
 		}
 		if (successful.length > 0) {
 			const bySkill = /* @__PURE__ */ new Map();
+			const groupedResults = {};
+			const ungroupedResults = [];
 			for (const r of successful) {
 				const skillResults = bySkill.get(r.skill) || [];
 				skillResults.push(r);
 				bySkill.set(r.skill, skillResults);
+				if (skillResults.length === 1) if (r.pluginName) {
+					const group = r.pluginName;
+					if (!groupedResults[group]) groupedResults[group] = [];
+					groupedResults[group].push(r);
+				} else ungroupedResults.push(r);
 			}
 			const skillCount = bySkill.size;
 			const symlinkFailures = successful.filter((r) => r.mode === "symlink" && r.symlinkFailed);
 			const copiedAgents = symlinkFailures.map((r) => r.agent);
 			const resultLines = [];
-			for (const [skillName, skillResults] of bySkill) {
-				const firstResult = skillResults[0];
-				if (firstResult.mode === "copy") {
-					resultLines.push(`${import_picocolors.default.green("✓")} ${skillName} ${import_picocolors.default.dim("(copied)")}`);
-					for (const r of skillResults) {
-						const shortPath = shortenPath$2(r.path, cwd);
-						resultLines.push(`  ${import_picocolors.default.dim("→")} ${shortPath}`);
+			const printSkillResults = (entries) => {
+				for (const entry of entries) {
+					const skillResults = bySkill.get(entry.skill) || [];
+					const firstResult = skillResults[0];
+					if (firstResult.mode === "copy") {
+						resultLines.push(`${import_picocolors.default.green("✓")} ${entry.skill} ${import_picocolors.default.dim("(copied)")}`);
+						for (const r of skillResults) {
+							const shortPath = shortenPath$2(r.path, cwd);
+							resultLines.push(`  ${import_picocolors.default.dim("→")} ${shortPath}`);
+						}
+					} else {
+						if (firstResult.canonicalPath) {
+							const shortPath = shortenPath$2(firstResult.canonicalPath, cwd);
+							resultLines.push(`${import_picocolors.default.green("✓")} ${shortPath}`);
+						} else resultLines.push(`${import_picocolors.default.green("✓")} ${entry.skill}`);
+						resultLines.push(...buildResultLines(skillResults, targetAgents));
 					}
-				} else {
-					if (firstResult.canonicalPath) {
-						const shortPath = shortenPath$2(firstResult.canonicalPath, cwd);
-						resultLines.push(`${import_picocolors.default.green("✓")} ${shortPath}`);
-					} else resultLines.push(`${import_picocolors.default.green("✓")} ${skillName}`);
-					resultLines.push(...buildResultLines(skillResults, targetAgents));
 				}
+			};
+			const sortedResultGroups = Object.keys(groupedResults).sort();
+			for (const group of sortedResultGroups) {
+				const title = group.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+				resultLines.push("");
+				resultLines.push(import_picocolors.default.bold(title));
+				printSkillResults(groupedResults[group]);
+			}
+			if (ungroupedResults.length > 0) {
+				if (sortedResultGroups.length > 0) {
+					resultLines.push("");
+					resultLines.push(import_picocolors.default.bold("General"));
+				}
+				printSkillResults(ungroupedResults);
 			}
 			const title = import_picocolors.default.green(`Installed ${skillCount} skill${skillCount !== 1 ? "s" : ""}`);
 			Me(resultLines.join("\n"), title);
@@ -3864,6 +3371,7 @@ async function runList(args) {
 		global: scope,
 		agentFilter
 	});
+	const lockedSkills = await getAllLockedSkills();
 	const cwd = process.cwd();
 	const scopeLabel = scope ? "Global" : "Project";
 	if (installedSkills.length === 0) {
@@ -3872,17 +3380,44 @@ async function runList(args) {
 		else console.log(`${DIM$1}Try listing global skills with -g${RESET$1}`);
 		return;
 	}
-	function printSkill(skill) {
+	function printSkill(skill, indent = false) {
+		const prefix = indent ? "  " : "";
 		const shortPath = shortenPath(skill.canonicalPath, cwd);
 		const agentNames = skill.agents.map((a) => agents[a].displayName);
 		const agentInfo = skill.agents.length > 0 ? formatList(agentNames) : `${YELLOW}not linked${RESET$1}`;
-		console.log(`${CYAN}${skill.name}${RESET$1} ${DIM$1}${shortPath}${RESET$1}`);
-		console.log(`  ${DIM$1}Agents:${RESET$1} ${agentInfo}`);
+		console.log(`${prefix}${CYAN}${skill.name}${RESET$1} ${DIM$1}${shortPath}${RESET$1}`);
+		console.log(`${prefix}  ${DIM$1}Agents:${RESET$1} ${agentInfo}`);
 	}
 	console.log(`${BOLD$1}${scopeLabel} Skills${RESET$1}`);
 	console.log();
-	for (const skill of installedSkills) printSkill(skill);
-	console.log();
+	const groupedSkills = {};
+	const ungroupedSkills = [];
+	for (const skill of installedSkills) {
+		const lockEntry = lockedSkills[skill.name];
+		if (lockEntry?.pluginName) {
+			const group = lockEntry.pluginName;
+			if (!groupedSkills[group]) groupedSkills[group] = [];
+			groupedSkills[group].push(skill);
+		} else ungroupedSkills.push(skill);
+	}
+	if (Object.keys(groupedSkills).length > 0) {
+		const sortedGroups = Object.keys(groupedSkills).sort();
+		for (const group of sortedGroups) {
+			const title = group.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+			console.log(`${BOLD$1}${title}${RESET$1}`);
+			const skills = groupedSkills[group];
+			if (skills) for (const skill of skills) printSkill(skill, true);
+			console.log();
+		}
+		if (ungroupedSkills.length > 0) {
+			console.log(`${BOLD$1}General${RESET$1}`);
+			for (const skill of ungroupedSkills) printSkill(skill, true);
+			console.log();
+		}
+	} else {
+		for (const skill of installedSkills) printSkill(skill);
+		console.log();
+	}
 }
 async function removeCommand(skillNames, options) {
 	const isGlobal = options.global ?? false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skills",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {