@mhmdreza-rafiei/agentry 0.2.0 → 0.2.2

package/dist/cli.mjs

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
-import { parseSource } from "./_chunks/source_parser2.mjs";
-import { animateLogo, badge, delay, printHelp, theme } from "./_chunks/theme2.mjs";
-import { execFileSync, execSync } from "node:child_process";
+import { animateLogo, badge, delay, printHelp, sky, theme } from "./_chunks/theme2.mjs";
+import { execFileSync } from "node:child_process";
 import https from "node:https";
-import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
+import { createHash } from "node:crypto";
+import { copyFileSync, cpSync, existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { join } from "node:path";
-import { xdgConfig } from "xdg-basedir";
-import { parse } from "yaml";
+import { dirname, join, resolve, sep } from "node:path";
+import { xdgCache, xdgConfig } from "xdg-basedir";
+import { parse, stringify } from "yaml";
 import { z } from "zod";
 import * as clack from "@clack/prompts";
+import * as readline from "node:readline";
 import c from "picocolors";
 import { determineAgent } from "@vercel/detect-agent";
-import * as readline from "node:readline";
 import { stripVTControlCharacters } from "node:util";
 import { Writable } from "node:stream";
 var name = "@mhmdreza-rafiei/agentry";
-var version = "0.2.0";
+var version = "0.2.2";
 const ARTIFACT_KINDS = [
 	"skill",
 	"rule",
@@ -24,7 +24,184 @@ const ARTIFACT_KINDS = [
 	"profile",
 	"script"
 ];
-function resolveSource(source) {
+function isLocalPath(source) {
+	if (!source) return false;
+	if (source === "." || source === "..") return true;
+	if (source.startsWith("./") || source.startsWith("../") || source.startsWith("/") || source.startsWith("~")) return true;
+	try {
+		return existsSync(source) && statSync(source).isDirectory();
+	} catch {
+		return false;
+	}
+}
+const SAFE_REF$1 = /^[a-zA-Z0-9][\w./-]*$/;
+function parseGithubTreeUrl(url) {
+	const m = url.match(/^https?:\/\/github\.com\/([\w.-]+\/[\w.-]+?)\/tree\/([^/]+)\/(.+)$/);
+	if (!m) return null;
+	const ref = m[2];
+	if (!SAFE_REF$1.test(ref)) throw new Error(`Invalid git ref in source URL: "${ref}"`);
+	return {
+		ownerRepo: m[1],
+		ref,
+		subpath: m[3].replace(/\/+$/, "")
+	};
+}
+function redactUrl(url) {
+	return url.replace(/:\/\/([^/@]+)@/g, "://***@");
+}
+function parseSource(source) {
+	if (!source || typeof source !== "string") throw new Error("Empty source.");
+	const raw = source;
+	if (isLocalPath(source)) return {
+		kind: "local",
+		raw,
+		url: null,
+		subpath: "",
+		local: resolve(source.replace(/^~/, homedir()))
+	};
+	const tree = parseGithubTreeUrl(source);
+	if (tree) return {
+		kind: "github-url",
+		raw,
+		url: `https://github.com/${tree.ownerRepo}.git`,
+		subpath: tree.subpath,
+		ref: tree.ref,
+		local: null
+	};
+	let m = source.match(/^https?:\/\/github\.com\/([\w.-]+\/[\w.-]+?)(?:\.git)?\/?$/);
+	if (m) return {
+		kind: "github-url",
+		raw,
+		url: `https://github.com/${m[1]}.git`,
+		subpath: "",
+		local: null
+	};
+	m = source.match(/^https?:\/\/gitlab\.com\/([\w./-]+?)(?:\.git)?\/?$/);
+	if (m) return {
+		kind: "gitlab-url",
+		raw,
+		url: `https://gitlab.com/${m[1]}.git`,
+		subpath: "",
+		local: null
+	};
+	if (source.startsWith("git@") || /^https?:\/\/.*\.git$/.test(source)) return {
+		kind: "git-url",
+		raw,
+		url: source,
+		subpath: "",
+		local: null
+	};
+	if (/^[\w.-]+\/[\w.-]+$/.test(source)) return {
+		kind: "github-shorthand",
+		raw,
+		url: `https://github.com/${source}.git`,
+		subpath: "",
+		local: null
+	};
+	throw new Error(`Cannot parse source "${source}". Use author/repo, a GitHub/GitLab URL, a git URL, or a local path.`);
+}
+function sourceIdentity(source) {
+	try {
+		const p = parseSource(source);
+		if (p.kind === "local" && p.local) return `local:${resolve(p.local).replace(/\\/g, "/").toLowerCase()}`;
+		return `git:${(p.url || "").replace(/\.git$/i, "").replace(/\/+$/, "").toLowerCase()}${p.subpath ? `/${p.subpath.replace(/^\/+|\/+$/g, "")}` : ""}${p.ref ? `@${p.ref}` : ""}`;
+	} catch {
+		return `raw:${source.trim().toLowerCase()}`;
+	}
+}
+function sourcesEqual(a, b) {
+	if (!a || !b) return false;
+	if (a === b) return true;
+	return sourceIdentity(a) === sourceIdentity(b);
+}
+function isExplicitSource(arg) {
+	if (!arg) return false;
+	if (isLocalPath(arg)) return true;
+	if (/^https?:\/\//i.test(arg)) return true;
+	if (arg.startsWith("git@")) return true;
+	if (/^https?:\/\/.*\.git$/i.test(arg)) return true;
+	return false;
+}
+function isOwnerRepoShape(arg) {
+	return /^[\w.-]+\/[\w.-]+$/.test(arg);
+}
+function cacheRoot() {
+	return join(xdgCache ?? join(homedir(), ".cache"), "agentry", "repos");
+}
+function cacheKey(parsed) {
+	const id = sourceIdentity(parsed.raw);
+	return createHash("sha256").update(id).digest("hex").slice(0, 20);
+}
+function cacheDirFor(parsed) {
+	return join(cacheRoot(), cacheKey(parsed));
+}
+function saveToCache(parsed, clonedRoot) {
+	const dest = cacheDirFor(parsed);
+	try {
+		rmSync(dest, {
+			recursive: true,
+			force: true
+		});
+		mkdirSync(join(dest, ".."), { recursive: true });
+		cpSync(clonedRoot, dest, { recursive: true });
+	} catch {}
+}
+const SAFE_REF = /^[a-zA-Z0-9][\w./-]*$/;
+function cloneTo(url, dest, ref) {
+	if (ref && !SAFE_REF.test(ref)) throw new Error(`Invalid git ref: "${ref}"`);
+	execFileSync("git", [
+		"clone",
+		"--quiet",
+		...ref ? [
+			"--branch",
+			ref,
+			"--depth",
+			"1"
+		] : ["--depth", "1"],
+		url,
+		dest
+	], { stdio: [
+		"ignore",
+		"ignore",
+		"pipe"
+	] });
+}
+function assertInsideRoot(root, candidate) {
+	const base = resolve(root);
+	const resolved = resolve(candidate);
+	const prefix = base.endsWith(sep) ? base : base + sep;
+	const a = resolved.toLowerCase();
+	const b = base.toLowerCase();
+	const p = prefix.toLowerCase();
+	if (a !== b && !a.startsWith(p)) throw new Error(`Path escapes source root: "${candidate}"`);
+	return resolved;
+}
+function withSubpath(root, subpath, cleanupRoot) {
+	const cleanup = () => rmSync(cleanupRoot, {
+		recursive: true,
+		force: true
+	});
+	if (!subpath) return {
+		root,
+		cleanup
+	};
+	let sub;
+	try {
+		sub = assertInsideRoot(root, join(root, subpath));
+	} catch (e) {
+		cleanup();
+		throw e;
+	}
+	if (!existsSync(sub)) {
+		cleanup();
+		throw new Error(`Subpath "${subpath}" not found.`);
+	}
+	return {
+		root: sub,
+		cleanup
+	};
+}
+async function resolveSource(source, opts = {}) {
 	const parsed = typeof source === "string" ? parseSource(source) : source;
 	if (parsed.kind === "local" && parsed.local) {
 		if (!existsSync(parsed.local)) throw new Error(`Path not found: ${parsed.raw}`);
@@ -35,56 +212,36 @@ function resolveSource(source) {
 	}
 	const url = parsed.url;
 	if (!url) throw new Error(`Cannot resolve source "${parsed.raw}".`);
+	const safeUrl = redactUrl(url);
 	const tmp = mkdtempSync(join(tmpdir(), "agentry-src-"));
 	try {
-		execFileSync("git", [
-			"clone",
-			"--quiet",
-			...parsed.ref ? [
-				"--branch",
-				parsed.ref,
-				"--depth",
-				"1"
-			] : ["--depth", "1"],
-			url,
-			tmp
-		], { stdio: [
-			"ignore",
-			"ignore",
-			"pipe"
-		] });
+		cloneTo(url, tmp, parsed.ref);
 	} catch (e) {
 		rmSync(tmp, {
 			recursive: true,
 			force: true
 		});
 		const detail = e.stderr ? e.stderr.toString().trim() : e.message;
-		throw new Error(`git clone failed for ${url}\n${detail}`);
-	}
-	if (parsed.subpath) {
-		const sub = join(tmp, parsed.subpath);
-		if (!existsSync(sub)) {
-			rmSync(tmp, {
-				recursive: true,
-				force: true
-			});
-			throw new Error(`Subpath "${parsed.subpath}" not found in ${url}.`);
+		const cached = cacheDirFor(parsed);
+		const cacheOk = existsSync(cached) && existsSync(join(cached, ".git"));
+		if (cacheOk && opts.confirmCache) {
+			if (await opts.confirmCache({
+				url: safeUrl,
+				cacheDir: cached,
+				error: detail
+			})) {
+				const work = mkdtempSync(join(tmpdir(), "agentry-src-"));
+				cpSync(cached, work, { recursive: true });
+				return {
+					...withSubpath(work, parsed.subpath, work),
+					fromCache: true
+				};
+			}
 		}
-		return {
-			root: sub,
-			cleanup: () => rmSync(tmp, {
-				recursive: true,
-				force: true
-			})
-		};
+		throw new Error(`git clone failed for ${safeUrl}\n${detail}${cacheOk ? "\n(A local cache exists — re-run interactively to load it, or pass -y to auto-use cache.)" : ""}`);
 	}
-	return {
-		root: tmp,
-		cleanup: () => rmSync(tmp, {
-			recursive: true,
-			force: true
-		})
-	};
+	saveToCache(parsed, tmp);
+	return withSubpath(tmp, parsed.subpath, tmp);
 }
 const SKILL_MARKER = "SKILL.md";
 const FILE_EXT = ".mdc";
@@ -426,6 +583,38 @@ function getNonUniversalAgents() {
 	return listAgents().filter((a) => a.skillsDir !== ".agents/skills");
 }
 const home = homedir();
+function copyTreeDereferenced(src, dest, seen = /* @__PURE__ */ new Set()) {
+	const st = lstatSync(src);
+	if (st.isSymbolicLink()) {
+		let real;
+		try {
+			real = realpathSync(src);
+		} catch {
+			return;
+		}
+		if (seen.has(real)) return;
+		seen.add(real);
+		copyTreeDereferenced(real, dest, seen);
+		return;
+	}
+	if (st.isDirectory()) {
+		let real;
+		try {
+			real = realpathSync(src);
+		} catch {
+			real = resolve(src);
+		}
+		if (seen.has(real)) return;
+		seen.add(real);
+		mkdirSync(dest, { recursive: true });
+		for (const name of readdirSync(src)) copyTreeDereferenced(join(src, name), join(dest, name), seen);
+		return;
+	}
+	if (st.isFile()) {
+		mkdirSync(dirname(dest), { recursive: true });
+		copyFileSync(src, dest);
+	}
+}
 function lockBase(opts) {
 	return opts.scope === "global" ? home : opts.dir || process.cwd();
 }
@@ -458,10 +647,74 @@ function removeLegacyLockIfPresent(opts) {
 }
 function writeLock(opts, lock) {
 	const file = lockPath(opts);
+	if (!Object.keys(lock.items).length) {
+		const dir = join(lockBase(opts), ".agentry");
+		if (existsSync(dir)) rmSync(dir, {
+			recursive: true,
+			force: true
+		});
+		removeLegacyLockIfPresent(opts);
+		return;
+	}
 	mkdirSync(join(file, ".."), { recursive: true });
 	writeFileSync(file, JSON.stringify(lock, null, 2) + "\n");
 	removeLegacyLockIfPresent(opts);
 }
+function isDirTreeEmpty(dir) {
+	if (!existsSync(dir)) return true;
+	let entries;
+	try {
+		entries = readdirSync(dir);
+	} catch {
+		return true;
+	}
+	for (const name of entries) {
+		const p = join(dir, name);
+		let st;
+		try {
+			st = statSync(p);
+		} catch {
+			continue;
+		}
+		if (st.isDirectory()) {
+			if (!isDirTreeEmpty(p)) return false;
+			continue;
+		}
+		if (st.isFile()) {
+			if (name === "lock.json") {
+				try {
+					const data = JSON.parse(readFileSync(p, "utf8"));
+					if (data && typeof data === "object" && Object.keys(data.items || {}).length === 0) continue;
+				} catch {
+					return false;
+				}
+				return false;
+			}
+			return false;
+		}
+	}
+	return true;
+}
+function pruneEmptyAncestors(dir, stopAt, removedPaths = []) {
+	const stop = resolve(stopAt);
+	let cur = resolve(dir);
+	while (cur.length > stop.length) {
+		const prefix = stop.endsWith(sep) ? stop : stop + sep;
+		if (!cur.toLowerCase().startsWith(prefix.toLowerCase()) && cur.toLowerCase() !== stop.toLowerCase()) break;
+		if (!existsSync(cur)) {
+			cur = dirname(cur);
+			continue;
+		}
+		if (!isDirTreeEmpty(cur)) break;
+		rmSync(cur, {
+			recursive: true,
+			force: true
+		});
+		removedPaths.push(cur);
+		cur = dirname(cur);
+	}
+	return removedPaths;
+}
 function listInstalled(opts) {
 	return Object.entries(readLock(opts).items).map(([id, v]) => ({
 		id,
@@ -489,12 +742,7 @@ function installOne(artifact, opts, agentList, source) {
 			force: true
 		});
 		mkdirSync(join(canonical, ".."), { recursive: true });
-		if (opts.copy) cpSync(artifact.dir, canonical, { recursive: true });
-		else try {
-			symlinkSync(artifact.dir, canonical, "junction");
-		} catch {
-			cpSync(artifact.dir, canonical, { recursive: true });
-		}
+		copyTreeDereferenced(artifact.dir, canonical);
 		for (const a of list) if (a.skillsDir === ".agents/skills") dests.push({
 			agent: a.name,
 			dir: canonical
@@ -507,7 +755,7 @@ function installOne(artifact, opts, agentList, source) {
 			});
 			mkdirSync(join(dir, ".."), { recursive: true });
 			if (opts.copy) {
-				cpSync(canonical, dir, { recursive: true });
+				copyTreeDereferenced(canonical, dir);
 				dests.push({
 					agent: a.name,
 					dir
@@ -520,7 +768,7 @@ function installOne(artifact, opts, agentList, source) {
 					symlinked: true
 				});
 			} catch {
-				cpSync(canonical, dir, { recursive: true });
+				copyTreeDereferenced(canonical, dir);
 				dests.push({
 					agent: a.name,
 					dir
@@ -534,12 +782,7 @@ function installOne(artifact, opts, agentList, source) {
 			force: true
 		});
 		mkdirSync(join(dir, ".."), { recursive: true });
-		if (opts.copy) cpSync(artifact.dir, dir, { recursive: true });
-		else try {
-			symlinkSync(artifact.dir, dir, "junction");
-		} catch {
-			cpSync(artifact.dir, dir, { recursive: true });
-		}
+		copyTreeDereferenced(artifact.dir, dir);
 		dests.push({
 			agent: a.name,
 			dir
@@ -563,37 +806,115 @@ function agentDir(artifact, a, base) {
 	}
 	return join(base, a.configDir || a.skillsDir, pluralKind(artifact.kind), artifact.id);
 }
-function removeSelection(kind, selector, opts, agentList) {
+function removeSelection(kind, selector, opts, agentList, sourceFilter) {
 	const base = lockBase(opts);
 	const list = agentList.length ? agentList : [getAgent("cursor")];
 	const rel = [kind, selector].filter(Boolean).join("/");
 	const removedKeys = [];
+	const removedPaths = [];
 	const lock = readLock(opts);
-	const pkind = pluralKind(kind);
-	for (const a of list) {
-		let dir;
-		if (kind === "skill") dir = join(base, a.skillsDir, selector || "");
-		else if (kind === "agent" || kind === "rule" || kind === "profile") {
-			const ext = kind === "profile" ? ".yaml" : ".mdc";
-			if (!selector) dir = join(base, a.configDir || a.skillsDir, pkind);
-			else if (selector.includes("/")) {
-				const [cat, name] = selector.split("/");
-				dir = join(base, a.configDir || a.skillsDir, pkind, cat, name + ext);
-			} else dir = join(base, a.configDir || a.skillsDir, pkind, selector + ext);
-		} else dir = join(base, a.configDir || a.skillsDir, pkind, selector || "");
-		if (existsSync(dir)) rmSync(dir, {
+	const matchingKeys = Object.keys(lock.items).filter((key) => {
+		const entry = lock.items[key];
+		if (sourceFilter && !sourcesEqual(entry.source, sourceFilter)) return false;
+		if (kind === "all") return true;
+		if (key === rel || key.startsWith(rel + "/")) return true;
+		if (!selector && key.startsWith(kind + "/")) return true;
+		return false;
+	});
+	const rmPath = (p) => {
+		if (!p || !existsSync(p)) return;
+		const parent = dirname(p);
+		rmSync(p, {
 			recursive: true,
 			force: true
 		});
-	}
-	for (const key of Object.keys(lock.items)) if (key === rel || key.startsWith(rel + "/")) {
+		removedPaths.push(p);
+		pruneEmptyAncestors(parent, base, removedPaths);
+	};
+	const agentsFor = (entry) => {
+		const fromEntry = entry.agents.map((n) => getAgent(n)).filter(Boolean);
+		const byName = /* @__PURE__ */ new Map();
+		for (const a of [...fromEntry, ...list]) byName.set(a.name, a);
+		return [...byName.values()];
+	};
+	const removeFilesForKey = (key, entry) => {
+		const parts = key.split("/");
+		const k = parts[0];
+		const sel = parts.slice(1).join("/") || void 0;
+		if (!sel && k === "skill") return;
+		const agents = agentsFor(entry);
+		if (k === "skill" && sel) {
+			rmPath(join(base, ".agents", "skills", sel));
+			for (const a of agents) {
+				if (a.skillsDir === ".agents/skills") continue;
+				rmPath(join(base, a.skillsDir, sel));
+			}
+			return;
+		}
+		for (const a of agents) if (k === "agent" || k === "rule" || k === "profile") {
+			const ext = k === "profile" ? ".yaml" : ".mdc";
+			if (!sel) rmPath(join(base, a.configDir || a.skillsDir, pluralKind(k)));
+			else if (sel.includes("/")) {
+				const [cat, name] = sel.split("/");
+				rmPath(join(base, a.configDir || a.skillsDir, pluralKind(k), cat, name + ext));
+			} else rmPath(join(base, a.configDir || a.skillsDir, pluralKind(k), sel + ext));
+		} else if (sel) rmPath(join(base, a.configDir || a.skillsDir, pluralKind(k), sel));
+	};
+	for (const key of matchingKeys) {
+		const entry = lock.items[key];
+		removeFilesForKey(key, entry);
 		delete lock.items[key];
 		removedKeys.push(key);
 	}
+	if (!removedKeys.length && !sourceFilter) {
+		if (kind === "skill") rmPath(join(base, ".agents", "skills", selector || ""));
+		for (const a of list) {
+			let dir;
+			if (kind === "skill") {
+				if (a.skillsDir === ".agents/skills") continue;
+				dir = join(base, a.skillsDir, selector || "");
+			} else if (kind === "agent" || kind === "rule" || kind === "profile") {
+				const ext = kind === "profile" ? ".yaml" : ".mdc";
+				if (!selector) dir = join(base, a.configDir || a.skillsDir, pluralKind(kind));
+				else if (selector.includes("/")) {
+					const [cat, name] = selector.split("/");
+					dir = join(base, a.configDir || a.skillsDir, pluralKind(kind), cat, name + ext);
+				} else dir = join(base, a.configDir || a.skillsDir, pluralKind(kind), selector + ext);
+			} else dir = join(base, a.configDir || a.skillsDir, pluralKind(kind), selector || "");
+			if (existsSync(dir)) {
+				rmPath(dir);
+				if (!removedKeys.includes(rel)) removedKeys.push(rel);
+			}
+		}
+		for (const key of Object.keys(lock.items)) if (key === rel || key.startsWith(rel + "/")) {
+			delete lock.items[key];
+			if (!removedKeys.includes(key)) removedKeys.push(key);
+		}
+	}
 	writeLock(opts, lock);
+	const sweepRoots = /* @__PURE__ */ new Set([
+		join(base, ".agents", "skills"),
+		join(base, ".agents"),
+		join(base, ".agentry")
+	]);
+	for (const a of list) {
+		sweepRoots.add(join(base, a.skillsDir));
+		if (a.configDir) {
+			sweepRoots.add(join(base, a.configDir));
+			for (const pk of [
+				"skills",
+				"agents",
+				"rules",
+				"profiles",
+				"scripts"
+			]) sweepRoots.add(join(base, a.configDir, pk));
+		}
+	}
+	for (const root of sweepRoots) if (existsSync(root) && isDirTreeEmpty(root)) pruneEmptyAncestors(root, base, removedPaths);
 	return {
-		existed: removedKeys.length > 0,
-		removedKeys
+		existed: removedKeys.length > 0 || removedPaths.length > 0,
+		removedKeys,
+		removedPaths
 	};
 }
 const ProfileArtifactRefSchema = z.object({
@@ -636,6 +957,98 @@ function loadProfile(name, baseDir) {
 		profile: loadProfileFile(file)
 	};
 }
+function ensureDir(file) {
+	mkdirSync(join(file, ".."), { recursive: true });
+}
+function writeNew(file, content, force = false) {
+	if (existsSync(file) && !force) throw new Error(`Already exists: ${file}`);
+	ensureDir(file);
+	writeFileSync(file, content);
+	return file;
+}
+function scaffoldSkill(opts) {
+	const dir = join(opts.baseDir || process.cwd(), opts.category ? join("skills", opts.category, opts.name) : join("skills", opts.name));
+	const id = opts.category ? `${opts.category}/${opts.name}` : opts.name;
+	const desc = opts.description || `${opts.name} skill`;
+	const skillMd = `---
+name: ${opts.name}
+description: ${desc}
+---
+
+# ${opts.name}
+
+${desc}
+
+## When to use
+
+Describe when this skill should run.
+
+## Instructions
+
+1. …
+`;
+	const paths = [writeNew(join(dir, "SKILL.md"), skillMd)];
+	if (opts.reference !== false) paths.push(writeNew(join(dir, "references", "TEMPLATE.md"), `# ${opts.name} — reference
+
+Fill in details here. Keep SKILL.md lean; put depth in references/.
+`));
+	return {
+		paths,
+		id
+	};
+}
+function scaffoldMdc(opts) {
+	const base = opts.baseDir || process.cwd();
+	const folder = opts.kind === "agent" ? "agents" : "rules";
+	const rel = opts.category ? join(folder, opts.category, `${opts.name}.mdc`) : join(folder, `${opts.name}.mdc`);
+	const id = opts.category ? `${opts.category}/${opts.name}` : opts.name;
+	const desc = opts.description || `${opts.name} ${opts.kind}`;
+	const always = opts.kind === "rule" && opts.alwaysApply ? "alwaysApply: true\n" : opts.kind === "rule" ? "alwaysApply: false\n" : "";
+	const body = `---
+name: ${opts.name}
+description: ${desc}
+${always}---
+
+# ${opts.name}
+
+${desc}
+`;
+	return {
+		paths: [writeNew(join(base, rel), body)],
+		id
+	};
+}
+function scaffoldScript(opts) {
+	const dir = join(opts.baseDir || process.cwd(), opts.category ? join("scripts", opts.category, opts.name) : join("scripts", opts.name));
+	const id = opts.category ? `${opts.category}/${opts.name}` : opts.name;
+	const desc = opts.description || `${opts.name} script`;
+	return {
+		paths: [writeNew(join(dir, "README.md"), `# ${opts.name}
+
+${desc}
+
+Place runnable scripts for this use case in this folder.
+`)],
+		id
+	};
+}
+function scaffoldProfile(opts) {
+	return {
+		paths: [writeNew(join(opts.baseDir || process.cwd(), opts.localConfig ? "profile" : "profiles", `${opts.name}.yaml`), stringify({
+			name: opts.name,
+			description: opts.description || `${opts.name} profile`,
+			scope: "project",
+			targets: { agents: opts.agents?.length ? opts.agents : ["cursor"] },
+			artifacts: {
+				skills: opts.skills ?? [],
+				rules: opts.rules ?? [],
+				agents: opts.agentsArtifacts ?? [],
+				scripts: opts.scripts ?? []
+			}
+		}))],
+		id: opts.name
+	};
+}
 let runningInsideAgent = false;
 try {
 	const result = await determineAgent();
@@ -651,17 +1064,17 @@ const silentOutput = new Writable({ write(_chunk, _encoding, callback) {
 } });
 const cancelSymbol = Symbol("cancel");
 const ALL_VALUE = "__all__";
-const BLUE = c.blue;
-const BLUE_BOLD = (s) => c.bold(c.blue(s));
-const S_STEP_ACTIVE = BLUE("◆");
+const BLUE = sky;
+const BLUE_BOLD = (s) => c.bold(sky(s));
+const S_STEP_ACTIVE = sky("◆");
 const S_STEP_CANCEL = c.red("■");
-const S_STEP_SUBMIT = BLUE("◇");
-const S_RADIO_ACTIVE = BLUE("●");
+const S_STEP_SUBMIT = sky("◇");
+const S_RADIO_ACTIVE = sky("●");
 const S_RADIO_INACTIVE = c.dim("○");
 const S_RADIO_DISABLED = c.dim("◌");
-const S_BULLET = BLUE("•");
+const S_BULLET = sky("•");
 const S_BAR = c.dim("│");
-const S_BAR_H = c.dim("─");
+c.dim("─");
 const S_CORNER = c.dim("└");
 const S_BOX_TL = c.dim("┌");
 const S_BOX_TR = c.dim("┐");
@@ -764,7 +1177,7 @@ function renderInfoBox(fields, innerWidth, rows) {
 	});
 	const body = expanded.map((r) => {
 		if (!r.label && !r.value) return `${S_BOX_V} ${" ".repeat(contentWidth)} ${S_BOX_V}`;
-		const content = `${r.label ? `${c.blue(padPlain(r.label, labelW))} ` : `${" ".repeat(labelW)} `}${r.cont ? c.dim(r.value) : c.bold(r.value)}`;
+		const content = `${r.label ? `${sky(padPlain(r.label, labelW))} ` : `${" ".repeat(labelW)} `}${r.cont ? c.dim(r.value) : c.bold(r.value)}`;
 		const plainW = approxStringWidth(stripVTControlCharacters(content));
 		const pad = Math.max(0, contentWidth - plainW);
 		return `${S_BOX_V} ${content}${" ".repeat(pad)} ${S_BOX_V}`;
@@ -859,6 +1272,7 @@ async function searchMultiselect(options) {
 		});
 		if (process.stdin.isTTY) process.stdin.setRawMode(true);
 		readline.emitKeypressEvents(process.stdin, rl);
+		if (process.stdout.isTTY) process.stdout.write("\x1B[?25l");
 		let query = "";
 		let cursor = 0;
 		const selected = new Set(initialSelected.filter((v) => String(v) !== ALL_VALUE));
@@ -873,6 +1287,32 @@ async function searchMultiselect(options) {
 			const matched = rest.filter((item) => item.label.toLowerCase().includes(lowerQ) || String(item.value).toLowerCase().includes(lowerQ) || item.hint && item.hint.toLowerCase().includes(lowerQ));
 			return allItem && (allItem.label.toLowerCase().includes(lowerQ) || "all".includes(lowerQ)) && allItem ? [allItem, ...matched] : matched;
 		};
+		const lockedTotal = lockedSection ? lockedSection.items.length + (lockedSection.hiddenCount ?? 0) : 0;
+		const selectedSummaryLine = (allOn) => {
+			if (allOn) {
+				const extra = lockedTotal ? `Universal (${lockedTotal}) + All additional (${uniqueItems.length})` : `All ${uniqueItems.length}`;
+				return `${S_BAR} ${BLUE("Selected:")} ${c.bold(extra)}`;
+			}
+			const labels = uniqueItems.filter((item) => selected.has(item.value)).map((item) => item.label);
+			if (labels.length === 0) {
+				if (requiredFlash) return `${S_BAR} ${c.red("Selected: pick at least one")}`;
+				if (lockedTotal > 0) return `${S_BAR} ${BLUE("Selected:")} ${c.bold(`Universal (${lockedTotal})`)}`;
+				return `${S_BAR} ${c.dim("Selected: (none)")}`;
+			}
+			const prefix = lockedTotal > 0 ? `Universal (${lockedTotal}) + ` : "";
+			const summary = labels.length <= 3 ? labels.join(", ") : `${labels.slice(0, 3).join(", ")} +${labels.length - 3} more`;
+			return `${S_BAR} ${BLUE("Selected:")} ${prefix}${summary}`;
+		};
+		const submitSummary = (allOn) => {
+			if (allOn) return lockedTotal ? `Universal (${lockedTotal}) + All additional (${uniqueItems.length})` : `All (${uniqueItems.length})`;
+			const labels = uniqueItems.filter((item) => selected.has(item.value)).map((item) => item.label);
+			if (labels.length === 0) return lockedTotal > 0 ? `Universal (${lockedTotal})` : "none";
+			return (lockedTotal > 0 ? `Universal (${lockedTotal}) + ` : "") + (labels.length <= 5 ? labels.join(", ") : `${labels.slice(0, 5).join(", ")} +${labels.length - 5}`);
+		};
+		const clearPrevious = (rows) => {
+			if (rows <= 0) return;
+			for (let i = 0; i < rows; i++) process.stdout.write("\x1B[1A\x1B[2K");
+		};
 		const render = (state = "active") => {
 			const lines = [];
 			const filtered = getFiltered();
@@ -881,14 +1321,9 @@ async function searchMultiselect(options) {
 			lines.push(`${icon} ${c.bold(message)}`);
 			lines.push(`${S_BAR}`);
 			if (state === "active") {
-				if (lockedSection && lockedSection.items.length > 0) {
-					const lockedTitle = `${c.bold(lockedSection.title)} ${c.dim("── always included")}`;
-					lines.push(`${S_BAR} ${S_BAR_H}${S_BAR_H} ${lockedTitle} ${S_BAR_H.repeat(8)}`);
-					for (const item of lockedSection.items.slice(0, 3)) lines.push(`${S_BAR} ${S_BULLET} ${c.bold(item.label)}`);
-					const more = (lockedSection.hiddenCount ?? 0) + Math.max(0, lockedSection.items.length - 3);
-					if (more > 0) lines.push(`${S_BAR} ${c.dim(`…and ${more} more`)}`);
-					lines.push(`${S_BAR}`);
-					lines.push(`${S_BAR} ${S_BAR_H}${S_BAR_H} ${c.bold("Additional")} ${S_BAR_H.repeat(26)}`);
+				if (lockedSection && lockedTotal > 0) {
+					lines.push(`${S_BAR} ${S_BULLET} ${c.bold(lockedSection.title)} ${c.dim(`· ${lockedTotal} always included`)}`);
+					lines.push(`${S_BAR} ${c.bold("Additional")}`);
 					lines.push(`${S_BAR}`);
 				}
 				if (searchable) {
@@ -938,28 +1373,20 @@ async function searchMultiselect(options) {
 				}
 				if (showSelectedSummary) {
 					lines.push(`${S_BAR}`);
-					if (allOn) lines.push(`${S_BAR} ${BLUE("Selected:")} ${c.bold(`All ${uniqueItems.length}`)}`);
-					else {
-						const labels = uniqueItems.filter((item) => selected.has(item.value)).map((item) => item.label);
-						if (labels.length === 0) lines.push(`${S_BAR} ${requiredFlash ? c.red("Selected: pick at least one") : c.dim("Selected: (none)")}`);
-						else {
-							const summary = labels.length <= 3 ? labels.join(", ") : `${labels.slice(0, 3).join(", ")} +${labels.length - 3} more`;
-							lines.push(`${S_BAR} ${BLUE("Selected:")} ${summary}`);
-						}
-					}
+					lines.push(selectedSummaryLine(allOn));
 				}
 				lines.push(`${S_CORNER}`);
-			} else if (state === "submit") {
-				const labels = allOn ? [`All (${uniqueItems.length})`] : uniqueItems.filter((item) => selected.has(item.value)).map((item) => item.label);
-				lines.push(`${S_BAR} ${c.dim(labels.join(", ") || "none")}`);
-			} else lines.push(`${S_BAR} ${c.strikethrough(c.dim("Cancelled"))}`);
-			const clearPreviousFrame = lastRenderHeight > 0 ? `\x1b[${lastRenderHeight}A\x1b[J` : "";
-			process.stdout.write(clearPreviousFrame + lines.join("\n") + "\n");
+			} else if (state === "submit") lines.push(`${S_BAR} ${c.dim(submitSummary(allOn))}`);
+			else lines.push(`${S_BAR} ${c.strikethrough(c.dim("Cancelled"))}`);
+			clearPrevious(lastRenderHeight);
+			const out = lines.join("\n") + "\n";
+			process.stdout.write(out);
 			lastRenderHeight = countVisualRowsForLines(lines, process.stdout.columns);
 		};
 		const cleanup = () => {
 			process.stdin.removeListener("keypress", keypressHandler);
 			if (process.stdin.isTTY) process.stdin.setRawMode(false);
+			if (process.stdout.isTTY) process.stdout.write("\x1B[?25h");
 			rl.close();
 		};
 		const submit = () => {
@@ -1037,6 +1464,103 @@ async function searchMultiselect(options) {
 		render();
 	});
 }
+function agentsPrompt(action) {
+	if (action === "remove") return "Which agents do you want to remove from?";
+	if (action === "update") return "Which agents do you want to update for?";
+	return "Which agents do you want to install to?";
+}
+function scopePrompt(action) {
+	if (action === "remove") return "Removal scope";
+	if (action === "update") return "Update scope";
+	return "Installation scope";
+}
+async function selectInstallScope(message, paths) {
+	if (isQuiet()) return "project";
+	return new Promise((resolve) => {
+		if (!process.stdin.isTTY) {
+			resolve("project");
+			return;
+		}
+		const rl = readline.createInterface({
+			input: process.stdin,
+			output: process.stdout
+		});
+		process.stdin.setRawMode(true);
+		readline.emitKeypressEvents(process.stdin, rl);
+		let value = "project";
+		let lastH = 0;
+		const joinRel = (base, rel) => {
+			const sep = base.includes("\\") ? "\\" : "/";
+			return `${base.replace(/[\\/]+$/, "")}${sep}${rel.replace(/\//g, sep)}`;
+		};
+		const optionBlock = (key, selected, done) => {
+			const active = done ? done === key : selected;
+			const bullet = active ? sky(c.bold("●")) : c.dim("○");
+			const title = key === "project" ? "Project" : "Global";
+			const hint = key === "project" ? "Install in the current directory (committed with your project)" : "Install in your home directory (available across all projects)";
+			const path = key === "project" ? paths.projectDir : paths.homeDir;
+			const lock = key === "project" ? joinRel(paths.projectDir, ".agentry/lock.json") : joinRel(paths.homeDir, ".agentry/lock.json");
+			const lines = [];
+			if (done === "cancel") lines.push(`${c.dim("│")}  ${c.strikethrough(c.dim(title))}`);
+			else {
+				lines.push(`${c.dim("│")}  ${bullet} ${active ? c.bold(title) : title}`);
+				lines.push(`${c.dim("│")}    ${c.dim(hint)}`);
+				lines.push(`${c.dim("│")}    ${sky("→")} ${c.dim(path)}`);
+				lines.push(`${c.dim("│")}    ${c.dim(`lock ${lock}`)}`);
+			}
+			return lines;
+		};
+		const paint = (done) => {
+			const lines = [];
+			if (done === "cancel") {
+				lines.push(`${sky("■")} ${c.bold(message)}`);
+				lines.push(`${c.dim("│")} ${c.strikethrough(c.dim("Cancelled"))}`);
+			} else if (done === "project" || done === "global") {
+				lines.push(`${sky("◇")} ${c.bold(message)}`);
+				lines.push(...optionBlock(done, true, done).slice(0, 2));
+				lines.push(`${c.dim("│")}    ${sky("→")} ${c.dim(done === "project" ? paths.projectDir : paths.homeDir)}`);
+			} else {
+				lines.push(`${sky("◆")} ${c.bold(message)}`);
+				lines.push(`${c.dim("│")}`);
+				lines.push(...optionBlock("project", value === "project"));
+				lines.push(`${c.dim("│")}`);
+				lines.push(...optionBlock("global", value === "global"));
+				lines.push(`${c.dim("└")} ${c.dim("↑/↓ select · enter confirm")}`);
+			}
+			if (lastH > 0) for (let i = 0; i < lastH; i++) process.stdout.write("\x1B[1A\x1B[2K");
+			process.stdout.write(lines.join("\n") + "\n");
+			lastH = lines.length;
+		};
+		const cleanup = () => {
+			process.stdin.removeListener("keypress", onKey);
+			process.stdin.setRawMode(false);
+			rl.close();
+		};
+		const onKey = (_s, key) => {
+			if (!key) return;
+			if (key.name === "up" || key.name === "down" || key.name === "tab") {
+				value = value === "project" ? "global" : "project";
+				paint();
+				return;
+			}
+			if (key.name === "return") {
+				paint(value);
+				cleanup();
+				blank();
+				resolve(value);
+				return;
+			}
+			if (key.name === "escape" || key.ctrl && key.name === "c") {
+				paint("cancel");
+				cleanup();
+				resolve(null);
+			}
+		};
+		process.stdin.on("keypress", onKey);
+		blank();
+		paint();
+	});
+}
 function isQuiet() {
 	return isCI() || !process.stdout.isTTY;
 }
@@ -1054,6 +1578,79 @@ function outro(message) {
 	}
 	clack.outro(message);
 }
+async function confirm(message) {
+	if (isQuiet()) return true;
+	return new Promise((resolve) => {
+		if (!process.stdin.isTTY) {
+			resolve(true);
+			return;
+		}
+		const rl = readline.createInterface({
+			input: process.stdin,
+			output: process.stdout
+		});
+		process.stdin.setRawMode(true);
+		readline.emitKeypressEvents(process.stdin, rl);
+		let value = true;
+		let lastH = 0;
+		const paint = (done) => {
+			const lines = [];
+			if (done === "cancel") {
+				lines.push(`${sky("■")} ${c.bold(message)}`);
+				lines.push(`${c.dim("│")} ${c.strikethrough(c.dim("Cancelled"))}`);
+			} else if (done === "yes" || done === "no") {
+				lines.push(`${sky("◇")} ${c.bold(message)}`);
+				lines.push(`${c.dim("│")} ${c.dim(done === "yes" ? "Yes" : "No")}`);
+			} else {
+				lines.push(`${sky("◆")} ${c.bold(message)}`);
+				lines.push(`${c.dim("│")}`);
+				const yes = value ? sky(c.bold("● Yes")) : c.dim("○ Yes");
+				const no = !value ? sky(c.bold("● No")) : c.dim("○ No");
+				lines.push(`${c.dim("│")}  ${yes}  /  ${no}`);
+				lines.push(`${c.dim("└")} ${c.dim("←/→ toggle · enter confirm")}`);
+			}
+			if (lastH > 0) for (let i = 0; i < lastH; i++) process.stdout.write("\x1B[1A\x1B[2K");
+			process.stdout.write(lines.join("\n") + "\n");
+			lastH = lines.length;
+		};
+		const cleanup = () => {
+			process.stdin.removeListener("keypress", onKey);
+			process.stdin.setRawMode(false);
+			rl.close();
+		};
+		const onKey = (_s, key) => {
+			if (!key) return;
+			if (key.name === "left" || key.name === "right" || key.name === "tab") {
+				value = !value;
+				paint();
+				return;
+			}
+			if (key.name === "y") {
+				value = true;
+				paint();
+				return;
+			}
+			if (key.name === "n") {
+				value = false;
+				paint();
+				return;
+			}
+			if (key.name === "return") {
+				paint(value ? "yes" : "no");
+				cleanup();
+				resolve(value);
+				return;
+			}
+			if (key.name === "escape" || key.ctrl && key.name === "c") {
+				paint("cancel");
+				cleanup();
+				resolve(false);
+			}
+		};
+		process.stdin.on("keypress", onKey);
+		paint();
+	});
+}
 function log(message) {
 	process.stdout.write(message + "\n");
 }
@@ -1063,7 +1660,7 @@ function blank() {
 async function sectionTransition(doneLabel, nextLabel) {
 	if (isQuiet()) return;
 	blank();
-	log(`${c.blue("◇")} ${c.dim("Done:")} ${c.bold(doneLabel)}`);
+	log(`${sky("◇")} ${c.dim("Done:")} ${c.bold(doneLabel)}`);
 	await delay(320);
 	for (const ch of [
 		"│",
@@ -1074,15 +1671,15 @@ async function sectionTransition(doneLabel, nextLabel) {
 		await delay(140);
 	}
 	await delay(200);
-	log(`${c.blue("◆")} ${c.bold("Next:")} ${nextLabel}`);
+	log(`${sky("◆")} ${c.bold("Next:")} ${nextLabel}`);
 	await delay(420);
 	blank();
 }
 function step(message) {
-	process.stdout.write(`  ${c.blue("→")} ${message}\n`);
+	process.stdout.write(`  ${sky("→")} ${message}\n`);
 }
 function ok(message) {
-	process.stdout.write(`${c.blue("✓")} ${message}\n`);
+	process.stdout.write(`${sky("✓")} ${message}\n`);
 }
 function err(message) {
 	process.stdout.write(`${c.red("✗")} ${message}\n`);
@@ -1091,13 +1688,13 @@ function warn(message) {
 	process.stdout.write(`${c.yellow("⚠")} ${message}\n`);
 }
 function info(message) {
-	process.stdout.write(`${c.blue("ℹ")} ${message}\n`);
+	process.stdout.write(`${sky("ℹ")} ${message}\n`);
 }
 async function spinner(startMsg, fn, stopWith, minMs = 480) {
 	if (isQuiet()) {
 		process.stdout.write(c.dim(`• ${startMsg}...`) + "\n");
 		const r = await fn();
-		if (stopWith) process.stdout.write(`${c.blue("◇")} ${stopWith(r)}\n`);
+		if (stopWith) process.stdout.write(`${sky("◇")} ${stopWith(r)}\n`);
 		return r;
 	}
 	const frames = [
@@ -1114,11 +1711,11 @@ async function spinner(startMsg, fn, stopWith, minMs = 480) {
 	];
 	let i = 0;
 	let alive = true;
-	process.stdout.write(`${c.blue(frames[0])} ${startMsg}`);
+	process.stdout.write(`${sky(frames[0])} ${startMsg}`);
 	const tick = setInterval(() => {
 		if (!alive) return;
 		i = (i + 1) % frames.length;
-		process.stdout.write(`\r${c.blue(frames[i])} ${startMsg}   `);
+		process.stdout.write(`\r${sky(frames[i])} ${startMsg}   `);
 	}, 80);
 	const started = Date.now();
 	try {
@@ -1128,7 +1725,7 @@ async function spinner(startMsg, fn, stopWith, minMs = 480) {
 		alive = false;
 		clearInterval(tick);
 		const msg = stopWith ? stopWith(result) : startMsg;
-		process.stdout.write(`\r\x1b[K${c.blue("◇")} ${msg}\n`);
+		process.stdout.write(`\r\x1b[K${sky("◇")} ${msg}\n`);
 		return result;
 	} catch (e) {
 		alive = false;
@@ -1235,23 +1832,23 @@ async function selectAgents(message, universal, others, detectedNames = []) {
 	}));
 	const locked = universal.length > 0 ? {
 		title: "Universal",
-		items: universal.slice(0, 6).map((a) => ({
+		items: universal.map((a) => ({
 			value: a.name,
 			label: a.displayName,
 			fields: agentFields(a, true)
 		})),
-		hiddenCount: Math.max(0, universal.length - 6)
+		compact: true
 	} : void 0;
 	const res = await searchMultiselect({
 		message,
 		items,
-		maxVisible: 8,
+		maxVisible: 5,
 		required: false,
 		initialSelected: detected.map((d) => d.name),
 		lockedSection: locked,
 		searchable: true,
 		showDetail: true,
-		detailLines: 8,
+		detailLines: 4,
 		showSelectedSummary: true,
 		includeAllOption: true,
 		allLabel: `All additional (${uniqueOthers.length})`,
@@ -1273,12 +1870,12 @@ function installSummary(artifacts, agents, scopeLabel) {
 	blank();
 	const bar = c.dim("│");
 	const corner = c.dim("└");
-	log(`${c.blue("◆")} ${c.bold("Install summary")}`);
+	log(`${sky("◆")} ${c.bold("Install summary")}`);
 	log(bar);
-	log(`${bar}  ${c.blue("Scope")}      ${scopeLabel}`);
+	log(`${bar}  ${sky("Scope")}      ${scopeLabel}`);
 	const universalCount = agents.filter((a) => a.skillsDir === ".agents/skills").length;
 	const otherCount = agents.length - universalCount;
-	log(`${bar}  ${c.blue("Targets")}    ${agents.length} agent${agents.length === 1 ? "" : "s"}` + c.dim(` · ${universalCount} universal` + (otherCount ? ` · ${otherCount} additional` : "")));
+	log(`${bar}  ${sky("Targets")}    ${agents.length} agent${agents.length === 1 ? "" : "s"}` + c.dim(` · ${universalCount} universal` + (otherCount ? ` · ${otherCount} additional` : "")));
 	const names = agents.map((a) => a.displayName);
 	const chunks = [];
 	let line = "";
@@ -1297,7 +1894,7 @@ function installSummary(artifacts, agents, scopeLabel) {
 	log(bar);
 	for (const a of artifacts) {
 		const desc = (a.description || "").replace(/\s+/g, " ").trim().slice(0, 52);
-		log(`${bar}  ${c.blue("•")} ${c.bold(`${a.kind}/${a.id}`)}`);
+		log(`${bar}  ${sky("•")} ${c.bold(`${a.kind}/${a.id}`)}`);
 		if (desc) log(`${bar}    ${c.dim(desc)}`);
 	}
 	log(bar);
@@ -1307,16 +1904,29 @@ function installSummary(artifacts, agents, scopeLabel) {
 function preview(artifacts, agents) {
 	installSummary(artifacts, agents, "preview (dry-run)");
 }
+async function resolveSourceWithUi(source, opts) {
+	const resolved = await resolveSource(source, { confirmCache: async ({ url, error }) => {
+		warn(`git clone failed for ${url}`);
+		if (error) step(c.dim(error.split("\n")[0] || error));
+		if (opts.yes || isQuiet()) {
+			info("Using cached copy.");
+			return true;
+		}
+		return confirm("Load from cache instead?");
+	} });
+	if (resolved.fromCache) info("Loaded source from cache.");
+	return resolved;
+}
 async function cmdAdd(kind, source, selector, opts) {
 	if (!source) throw new Error(`Missing source. e.g. agentry add ${kind} author/repo`);
 	intro();
 	await delayQuiet(180);
 	await spinner("Parsing source…", () => parseSourceForUi(source), (p) => {
 		const where = p.url || p.local || source;
-		return `${c.blue("Source:")} ${where}${p.ref ? c.dim(` @ ${p.ref}`) : ""}${p.subpath ? c.dim(` (${p.subpath})`) : ""}`;
+		return `${theme.primary("Source:")} ${where}${p.ref ? c.dim(` @ ${p.ref}`) : ""}${p.subpath ? c.dim(` (${p.subpath})`) : ""}`;
 	}, 520);
 	await delayQuiet(280);
-	const { root, cleanup } = resolveSource(source);
+	const { root, cleanup } = await resolveSourceWithUi(source, opts);
 	try {
 		const artifacts = await spinner("Discovering…", () => kind === "all" ? listAll(root) : select(root, kind, selector), (a) => {
 			const noun = kind === "all" ? "artifact" : kind;
@@ -1329,7 +1939,7 @@ async function cmdAdd(kind, source, selector, opts) {
 		await delayQuiet(320);
 		blank();
 		if (opts.dryRun) {
-			preview(artifacts, await resolveAgentList(opts));
+			preview(artifacts, await resolveAgentList(opts, "install"));
 			return;
 		}
 		let chosen = artifacts;
@@ -1347,8 +1957,11 @@ async function cmdAdd(kind, source, selector, opts) {
 			await delayQuiet(200);
 			blank();
 		}
-		const agentList = await resolveAgentList(opts);
-		if (!isQuiet() && !opts.agents.length && !opts.all && !opts.yes) await sectionTransition(`${agentList.length} agent${agentList.length === 1 ? "" : "s"} selected`, "install summary");
+		const agentList = await resolveAgentList(opts, "install");
+		const askScope = !opts.scopeExplicit && !opts.yes && !isQuiet();
+		if (!isQuiet() && !opts.agents.length && !opts.all && !opts.yes) await sectionTransition(`${agentList.length} agent${agentList.length === 1 ? "" : "s"} selected`, askScope ? "installation scope" : "install summary");
+		if (!await ensureInstallScope(opts, "install")) return;
+		if (askScope) await sectionTransition("scope set", "install summary");
 		installAll(chosen, opts, agentList, source);
 	} finally {
 		cleanup();
@@ -1360,14 +1973,15 @@ async function delayQuiet(ms) {
 	await delay(ms);
 }
 function parseSourceForUi(source) {
-	return import("./_chunks/source_parser.mjs").then((m) => m.parseSource(source));
+	return parseSource(source);
 }
 async function cmdAddProfile(name, source, opts) {
 	const { file, profile } = loadProfile(name);
 	const repo = source || (profile.artifacts.skills[0]?.source ?? profile.artifacts.rules[0]?.source);
 	if (!repo) throw new Error(`No source given and ${file} lists none. Try: agentry add profile ${name} author/repo`);
-	const agentList = await resolveAgentList(opts);
-	const { root, cleanup } = resolveSource(repo);
+	const agentList = await resolveAgentList(opts, "install");
+	if (!await ensureInstallScope(opts, "install")) return;
+	const { root, cleanup } = await resolveSourceWithUi(repo, opts);
 	try {
 		const artifacts = [];
 		const plural = (k) => k === "skill" ? "skills" : k === "rule" ? "rules" : k === "script" ? "scripts" : "agents";
@@ -1375,7 +1989,7 @@ async function cmdAddProfile(name, source, opts) {
 			if (k === "profile") continue;
 			const refs = profile.artifacts[plural(k)] ?? [];
 			for (const ref of refs) {
-				const src = ref.source ? resolveSource(ref.source) : {
+				const src = ref.source ? await resolveSourceWithUi(ref.source, opts) : {
 					root,
 					cleanup: () => {}
 				};
@@ -1392,7 +2006,7 @@ async function cmdAddProfile(name, source, opts) {
 		cleanup();
 	}
 }
-async function resolveAgentList(opts) {
+async function resolveAgentList(opts, action = "install") {
 	if (opts.all) return listAgents();
 	if (opts.agents.length) {
 		const { agents, unknown } = resolveAgents(opts.agents);
@@ -1408,10 +2022,27 @@ async function resolveAgentList(opts) {
 		const picked = detectedOthers.length ? detectedOthers : ["cursor"];
 		return [...universal, ...others.filter((o) => picked.includes(o.name))];
 	}
-	const selected = await selectAgents("Which agents do you want to install to?", visibleUniversal, others, detectedOthers);
+	const selected = await selectAgents(agentsPrompt(action), visibleUniversal, others, detectedOthers);
 	if (isCancelLike(selected)) throw new Error("Cancelled.");
 	return selected;
 }
+async function ensureInstallScope(opts, action) {
+	if (opts.scopeExplicit) return true;
+	if (opts.yes || isQuiet()) return true;
+	const { homedir } = await import("node:os");
+	if (!isQuiet()) await sectionTransition(`${action === "install" ? "agents" : action} ready`, scopePrompt(action).toLowerCase());
+	const picked = await selectInstallScope(scopePrompt(action), {
+		projectDir: opts.dir || process.cwd(),
+		homeDir: homedir()
+	});
+	if (picked == null || isCancelLike(picked)) {
+		outro("Cancelled.");
+		return false;
+	}
+	opts.scope = picked;
+	opts.scopeExplicit = true;
+	return true;
+}
 function installAll(artifacts, opts, agentList, source) {
 	if (!artifacts.length) {
 		warn("Nothing matched - nothing installed.");
@@ -1430,74 +2061,220 @@ function toInstallOpts(opts) {
 		dryRun: opts.dryRun
 	};
 }
-async function cmdRemove(kind, selector, opts) {
-	const agentList = await resolveAgentList(opts);
+function resolveSourceOrSelector(arg1, arg2, opts) {
+	if (arg1 && arg2) return {
+		source: arg1,
+		selector: arg2
+	};
+	if (!arg1) return {};
+	if (isExplicitSource(arg1)) return { source: arg1 };
+	if (isOwnerRepoShape(arg1)) {
+		const bases = [{
+			scope: "project",
+			dir: opts.dir,
+			agents: opts.agents,
+			copy: opts.copy,
+			dryRun: opts.dryRun
+		}, {
+			scope: "global",
+			agents: opts.agents,
+			copy: opts.copy,
+			dryRun: opts.dryRun
+		}];
+		for (const base of bases) {
+			const lock = readLock(base);
+			if (Object.values(lock.items).some((e) => e.source && sourcesEqual(e.source, arg1))) return { source: arg1 };
+		}
+	}
+	return { selector: arg1 };
+}
+async function cmdRemove(kind, arg1, arg2, opts) {
+	intro();
+	const { source, selector } = resolveSourceOrSelector(arg1, arg2, opts);
+	if (source) await spinner("Resolving source…", () => parseSource(source), (p) => {
+		const where = p.url || p.local || source;
+		return `${theme.primary("Source:")} ${where}${p.ref ? c.dim(` @ ${p.ref}`) : ""}`;
+	}, 420);
+	if (!isQuiet() && !opts.agents.length && !opts.all && !opts.yes) await sectionTransition("prepare remove", "choose agents to remove from");
+	const agentList = await resolveAgentList(opts, "remove");
+	if (!await ensureInstallScope(opts, "remove")) return;
 	const installOpts = toInstallOpts(opts);
-	const scope = [kind, selector].filter(Boolean).join("/");
+	const scope = [
+		kind,
+		source,
+		selector
+	].filter(Boolean).join(" / ");
 	if (kind === "all") {
 		let count = 0;
-		for (const t of ARTIFACT_KINDS) count += removeSelection(t, void 0, installOpts, agentList).removedKeys.length;
-		ok(`Removed ${count} item(s).`);
+		let paths = 0;
+		for (const t of ARTIFACT_KINDS) {
+			const r = removeSelection(t, void 0, installOpts, agentList, source);
+			count += r.removedKeys.length;
+			paths += r.removedPaths.length;
+		}
+		ok(`Removed ${count} item(s)${paths ? c.dim(` · ${paths} path(s)`) : ""}${source ? c.dim(` from ${source}`) : ""}.`);
 		return;
 	}
-	const r = removeSelection(kind, selector, installOpts, agentList);
+	const r = removeSelection(kind, selector, installOpts, agentList, source);
 	if (!r.existed) {
-		warn(`Nothing installed at "${scope}".`);
+		warn(`Nothing installed matching "${scope}".`);
 		return;
 	}
 	for (const k of r.removedKeys) step(`removed ${k}`);
-	ok(`Removed ${r.removedKeys.length} item(s).`);
+	for (const p of r.removedPaths.slice(0, 12)) step(c.dim(`deleted ${p}`));
+	if (r.removedPaths.length > 12) step(c.dim(`…and ${r.removedPaths.length - 12} more paths`));
+	ok(`Removed ${r.removedKeys.length} item(s)${r.removedPaths.length ? c.dim(` · ${r.removedPaths.length} path(s)`) : ""}${source ? c.dim(` from ${source}`) : ""}.`);
 }
-function cmdList(source, kind) {
-	if (!source) throw new Error("Missing source. e.g. agentry list author/repo");
-	const { root, cleanup } = resolveSource(source);
+async function cmdList(source, kind, selector, opts) {
+	if (!source) {
+		cmdListInstalled(opts, kind, selector);
+		return;
+	}
+	intro();
+	await spinner("Parsing source…", () => parseSource(source), (p) => {
+		const where = p.url || p.local || source;
+		return `${theme.primary("Source:")} ${where}${p.ref ? c.dim(` @ ${p.ref}`) : ""}${p.subpath ? c.dim(` (${p.subpath})`) : ""}`;
+	}, 420);
+	const { root, cleanup } = await resolveSourceWithUi(source, opts);
 	try {
-		for (const k of kind ? [kind] : ARTIFACT_KINDS) {
-			log(theme.info(`${k}s:`));
-			const items = listKind(root, k);
-			if (!items.length) {
-				step("(none)");
-				continue;
-			}
-			for (const it of items) {
-				const desc = (it.description || "").replace(/\s+/g, " ").slice(0, 80);
-				step(`${it.id}${desc ? " - " + desc : ""}`);
-			}
-		}
+		printArtifactList(await spinner("Discovering…", () => {
+			if (kind) return select(root, kind, selector);
+			return listAll(root);
+		}, (a) => `Found ${a.length} artifact${a.length === 1 ? "" : "s"}`, 520), {
+			title: "Available in source",
+			subtitle: source
+		});
 	} finally {
 		cleanup();
 	}
 }
-function cmdListInstalled(opts) {
-	const installed = listInstalled(toInstallOpts(opts));
+function cmdListInstalled(opts, kind, selector) {
+	intro();
+	let installed = listInstalled(toInstallOpts(opts));
+	if (kind) installed = installed.filter((it) => it.kind === kind || it.id.startsWith(kind + "/"));
+	if (selector && kind) {
+		const rel = `${kind}/${selector}`;
+		installed = installed.filter((it) => it.id === rel || it.id.startsWith(rel + "/") || it.id.endsWith("/" + selector) || it.id === `${kind}/${selector}`);
+	} else if (selector) installed = installed.filter((it) => it.id.includes(selector));
 	if (!installed.length) {
-		info("Nothing installed.");
+		info(kind || selector ? `Nothing installed matching that filter.` : "Nothing installed.");
+		step(c.dim("Try: agentry add skills mhmdreza-rafiei/agent-tools"));
+		return;
+	}
+	const bar = c.dim("│");
+	const corner = c.dim("└");
+	blank();
+	log(`${sky("◆")} ${c.bold("Installed")}`);
+	log(bar);
+	log(`${bar}  ${sky("Scope")}   ${opts.scope === "global" ? "global (~)" : `project (${opts.dir || process.cwd()})`}`);
+	log(`${bar}  ${sky("Total")}   ${installed.length} artifact${installed.length === 1 ? "" : "s"}`);
+	log(bar);
+	const byKind = /* @__PURE__ */ new Map();
+	for (const it of installed) {
+		const k = it.kind || it.id.split("/")[0];
+		const arr = byKind.get(k) || [];
+		arr.push(it);
+		byKind.set(k, arr);
+	}
+	for (const k of ARTIFACT_KINDS) {
+		const items = byKind.get(k);
+		if (!items?.length) continue;
+		log(`${bar}  ${c.bold(k + "s")}  ${c.dim(`(${items.length})`)}`);
+		for (const it of items) {
+			const id = it.id.includes("/") ? it.id.slice(it.id.indexOf("/") + 1) : it.id;
+			log(`${bar}  ${sky("•")} ${c.bold(id)}`);
+			const agents = it.agents?.length ? it.agents.join(", ") : "—";
+			log(`${bar}    ${c.dim(`agents: ${agents}`)}`);
+			if (it.source) log(`${bar}    ${c.dim(`source: ${it.source}`)}`);
+		}
+		log(bar);
+	}
+	log(`${corner}  ${c.dim("agentry remove <kind> [source] [selector]  ·  agentry update <kind> [source]")}`);
+	blank();
+}
+function printArtifactList(artifacts, meta) {
+	const bar = c.dim("│");
+	const corner = c.dim("└");
+	blank();
+	log(`${sky("◆")} ${c.bold(meta.title)}`);
+	log(bar);
+	if (meta.subtitle) log(`${bar}  ${sky("From")}    ${meta.subtitle}`);
+	log(`${bar}  ${sky("Total")}   ${artifacts.length}`);
+	log(bar);
+	if (!artifacts.length) {
+		log(`${bar}  ${c.dim("(none)")}`);
+		log(bar);
+		log(`${corner}`);
+		blank();
 		return;
 	}
-	for (const it of installed) step(`${it.id} -> ${it.agents.join(", ")}`);
+	const byKind = /* @__PURE__ */ new Map();
+	for (const a of artifacts) {
+		const arr = byKind.get(a.kind) || [];
+		arr.push(a);
+		byKind.set(a.kind, arr);
+	}
+	for (const k of ARTIFACT_KINDS) {
+		const items = byKind.get(k);
+		if (!items?.length) continue;
+		log(`${bar}  ${c.bold(k + "s")}  ${c.dim(`(${items.length})`)}`);
+		for (const it of items) {
+			const desc = (it.description || "").replace(/\s+/g, " ").trim().slice(0, 56);
+			log(`${bar}  ${sky("•")} ${c.bold(it.id)}`);
+			if (desc) log(`${bar}    ${c.dim(desc)}`);
+		}
+		log(bar);
+	}
+	log(`${corner}  ${c.dim("agentry add <kind> <source> [selector]")}`);
+	blank();
 }
-async function cmdUpdateAssets(kind, source, selector, opts) {
-	const installOpts = toInstallOpts(opts);
-	const agentList = await resolveAgentList(opts);
+async function cmdUpdateAssets(kind, arg1, arg2, opts) {
+	intro();
+	const { source, selector } = resolveSourceOrSelector(arg1, arg2, opts);
 	if (source) {
-		const { root, cleanup } = resolveSource(source);
+		await spinner("Parsing source…", () => parseSource(source), (p) => {
+			const where = p.url || p.local || source;
+			return `${theme.primary("Source:")} ${where}${p.ref ? c.dim(` @ ${p.ref}`) : ""}`;
+		}, 520);
+		const { root, cleanup } = await resolveSourceWithUi(source, opts);
 		try {
-			const artifacts = kind === "all" ? listAll(root) : select(root, kind, selector);
+			const artifacts = await spinner("Discovering…", () => kind === "all" ? listAll(root) : select(root, kind, selector), (a) => `Found ${a.length} to update`, 620);
 			if (!artifacts.length) {
 				warn(`Nothing found in ${source}.`);
 				return;
 			}
-			installAll(artifacts, opts, agentList, source);
+			let chosen = artifacts;
+			if (!selector && kind !== "all" && artifacts.length > 1 && !opts.all && !opts.yes && !isQuiet()) {
+				await sectionTransition("source discovery", `select ${kind}s to update`);
+				const picked = await selectArtifacts(`Select ${kind}s to update`, artifacts);
+				if (isCancelLike(picked)) {
+					outro("Cancelled.");
+					return;
+				}
+				chosen = picked;
+				await sectionTransition(`${chosen.length} ${kind}${chosen.length === 1 ? "" : "s"} selected`, "choose target agents");
+			} else if (!isQuiet() && !opts.agents.length && !opts.all && !opts.yes) await sectionTransition(`${chosen.length} ${kind}${chosen.length === 1 ? "" : "s"} ready`, "choose target agents");
+			const agentList = await resolveAgentList(opts, "update");
+			if (!await ensureInstallScope(opts, "update")) return;
+			if (!isQuiet() && !opts.agents.length && !opts.all && !opts.yes) await sectionTransition(`${agentList.length} agent${agentList.length === 1 ? "" : "s"} selected`, "update summary");
+			installAll(chosen, opts, agentList, source);
 		} finally {
 			cleanup();
 		}
 		return;
 	}
-	const installed = listInstalled(installOpts).filter((it) => kind === "all" || it.id.startsWith(kind + "/"));
+	if (!await ensureInstallScope(opts, "update")) return;
+	let installed = listInstalled(toInstallOpts(opts)).filter((it) => kind === "all" || it.id.startsWith(kind + "/"));
+	if (selector) {
+		const rel = `${kind}/${selector}`;
+		installed = installed.filter((it) => it.id === rel || it.id.startsWith(rel + "/") || it.id.endsWith("/" + selector));
+	}
 	if (!installed.length) {
 		warn(`No installed ${kind} recorded in lockfile. Provide a source.`);
 		return;
 	}
+	if (!isQuiet() && !opts.agents.length && !opts.all && !opts.yes) await sectionTransition("lockfile sources", "choose agents to update for");
+	const agentList = await resolveAgentList(opts, "update");
 	const bySource = /* @__PURE__ */ new Map();
 	for (const it of installed) if (it.source) {
 		const arr = bySource.get(it.source) || [];
@@ -1509,22 +2286,216 @@ async function cmdUpdateAssets(kind, source, selector, opts) {
 		return;
 	}
 	for (const [s, ids] of bySource) {
-		const { root, cleanup } = resolveSource(s);
+		info(`Updating from ${s}…`);
+		const { root, cleanup } = await resolveSourceWithUi(s, opts);
 		try {
-			installAll(ids.map((id) => select(root, id.split("/")[0], id.split("/").slice(1).join("/") || void 0)).flat(), opts, agentList, s);
+			installAll(ids.map((id) => {
+				const [k, ...rest] = id.split("/");
+				return select(root, k, rest.join("/") || void 0);
+			}).flat(), opts, agentList, s);
 		} finally {
 			cleanup();
 		}
 	}
 }
+async function promptText(message, initial) {
+	if (isQuiet()) return initial || null;
+	const res = await clack.text({
+		message,
+		initialValue: initial || "",
+		placeholder: initial
+	});
+	if (clack.isCancel(res)) return null;
+	return String(res).trim() || null;
+}
+async function pickFromSource(kind, source, message, opts) {
+	const { root, cleanup } = await resolveSourceWithUi(source, opts);
+	try {
+		const artifacts = listKind(root, kind);
+		if (!artifacts.length) {
+			warn(`No ${kind}s in ${source}.`);
+			return [];
+		}
+		if (isQuiet() || artifacts.length === 1) return artifacts.map((a) => ({
+			id: a.id,
+			source
+		}));
+		const picked = await selectArtifacts(message, artifacts);
+		if (isCancelLike(picked) || !picked) return [];
+		return picked.map((a) => ({
+			id: a.id,
+			source
+		}));
+	} finally {
+		cleanup();
+	}
+}
+async function cmdInit(kind, nameArg, categoryArg, opts) {
+	intro();
+	const baseDir = opts.dir || process.cwd();
+	let name = nameArg;
+	let category = categoryArg || null;
+	if (!name && !isQuiet()) name = await promptText(`Name for the new ${kind}`) || void 0;
+	if (!name) throw new Error(`Missing name. e.g. agentry init ${kind} my-${kind}`);
+	let description = opts.description;
+	if (!description && !opts.yes && !isQuiet()) description = await promptText("Description (optional)", `${name} ${kind}`) || `${name} ${kind}`;
+	description = description || `${name} ${kind}`;
+	if (kind === "skill") {
+		const reference = opts.reference !== false;
+		if (opts.dryRun) {
+			info(`Would create skills/${category ? category + "/" : ""}${name}/SKILL.md${reference ? " + references/TEMPLATE.md" : ""}`);
+			return;
+		}
+		const r = scaffoldSkill({
+			name,
+			category,
+			description,
+			reference,
+			baseDir
+		});
+		for (const p of r.paths) step(p);
+		ok(`Initialized skill ${r.id}`);
+		return;
+	}
+	if (kind === "agent" || kind === "rule") {
+		if (opts.dryRun) {
+			info(`Would create ${kind}s/${category ? category + "/" : ""}${name}.mdc`);
+			return;
+		}
+		const r = scaffoldMdc({
+			kind,
+			name,
+			category,
+			description,
+			alwaysApply: opts.alwaysApply,
+			baseDir
+		});
+		for (const p of r.paths) step(p);
+		ok(`Initialized ${kind} ${r.id}`);
+		return;
+	}
+	if (kind === "script") {
+		if (opts.dryRun) {
+			info(`Would create scripts/${category ? category + "/" : ""}${name}/`);
+			return;
+		}
+		const r = scaffoldScript({
+			name,
+			category,
+			description,
+			baseDir
+		});
+		for (const p of r.paths) step(p);
+		ok(`Initialized script ${r.id}`);
+		return;
+	}
+	if (kind === "profile") {
+		await initProfile(name, description, opts, baseDir);
+		return;
+	}
+	throw new Error(`Cannot init kind: ${kind}`);
+}
+async function initProfile(name, description, opts, baseDir) {
+	const initKinds = opts.initKinds || {};
+	const wantAll = opts.all;
+	let wantSkills = wantAll || initKinds.skills !== void 0;
+	let wantAgents = wantAll || initKinds.agents !== void 0;
+	let wantRules = wantAll || initKinds.rules !== void 0;
+	let wantScripts = wantAll || initKinds.scripts !== void 0;
+	if (!wantSkills && !wantAgents && !wantRules && !wantScripts && !opts.yes && !isQuiet()) {
+		const res = await clack.multiselect({
+			message: "What should this profile include?",
+			options: [
+				{
+					value: "skills",
+					label: "Skills"
+				},
+				{
+					value: "agents",
+					label: "Agents"
+				},
+				{
+					value: "rules",
+					label: "Rules"
+				},
+				{
+					value: "scripts",
+					label: "Scripts"
+				}
+			],
+			required: false
+		});
+		if (clack.isCancel(res)) {
+			outro("Cancelled.");
+			return;
+		}
+		const set = new Set(res);
+		wantSkills = set.has("skills");
+		wantAgents = set.has("agents");
+		wantRules = set.has("rules");
+		wantScripts = set.has("scripts");
+	}
+	const agentList = opts.agents.length ? (await resolveAgentList(opts, "install")).map((a) => a.name) : ["cursor"];
+	const skills = [];
+	const rules = [];
+	const agentsArtifacts = [];
+	const scripts = [];
+	async function fill(flag, enabled, k, into) {
+		if (!enabled) return;
+		const src = typeof flag === "string" ? flag : void 0;
+		if (src) {
+			const picked = await pickFromSource(k, src, `Select ${k}s for profile`, opts);
+			into.push(...picked);
+			return;
+		}
+		if (isQuiet() || opts.yes) return;
+		const ask = await promptText(`Source for ${k}s (author/repo, URL, or local path — empty to skip)`);
+		if (!ask) return;
+		const picked = await pickFromSource(k, ask, `Select ${k}s for profile`, opts);
+		into.push(...picked);
+	}
+	await fill(initKinds.skills, wantSkills, "skill", skills);
+	await fill(initKinds.agents, wantAgents, "agent", agentsArtifacts);
+	await fill(initKinds.rules, wantRules, "rule", rules);
+	await fill(initKinds.scripts, wantScripts, "script", scripts);
+	if (opts.dryRun) {
+		info(`Would write profiles/${name}.yaml with ${skills.length} skills, ${agentsArtifacts.length} agents, ${rules.length} rules, ${scripts.length} scripts`);
+		return;
+	}
+	const r = scaffoldProfile({
+		name,
+		description,
+		agents: agentList,
+		skills,
+		rules,
+		agentsArtifacts,
+		scripts,
+		baseDir
+	});
+	for (const p of r.paths) step(p);
+	ok(`Initialized profile ${r.id}`);
+}
+function takeOptValue(argv, i) {
+	const next = argv[i + 1];
+	if (next && !next.startsWith("-")) return {
+		value: next,
+		next: i + 1
+	};
+	return {
+		value: true,
+		next: i
+	};
+}
 function parseArgs(argv) {
 	const opts = {
 		scope: "project",
+		scopeExplicit: false,
 		agents: [],
 		copy: false,
 		dryRun: false,
 		yes: false,
-		all: false
+		all: false,
+		initKinds: {}
 	};
 	const positional = [];
 	const flags = {};
@@ -1532,15 +2503,19 @@ function parseArgs(argv) {
 		const a = argv[i];
 		if (a === "-g" || a === "--global") {
 			opts.scope = "global";
+			opts.scopeExplicit = true;
 			flags.global = true;
-		} else if (a === "--project") {
+		} else if (a === "-p" || a === "--project") {
 			opts.scope = "project";
+			opts.scopeExplicit = true;
 			flags.project = true;
 		} else if (a === "-y" || a === "--yes") {
 			opts.yes = true;
 			flags.yes = true;
-		} else if (a === "--dir") {
+		} else if (a === "-d" || a === "--dir") {
 			opts.dir = argv[++i];
+			opts.scope = "project";
+			opts.scopeExplicit = true;
 			flags.dir = opts.dir;
 		} else if (a === "-a" || a === "--agent") {
 			opts.agents.push(argv[++i]);
@@ -1554,6 +2529,38 @@ function parseArgs(argv) {
 		} else if (a === "--all") {
 			opts.all = true;
 			flags.all = true;
+		} else if (a === "--description") {
+			opts.description = argv[++i];
+			flags.description = opts.description;
+		} else if (a === "--alwaysApply" || a === "--always-apply") {
+			opts.alwaysApply = true;
+			flags.alwaysApply = true;
+		} else if (a === "--reference") {
+			opts.reference = true;
+			flags.reference = true;
+		} else if (a === "--no-reference") {
+			opts.reference = false;
+			flags.reference = false;
+		} else if (a === "--skills") {
+			const { value, next } = takeOptValue(argv, i);
+			opts.initKinds.skills = value;
+			i = next;
+			flags.skills = true;
+		} else if (a === "--agents") {
+			const { value, next } = takeOptValue(argv, i);
+			opts.initKinds.agents = value;
+			i = next;
+			flags.agents = true;
+		} else if (a === "--rules") {
+			const { value, next } = takeOptValue(argv, i);
+			opts.initKinds.rules = value;
+			i = next;
+			flags.rules = true;
+		} else if (a === "--scripts") {
+			const { value, next } = takeOptValue(argv, i);
+			opts.initKinds.scripts = value;
+			i = next;
+			flags.scripts = true;
 		} else if (a === "-v" || a === "--version") flags.version = true;
 		else if (a === "-h" || a === "--help") flags.help = true;
 		else positional.push(a);
@@ -1599,7 +2606,11 @@ async function runUpdateSelf() {
 function runNpmInstall(spec) {
 	spinner(`Updating agentry CLI`, () => {
 		try {
-			execSync(`npm install -g ${spec}`, { stdio: "inherit" });
+			execFileSync("npm", [
+				"install",
+				"-g",
+				spec
+			], { stdio: "inherit" });
 		} catch {
 			err("Update failed. Once published, run: npm install -g " + spec);
 			process.exit(1);
@@ -1609,7 +2620,11 @@ function runNpmInstall(spec) {
 function runUninstall() {
 	spinner("Uninstalling agentry CLI", () => {
 		try {
-			execSync(`npm uninstall -g ${name}`, { stdio: "inherit" });
+			execFileSync("npm", [
+				"uninstall",
+				"-g",
+				name
+			], { stdio: "inherit" });
 		} catch {
 			err("Uninstall failed. Try: npm uninstall -g " + name);
 			process.exit(1);
@@ -1650,12 +2665,21 @@ async function main() {
 		return;
 	}
 	if (action === "list") {
-		if (positional.length === 1) {
-			cmdListInstalled(opts);
+		const a1 = positional[1];
+		const a2 = positional[2];
+		const a3 = positional[3];
+		if (!a1) {
+			await cmdList(void 0, void 0, void 0, opts);
 			return;
 		}
-		const k = positional[2] ? normalizeKind(positional[2]) : void 0;
-		cmdList(positional[1], k && isKind(k) ? k : void 0);
+		const k1 = normalizeKind(a1);
+		if (isKind(k1) && !isExplicitSource(a1) && !/^[\w.-]+\/[\w.-]+$/.test(a1)) {
+			await cmdList(void 0, k1, a2, opts);
+			return;
+		}
+		const kind = a2 ? normalizeKind(a2) : void 0;
+		if (kind && kind !== "all" && !isKind(kind)) throw new Error(`Unknown kind: ${kind}`);
+		await cmdList(a1, kind && isKind(kind) ? kind : void 0, a3, opts);
 		return;
 	}
 	if (action === "add") {
@@ -1673,7 +2697,13 @@ async function main() {
 		const kind = positional[1] ? normalizeKind(positional[1]) : void 0;
 		if (!kind) throw new Error("Missing kind. e.g. agentry remove skills enhance-prompt");
 		if (kind !== "all" && !isKind(kind)) throw new Error(`Unknown kind: ${kind}`);
-		await cmdRemove(kind, positional[2], opts);
+		await cmdRemove(kind, positional[2], positional[3], opts);
+		return;
+	}
+	if (action === "init") {
+		const kind = positional[1] ? normalizeKind(positional[1]) : void 0;
+		if (!kind || !isKind(kind)) throw new Error("Missing kind. e.g. agentry init skill my-skill [category]");
+		await cmdInit(kind, positional[2], positional[3], opts);
 		return;
 	}
 	err(`Unknown action: ${action}`);