skills 1.5.24 → 1.5.26

package/README.md

@@ -3,7 +3,7 @@
 The CLI for the open agent skills ecosystem.
 
 <!-- agent-list:start -->
-Supports **OpenCode**, **Claude Code**, **Codex**, **Cursor**, and [73 more](#supported-agents).
+Supports **OpenCode**, **Claude Code**, **Codex**, **Cursor**, and [75 more](#supported-agents).
 <!-- agent-list:end -->
 
 [![skills.sh](https://skills.sh/b/vercel-labs/skills)](https://skills.sh/vercel-labs/skills)
@@ -279,7 +279,7 @@ Skills can be installed to any of these agents:
 | IBM Bob | `bob` | `.bob/skills/` | `~/.bob/skills/` |
 | Claude Code | `claude-code` | `.claude/skills/` | `~/.claude/skills/` |
 | OpenClaw | `openclaw` | `skills/` | `~/.openclaw/skills/` |
-| Cline, Dexto, Kimi Code CLI, Loaf, Warp, Zed | `cline`, `dexto`, `kimi-code-cli`, `loaf`, `warp`, `zed` | `.agents/skills/` | `~/.agents/skills/` |
+| Cline, Dexto, Kimi Code CLI, Loaf, Sarvam Code, Warp, Zed | `cline`, `dexto`, `kimi-code-cli`, `loaf`, `sarvam-code`, `warp`, `zed` | `.agents/skills/` | `~/.agents/skills/` |
 | CodeArts Agent | `codearts-agent` | `.codeartsdoer/skills/` | `~/.codeartsdoer/skills/` |
 | CodeBuddy | `codebuddy` | `.codebuddy/skills/` | `~/.codebuddy/skills/` |
 | Codemaker | `codemaker` | `.codemaker/skills/` | `~/.codemaker/skills/` |
@@ -292,10 +292,11 @@ Skills can be installed to any of these agents:
 | Cursor | `cursor` | `.agents/skills/` | `~/.cursor/skills/` |
 | Deep Agents | `deepagents` | `.agents/skills/` | `~/.deepagents/agent/skills/` |
 | Devin for Terminal | `devin` | `.devin/skills/` | `~/.config/devin/skills/` |
-| Droid | `droid` | `.factory/skills/` | `~/.factory/skills/` |
+| Droid | `droid` | `.agents/skills/` | `~/.factory/skills/` |
 | Eve | `eve` | `agent/skills/` | N/A (project-only) |
 | Firebender | `firebender` | `.agents/skills/` | `~/.firebender/skills/` |
 | ForgeCode | `forgecode` | `.forge/skills/` | `~/.forge/skills/` |
+| fx | `fx` | `.fx/skills/` | `~/.fx/skills/` |
 | Gemini CLI | `gemini-cli` | `.agents/skills/` | `~/.gemini/skills/` |
 | GitHub Copilot | `github-copilot` | `.agents/skills/` | `~/.copilot/skills/` |
 | Goose | `goose` | `.goose/skills/` | `~/.config/goose/skills/` |
@@ -305,7 +306,7 @@ Skills can be installed to any of these agents:
 | Jazz | `jazz` | `.jazz/skills/` | `~/.jazz/skills/` |
 | Junie | `junie` | `.junie/skills/` | `~/.junie/skills/` |
 | iFlow CLI | `iflow-cli` | `.iflow/skills/` | `~/.iflow/skills/` |
-| Kilo Code | `kilo` | `.kilocode/skills/` | `~/.kilocode/skills/` |
+| Kilo Code | `kilo` | `.agents/skills/` | `~/.kilo/skills/` |
 | Kimchi | `kimchi` | `.kimchi/skills/` | `~/.config/kimchi/harness/skills/` |
 | Kiro CLI | `kiro-cli` | `.kiro/skills/` | `~/.kiro/skills/` |
 | Kode | `kode` | `.kode/skills/` | `~/.kode/skills/` |
@@ -430,9 +431,9 @@ discover `SKILL.md` files outside these container directories (e.g. under
 - `.cortex/skills/`
 - `.crush/skills/`
 - `.devin/skills/`
-- `.factory/skills/`
 - `agent/skills/`
 - `.forge/skills/`
+- `.fx/skills/`
 - `.goose/skills/`
 - `.grok/skills/`
 - `.hermes/skills/`
@@ -440,7 +441,6 @@ discover `SKILL.md` files outside these container directories (e.g. under
 - `.jazz/skills/`
 - `.junie/skills/`
 - `.iflow/skills/`
-- `.kilocode/skills/`
 - `.kimchi/skills/`
 - `.kiro/skills/`
 - `.kode/skills/`

package/dist/cli.mjs

@@ -18,7 +18,7 @@ import { Writable } from "stream";
 import { promisify } from "util";
 import { execFile, spawn, spawnSync } from "child_process";
 import { access, chmod, cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, realpath, rm, stat, symlink, writeFile } from "fs/promises";
-import { parse } from "yaml";
+import { parse, stringify } from "yaml";
 import { createHash } from "crypto";
 import { mkdir as mkdir$1, mkdtemp as mkdtemp$1, readFile as readFile$1, rm as rm$1, stat as stat$1, writeFile as writeFile$1 } from "node:fs/promises";
 import { createHash as createHash$1 } from "node:crypto";
@@ -598,21 +598,30 @@ async function searchMultiselect(options) {
 			lastRenderHeight = countVisualRowsForLines(lines, process.stdout.columns);
 		};
 		const cleanup = () => {
+			rl.removeListener("close", closeHandler);
 			process.stdin.removeListener("keypress", keypressHandler);
 			if (process.stdin.isTTY) process.stdin.setRawMode(false);
 			rl.close();
 		};
+		let settled = false;
 		const submit = () => {
+			if (settled) return;
 			if (required && selected.size === 0 && lockedValues.length === 0) return;
+			settled = true;
 			render("submit");
 			cleanup();
 			resolve([...lockedValues, ...Array.from(selected)]);
 		};
 		const cancel = () => {
+			if (settled) return;
+			settled = true;
 			render("cancel");
 			cleanup();
 			resolve(cancelSymbol);
 		};
+		const closeHandler = () => {
+			cancel();
+		};
 		const keypressHandler = (_str, key) => {
 			if (!key) return;
 			const entries = buildSearchEntries(getFiltered(), selectGroups, collapsedGroups);
@@ -673,6 +682,11 @@ async function searchMultiselect(options) {
 			}
 		};
 		process.stdin.on("keypress", keypressHandler);
+		rl.on("close", closeHandler);
+		if (process.stdin.readableEnded || process.stdin.destroyed) {
+			cancel();
+			return;
+		}
 		render();
 	});
 }
@@ -1139,11 +1153,13 @@ const AGENT_PROJECT_SKILL_DIRS = [
 	".codex/skills",
 	".commandcode/skills",
 	".continue/skills",
+	".factory/skills",
 	".github/skills",
 	".goose/skills",
 	".grok/skills",
 	".iflow/skills",
 	".junie/skills",
+	".kilo/skills",
 	".kilocode/skills",
 	".kimchi/skills",
 	".kiro/skills",
@@ -1339,6 +1355,7 @@ const vibeHome = process.env.VIBE_HOME?.trim() || join(home, ".vibe");
 const hermesHome = process.env.HERMES_HOME?.trim() || join(home, ".hermes");
 const autohandHome = process.env.AUTOHAND_HOME?.trim() || join(home, ".autohand");
 const grokHome = process.env.GROK_HOME?.trim() || join(home, ".grok");
+const sarvamHome = process.env.SARVAM_HOME?.trim() || join(home, ".sarvam");
 const zedAppDataHome = process.env.APPDATA?.trim();
 const zedFlatpakConfigHome = process.env.FLATPAK_XDG_CONFIG_HOME?.trim();
 function packageJsonHasDependency(packageJsonPath, dependencyName) {
@@ -1391,6 +1408,7 @@ const agents = {
 		displayName: "Antigravity",
 		skillsDir: ".agents/skills",
 		globalSkillsDir: join(home, ".gemini/antigravity/skills"),
+		showInUniversalPrompt: false,
 		detectInstalled: async () => {
 			return existsSync(join(home, ".gemini/antigravity"));
 		}
@@ -1400,6 +1418,7 @@ const agents = {
 		displayName: "Antigravity CLI",
 		skillsDir: ".agents/skills",
 		globalSkillsDir: join(home, ".gemini/antigravity-cli/skills"),
+		showInUniversalPrompt: false,
 		detectInstalled: async () => {
 			return existsSync(join(home, ".gemini/antigravity-cli"));
 		}
@@ -1445,6 +1464,7 @@ const agents = {
 		displayName: "Claude Code",
 		skillsDir: ".claude/skills",
 		globalSkillsDir: join(claudeHome, "skills"),
+		createProjectSkillsDirByDefault: true,
 		detectInstalled: async () => {
 			return existsSync(claudeHome);
 		}
@@ -1562,6 +1582,7 @@ const agents = {
 		displayName: "Deep Agents",
 		skillsDir: ".agents/skills",
 		globalSkillsDir: join(home, ".deepagents/agent/skills"),
+		showInUniversalPrompt: false,
 		detectInstalled: async () => {
 			return existsSync(join(home, ".deepagents"));
 		}
@@ -1588,7 +1609,7 @@ const agents = {
 	droid: {
 		name: "droid",
 		displayName: "Droid",
-		skillsDir: ".factory/skills",
+		skillsDir: ".agents/skills",
 		globalSkillsDir: join(home, ".factory/skills"),
 		detectInstalled: async () => {
 			return existsSync(join(home, ".factory"));
@@ -1623,6 +1644,15 @@ const agents = {
 			return existsSync(join(home, ".forge"));
 		}
 	},
+	fx: {
+		name: "fx",
+		displayName: "fx",
+		skillsDir: ".fx/skills",
+		globalSkillsDir: join(home, ".fx/skills"),
+		detectInstalled: async () => {
+			return existsSync(join(home, ".fx"));
+		}
+	},
 	"gemini-cli": {
 		name: "gemini-cli",
 		displayName: "Gemini CLI",
@@ -1707,10 +1737,10 @@ const agents = {
 	kilo: {
 		name: "kilo",
 		displayName: "Kilo Code",
-		skillsDir: ".kilocode/skills",
-		globalSkillsDir: join(home, ".kilocode/skills"),
+		skillsDir: ".agents/skills",
+		globalSkillsDir: join(home, ".kilo/skills"),
 		detectInstalled: async () => {
-			return existsSync(join(home, ".kilocode"));
+			return existsSync(join(home, ".kilo")) || existsSync(join(home, ".kilocode"));
 		}
 	},
 	kimchi: {
@@ -1922,6 +1952,16 @@ const agents = {
 			return existsSync(join(home, ".roo"));
 		}
 	},
+	"sarvam-code": {
+		name: "sarvam-code",
+		displayName: "Sarvam Code",
+		skillsDir: ".agents/skills",
+		globalSkillsDir: join(home, ".agents/skills"),
+		showInUniversalPrompt: false,
+		detectInstalled: async () => {
+			return existsSync(sarvamHome);
+		}
+	},
 	"tabnine-cli": {
 		name: "tabnine-cli",
 		displayName: "Tabnine CLI",
@@ -2106,6 +2146,11 @@ function isPathSafe$2(basePath, targetPath) {
 function pathsOverlap(pathA, pathB) {
 	return isPathSafe$2(pathA, pathB) || isPathSafe$2(pathB, pathA);
 }
+function shouldSkipProjectAgentSymlink(agentType, isGlobal, cwd, createMissingAgentRoot) {
+	if (isGlobal || isUniversalAgent(agentType) || createMissingAgentRoot || agents[agentType].createProjectSkillsDirByDefault) return false;
+	const agentRoot = agents[agentType].skillsDir.split("/")[0];
+	return !existsSync(join(cwd, agentRoot));
+}
 async function isDirEntryOrSymlinkToDir(entry, entryPath) {
 	if (entry.isDirectory()) return true;
 	if (!entry.isSymbolicLink()) return false;
@@ -2241,15 +2286,14 @@ async function installSkillForAgent(skill, agentType, options = {}) {
 			canonicalPath: canonicalDir,
 			mode: "symlink"
 		};
-		if (!isGlobal && !isUniversalAgent(agentType)) {
-			if (!existsSync(join(cwd, agents[agentType].skillsDir.split("/")[0])) && agentType !== "claude-code") return {
-				success: true,
-				path: canonicalDir,
-				canonicalPath: canonicalDir,
-				mode: "symlink",
-				skipped: true
-			};
-		}
+		if (shouldSkipProjectAgentSymlink(agentType, isGlobal, cwd, options.createMissingAgentRoot ?? false)) return {
+			success: true,
+			path: canonicalDir,
+			canonicalPath: canonicalDir,
+			mode: "symlink",
+			skipped: true,
+			skipReason: "missing-agent-project-directory"
+		};
 		if (!await createSymlink(canonicalDir, agentDir)) {
 			await cleanAndCreateDirectory(agentDir);
 			await copyDirectory(skill.path, agentDir, agentType);
@@ -2290,15 +2334,14 @@ const isExcluded$1 = (name, isDirectory = false) => {
 function stripIgnoredEveFrontmatter(raw) {
 	const { data, content } = parseFrontmatter(raw);
 	const eveData = {};
+	if (typeof data.name === "string") eveData.name = data.name;
 	if (typeof data.description === "string") eveData.description = data.description;
 	if (typeof data.license === "string") eveData.license = data.license;
-	if (data.metadata && typeof data.metadata === "object" && !Array.isArray(data.metadata)) {
-		const metadata = Object.fromEntries(Object.entries(data.metadata).filter((entry) => typeof entry[1] === "string"));
-		if (Object.keys(metadata).length > 0) eveData.metadata = metadata;
-	}
-	const keys = Object.keys(eveData);
-	if (keys.length === 0) return content.replace(/^\r?\n/u, "");
-	return `---\n${keys.map((key) => `${key}: ${JSON.stringify(eveData[key])}`).join("\n")}\n---\n${content.replace(/^\r?\n/u, "")}`;
+	if (data.compatibility !== void 0) eveData.compatibility = data.compatibility;
+	if (typeof data.version === "string" || typeof data.version === "number") eveData.version = data.version;
+	if (data.metadata && typeof data.metadata === "object" && !Array.isArray(data.metadata)) eveData.metadata = data.metadata;
+	if (Object.keys(eveData).length === 0) return content.replace(/^\r?\n/u, "");
+	return `---\n${stringify(eveData).trimEnd()}\n---\n${content.replace(/^\r?\n/u, "")}`;
 }
 async function copyDirectory(src, dest, agentType) {
 	await mkdir(dest, { recursive: true });
@@ -2532,15 +2575,14 @@ async function installBlobSkillForAgent(skill, agentType, options = {}) {
 			canonicalPath: canonicalDir,
 			mode: "symlink"
 		};
-		if (!isGlobal && !isUniversalAgent(agentType)) {
-			if (!existsSync(join(cwd, agents[agentType].skillsDir.split("/")[0])) && agentType !== "claude-code") return {
-				success: true,
-				path: canonicalDir,
-				canonicalPath: canonicalDir,
-				mode: "symlink",
-				skipped: true
-			};
-		}
+		if (shouldSkipProjectAgentSymlink(agentType, isGlobal, cwd, options.createMissingAgentRoot ?? false)) return {
+			success: true,
+			path: canonicalDir,
+			canonicalPath: canonicalDir,
+			mode: "symlink",
+			skipped: true,
+			skipReason: "missing-agent-project-directory"
+		};
 		if (!await createSymlink(canonicalDir, agentDir)) {
 			await cleanAndCreateDirectory(agentDir);
 			await writeSkillFiles(agentDir);
@@ -3871,11 +3913,13 @@ const PRIORITY_PREFIXES = [
 	".codex/skills/",
 	".commandcode/skills/",
 	".continue/skills/",
+	".factory/skills/",
 	".github/skills/",
 	".goose/skills/",
 	".grok/skills/",
 	".iflow/skills/",
 	".junie/skills/",
+	".kilo/skills/",
 	".kilocode/skills/",
 	".kimchi/skills/",
 	".kiro/skills/",
@@ -3977,6 +4021,35 @@ function computeSnapshotHash(files) {
 	}
 	return hash.digest("hex");
 }
+function getSkillFolderPath(skillMdPath) {
+	const pathLower = skillMdPath.toLowerCase();
+	if (pathLower.endsWith("/skill.md")) return skillMdPath.slice(0, -9);
+	if (pathLower === "skill.md") return "";
+	return skillMdPath.slice(0, -9);
+}
+const SNAPSHOT_EXCLUDED_FILES = /* @__PURE__ */ new Set(["metadata.json"]);
+const SNAPSHOT_EXCLUDED_DIRS = /* @__PURE__ */ new Set([
+	".git",
+	"__pycache__",
+	"__pypackages__"
+]);
+function isInstallableSnapshotPath(path) {
+	const parts = path.split("/");
+	const fileName = parts.at(-1);
+	if (!fileName || SNAPSHOT_EXCLUDED_FILES.has(fileName)) return false;
+	return parts.slice(0, -1).every((part) => !SNAPSHOT_EXCLUDED_DIRS.has(part));
+}
+function hasCompleteNestedSnapshot(tree, skillMdPath, files) {
+	const folderPath = getSkillFolderPath(skillMdPath);
+	if (!folderPath) return true;
+	const folderPrefix = `${folderPath}/`;
+	const snapshotPaths = new Set(files.map((file) => file.path));
+	return tree.tree.every((entry) => {
+		if (entry.type !== "blob" || !entry.path.startsWith(folderPrefix)) return true;
+		const relativePath = entry.path.slice(folderPrefix.length);
+		return !isInstallableSnapshotPath(relativePath) || snapshotPaths.has(relativePath);
+	});
+}
 async function tryBlobInstall(ownerRepo, options = {}) {
 	if (options.ref !== void 0) return null;
 	const tree = await fetchRepoTree(ownerRepo, options.ref, options.getToken);
@@ -4033,10 +4106,10 @@ async function tryBlobInstall(ownerRepo, options = {}) {
 		};
 	}));
 	if (!downloads.every((d) => d.download !== null)) return null;
+	if (!downloads.every(({ skill, download }) => hasCompleteNestedSnapshot(tree, skill.mdPath, download.files))) return null;
 	return {
 		skills: downloads.map(({ skill, download }) => {
-			const mdPathLower = skill.mdPath.toLowerCase();
-			const files = (mdPathLower.endsWith("/skill.md") ? skill.mdPath.slice(0, -9) : mdPathLower === "skill.md" ? "" : skill.mdPath.slice(0, -9)) ? download.files : download.files.filter((file) => file.path.toLowerCase() === "skill.md");
+			const files = getSkillFolderPath(skill.mdPath) ? download.files : download.files.filter((file) => file.path.toLowerCase() === "skill.md");
 			return {
 				name: skill.name,
 				description: skill.description,
@@ -4051,7 +4124,7 @@ async function tryBlobInstall(ownerRepo, options = {}) {
 		tree
 	};
 }
-var version$1 = "1.5.24";
+var version$1 = "1.5.26";
 const isCancelled$1 = (value) => typeof value === "symbol";
 const EVE_AGENT_LABEL = "eve agent";
 async function isSourcePrivate(source) {
@@ -4199,11 +4272,21 @@ function buildResultLines(results, targetAgents) {
 	const { universal, symlinked: symlinkAgents } = splitAgentsByType(targetAgents);
 	const successfulSymlinks = results.filter((r) => !r.symlinkFailed && !r.skipped && !universal.includes(r.agent)).map((r) => r.agent);
 	const failedSymlinks = results.filter((r) => r.symlinkFailed && !r.skipped).map((r) => r.agent);
+	const skippedSymlinks = results.filter((r) => r.skipped && r.skipReason === "missing-agent-project-directory" && symlinkAgents.includes(r.agent)).map((r) => r.agent);
 	if (universal.length > 0) lines.push(`  ${import_picocolors.default.green("universal:")} ${formatList$1(universal)}`);
 	if (successfulSymlinks.length > 0) lines.push(`  ${import_picocolors.default.dim("symlinked:")} ${formatList$1(successfulSymlinks)}`);
 	if (failedSymlinks.length > 0) lines.push(`  ${import_picocolors.default.yellow("copied:")} ${formatList$1(failedSymlinks)}`);
+	if (skippedSymlinks.length > 0) lines.push(`  ${import_picocolors.default.yellow("skipped:")} ${formatList$1(skippedSymlinks)} ${import_picocolors.default.dim("(project directory not found)")}`);
 	return lines;
 }
+function exitInstallationCancelled() {
+	cancel("Installation cancelled");
+	if (!process.stdin.isTTY) {
+		console.error("Interactive prompt required but stdin is not a TTY. Nothing was installed. Use --agent <name> (or --agent '*') and -y to run non-interactively.");
+		process.exit(1);
+	}
+	process.exit(0);
+}
 async function promptForAgents(message, choices) {
 	let lastSelected;
 	try {
@@ -4263,6 +4346,17 @@ async function selectAgentsInteractive(options) {
 	return selected;
 }
 setVersion(version$1);
+function buildJsonSecurity(auditData, skillName, source) {
+	const data = auditData?.[skillName];
+	if (!data || Object.keys(data).length === 0) return null;
+	const socketAlerts = data.socket?.alerts ?? 0;
+	return {
+		...data.ath && { gen: data.ath.risk },
+		...data.socket && { socket: `${socketAlerts} alert${socketAlerts !== 1 ? "s" : ""}` },
+		...data.snyk && { snyk: data.snyk.risk },
+		...source && { details: `https://skills.sh/${source}` }
+	};
+}
 function isSkillsShPackUrl(url) {
 	try {
 		const parsed = new URL(url);
@@ -4337,10 +4431,7 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 			maxVisible: 20,
 			selectAll: true
 		});
-		if (isCancelled$1(selected)) {
-			cancel("Installation cancelled");
-			process.exit(0);
-		}
+		if (isCancelled$1(selected)) exitInstallationCancelled();
 		selectedSkills = selected;
 	}
 	let targetAgents;
@@ -4370,10 +4461,7 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 				value: key,
 				label: config.displayName
 			})));
-			if (isCancel(selected)) {
-				cancel("Installation cancelled");
-				process.exit(0);
-			}
+			if (isCancelled$1(selected)) exitInstallationCancelled();
 			targetAgents = selected;
 		}
 		else if (installedAgents.length === 1 || options.yes) {
@@ -4384,10 +4472,7 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 			} else log.info(`Installing to: ${installedAgents.map((a) => import_picocolors.default.cyan(agents[a].displayName)).join(", ")}`);
 		} else {
 			const selected = await selectAgentsInteractive({ global: options.global });
-			if (isCancel(selected)) {
-				cancel("Installation cancelled");
-				process.exit(0);
-			}
+			if (isCancelled$1(selected)) exitInstallationCancelled();
 			targetAgents = selected;
 		}
 	}
@@ -4406,10 +4491,7 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 				hint: "Install in home directory (available across all projects)"
 			}]
 		});
-		if (isCancel(scope)) {
-			cancel("Installation cancelled");
-			process.exit(0);
-		}
+		if (isCancel(scope)) exitInstallationCancelled();
 		installGlobally = scope;
 	}
 	let installMode = options.copy ? "copy" : "symlink";
@@ -4427,10 +4509,7 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 				hint: "Independent copies for each agent"
 			}]
 		});
-		if (isCancel(modeChoice)) {
-			cancel("Installation cancelled");
-			process.exit(0);
-		}
+		if (isCancel(modeChoice)) exitInstallationCancelled();
 		installMode = modeChoice;
 	} else if (uniqueDirs.size <= 1) installMode = "copy";
 	const cwd = process.cwd();
@@ -4460,10 +4539,7 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 	note(summaryLines.join("\n"), "Installation Summary");
 	if (!options.yes) {
 		const confirmed = await confirm({ message: "Proceed with installation?" });
-		if (isCancel(confirmed) || !confirmed) {
-			cancel("Installation cancelled");
-			process.exit(0);
-		}
+		if (isCancel(confirmed) || !confirmed) exitInstallationCancelled();
 	}
 	const sourceIdentifier = wellKnownProvider.getSourceIdentifier(url);
 	const wellKnownPrivacyPromise = isSourcePrivate(sourceIdentifier).catch(() => null);
@@ -4484,6 +4560,7 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 	console.log();
 	const successful = results.filter((r) => r.success);
 	const failed = results.filter((r) => !r.success);
+	const successfulSkillNames = new Set(successful.map((r) => r.skill));
 	const skillFiles = {};
 	for (const skill of selectedSkills) skillFiles[skill.installName] = skill.sourceUrl;
 	if (await wellKnownPrivacyPromise !== true) track({
@@ -4498,7 +4575,6 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 		sourceType: "well-known"
 	});
 	if (successful.length > 0 && installGlobally) {
-		const successfulSkillNames = new Set(successful.map((r) => r.skill));
 		for (const skill of selectedSkills) if (successfulSkillNames.has(skill.installName)) try {
 			await addSkillToLock(skill.installName, {
 				source: sourceIdentifier,
@@ -4511,7 +4587,6 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 		} catch {}
 	}
 	if (successful.length > 0 && !installGlobally) {
-		const successfulSkillNames = new Set(successful.map((r) => r.skill));
 		for (const skill of selectedSkills) if (successfulSkillNames.has(skill.installName)) try {
 			const matchingResult = successful.find((r) => r.skill === skill.installName);
 			const installDir = matchingResult?.canonicalPath || matchingResult?.path;
@@ -4578,6 +4653,40 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 async function runAdd(args, options = {}) {
 	const source = args[0];
 	let installTipShown = false;
+	const jsonMode = options.json === true;
+	const jsonResults = [];
+	const originalStdoutWrite = process.stdout.write;
+	let stdoutSuppressed = false;
+	if (jsonMode) {
+		process.stdout.write = process.stderr.write.bind(process.stderr);
+		stdoutSuppressed = true;
+	}
+	const restoreStdout = () => {
+		if (stdoutSuppressed) {
+			process.stdout.write = originalStdoutWrite;
+			stdoutSuppressed = false;
+		}
+	};
+	let jsonEmitted = false;
+	const emitJson = () => {
+		if (!jsonMode || jsonEmitted) return;
+		jsonEmitted = true;
+		restoreStdout();
+		console.log(JSON.stringify(jsonResults, null, 2));
+	};
+	const emitJsonAndExit = (code, errorMessage) => {
+		if (jsonMode) {
+			if (errorMessage !== void 0) console.error(errorMessage);
+			if (code !== 0 && jsonResults.length === 0) jsonResults.push({
+				status: "failed",
+				error: errorMessage ?? "Installation failed"
+			});
+			emitJson();
+		}
+		process.exit(code);
+	};
+	const emitJsonOnExit = () => emitJson();
+	if (jsonMode) process.once("exit", emitJsonOnExit);
 	const showInstallTip = () => {
 		if (installTipShown) return;
 		log.message(import_picocolors.default.dim("Tip: use the --yes (-y) and --global (-g) flags to install without prompts."));
@@ -4593,8 +4702,9 @@ async function runAdd(args, options = {}) {
 		console.log(import_picocolors.default.dim("  Example:"));
 		console.log(`    ${import_picocolors.default.cyan("npx skills add")} ${import_picocolors.default.yellow("vercel-labs/agent-skills")}`);
 		console.log();
-		process.exit(1);
+		emitJsonAndExit(1, "Missing required argument: source");
 	}
+	const explicitlySelectedAgents = new Set(options.agent?.includes("*") ? [] : options.agent ?? []);
 	if (options.all) {
 		options.skill = ["*"];
 		options.agent = ["*"];
@@ -4608,13 +4718,19 @@ async function runAdd(args, options = {}) {
 			if (mappedAgent) options.agent = ensureUniversalAgents([mappedAgent]);
 		}
 	}
+	if (jsonMode && !options.yes) emitJsonAndExit(1, "The --json flag requires --yes (or --all) to run non-interactively.");
+	if (jsonMode && options.list) emitJsonAndExit(1, "The --json flag cannot be combined with --list.");
 	console.log();
 	if (!agentResult.isAgent) intro(import_picocolors.default.bgCyan(import_picocolors.default.black(" skills ")));
 	if (agentResult.isAgent) log.info(import_picocolors.default.bgCyan(import_picocolors.default.black(import_picocolors.default.bold(` ${agentResult.agent.name} `))) + " Agent detected — installing non-interactively");
 	else if (!process.stdin.isTTY) showInstallTip();
 	let tempDir = null;
 	try {
-		const spinner$3 = spinner();
+		const spinner$3 = jsonMode ? {
+			start: () => {},
+			stop: () => {},
+			message: () => {}
+		} : spinner();
 		spinner$3.start("Parsing source…");
 		const parsed = parseSource(source);
 		let directDownload = parsed.type === "download";
@@ -4628,6 +4744,7 @@ async function runAdd(args, options = {}) {
 			return isRepoPrivate(ownerRepo.owner, ownerRepo.repo).catch(() => null);
 		})();
 		if (parsed.type === "well-known") {
+			if (jsonMode) emitJsonAndExit(1, "--json is not yet supported for well-known skill sources.");
 			if (await handleWellKnownSkills(source, parsed.url, options, spinner$3)) return;
 			directDownload = true;
 		}
@@ -4643,7 +4760,7 @@ async function runAdd(args, options = {}) {
 			if (!existsSync(parsed.localPath)) {
 				spinner$3.stop(import_picocolors.default.red("Path not found"));
 				outro(import_picocolors.default.red(`Local path does not exist: ${parsed.localPath}`));
-				process.exit(1);
+				emitJsonAndExit(1, `Local path does not exist: ${parsed.localPath}`);
 			}
 			spinner$3.stop("Local path validated");
 			spinner$3.start("Discovering skills…");
@@ -4662,15 +4779,18 @@ async function runAdd(args, options = {}) {
 				fullDepth: options.fullDepth
 			});
 		} else if (parsed.type === "github" && !options.fullDepth) {
+			let attemptedBlobInstall = false;
 			const BLOB_ALLOWED_OWNERS = [
 				"vercel",
 				"vercel-labs",
-				"heygen-com"
+				"heygen-com",
+				"remotion-dev"
 			];
 			const ownerRepo = getOwnerRepo(parsed);
 			const owner = ownerRepo?.split("/")[0]?.toLowerCase();
 			const isSelfHostedRepo = !!ownerRepo && Object.hasOwn(BLOB_ALLOWED_REPOS, ownerRepo.toLowerCase());
 			if (ownerRepo && owner && (isSelfHostedRepo || BLOB_ALLOWED_OWNERS.includes(owner))) {
+				attemptedBlobInstall = true;
 				spinner$3.start("Fetching skills…");
 				blobResult = await tryBlobInstall(ownerRepo, {
 					subpath: parsed.subpath,
@@ -4679,13 +4799,13 @@ async function runAdd(args, options = {}) {
 					getToken: getGitHubToken,
 					includeInternal
 				});
-				if (!blobResult) spinner$3.stop(import_picocolors.default.dim("Falling back to clone…"));
 			}
 			if (blobResult) {
 				skills = blobResult.skills;
 				spinner$3.stop(`Found ${import_picocolors.default.green(skills.length)} skill${skills.length > 1 ? "s" : ""}`);
 			} else {
-				spinner$3.start("Cloning repository…");
+				if (attemptedBlobInstall) spinner$3.message("Cloning repository…");
+				else spinner$3.start("Cloning repository…");
 				tempDir = await cloneRepo(parsed.url, parsed.ref);
 				spinner$3.stop("Repository cloned");
 				spinner$3.start("Discovering skills…");
@@ -4708,7 +4828,7 @@ async function runAdd(args, options = {}) {
 			spinner$3.stop(import_picocolors.default.red("No skills found"));
 			outro(import_picocolors.default.red("No valid skills found. Skills require a SKILL.md with name and description."));
 			await cleanup(tempDir);
-			process.exit(1);
+			emitJsonAndExit(1, "No valid skills found. Skills require a SKILL.md with name and description.");
 		}
 		if (!blobResult) spinner$3.stop(`Found ${import_picocolors.default.green(skills.length)} skill${skills.length > 1 ? "s" : ""}`);
 		if (options.list) {
@@ -4741,7 +4861,7 @@ async function runAdd(args, options = {}) {
 			console.log();
 			outro("Use --skill <name> to install specific skills");
 			await cleanup(tempDir);
-			process.exit(0);
+			emitJsonAndExit(0);
 		}
 		let selectedSkills;
 		if (options.skill?.includes("*")) {
@@ -4749,12 +4869,19 @@ async function runAdd(args, options = {}) {
 			log.info(`Installing all ${skills.length} skills`);
 		} else if (options.skill && options.skill.length > 0) {
 			selectedSkills = filterSkills(skills, options.skill);
+			if (jsonMode) {
+				for (const requested of options.skill) if (filterSkills(skills, [requested]).length === 0) jsonResults.push({
+					name: requested,
+					status: "skipped",
+					reason: "No matching skill found in source"
+				});
+			}
 			if (selectedSkills.length === 0) {
 				log.error(`No matching skills found for: ${options.skill.join(", ")}`);
 				log.info("Available skills:");
 				for (const s of skills) log.message(`  - ${getSkillDisplayName(s)}`);
 				await cleanup(tempDir);
-				process.exit(1);
+				emitJsonAndExit(1, `No matching skills found for: ${options.skill.join(", ")}`);
 			}
 			log.info(`Selected ${selectedSkills.length} skill${selectedSkills.length !== 1 ? "s" : ""}: ${selectedSkills.map((s) => import_picocolors.default.cyan(getSkillDisplayName(s))).join(", ")}`);
 		} else if (skills.length === 1) {
@@ -4792,9 +4919,8 @@ async function runAdd(args, options = {}) {
 				selectAll: true
 			});
 			if (isCancelled$1(selected)) {
-				cancel("Installation cancelled");
 				await cleanup(tempDir);
-				process.exit(0);
+				exitInstallationCancelled();
 			}
 			selectedSkills = selected;
 		}
@@ -4811,7 +4937,7 @@ async function runAdd(args, options = {}) {
 				log.error(`Invalid agents: ${invalidAgents.join(", ")}`);
 				log.info(`Valid agents: ${validAgents.join(", ")}`);
 				await cleanup(tempDir);
-				process.exit(1);
+				emitJsonAndExit(1, `Invalid agents: ${invalidAgents.join(", ")}`);
 			}
 			targetAgents = options.agent;
 		} else {
@@ -4825,21 +4951,21 @@ async function runAdd(args, options = {}) {
 					initialValue: true
 				});
 				if (isCancel(useEve)) {
-					cancel("Installation cancelled");
 					await cleanup(tempDir);
-					process.exit(0);
+					exitInstallationCancelled();
 				}
 				if (useEve) {
 					targetAgents = ["eve"];
+					if (!options.yes) explicitlySelectedAgents.add("eve");
 					log.info(`Installing to: ${import_picocolors.default.cyan(EVE_AGENT_LABEL)}`);
 				} else {
 					const selected = await selectAgentsInteractive({ global: options.global });
-					if (isCancel(selected)) {
-						cancel("Installation cancelled");
+					if (isCancelled$1(selected)) {
 						await cleanup(tempDir);
-						process.exit(0);
+						exitInstallationCancelled();
 					}
 					targetAgents = selected;
+					for (const agent of targetAgents) explicitlySelectedAgents.add(agent);
 				}
 			} else if (installedAgents.length === 0) if (options.yes) {
 				targetAgents = validAgents;
@@ -4850,12 +4976,12 @@ async function runAdd(args, options = {}) {
 					value: key,
 					label: config.displayName
 				})));
-				if (isCancel(selected)) {
-					cancel("Installation cancelled");
+				if (isCancelled$1(selected)) {
 					await cleanup(tempDir);
-					process.exit(0);
+					exitInstallationCancelled();
 				}
 				targetAgents = selected;
+				for (const agent of targetAgents) explicitlySelectedAgents.add(agent);
 			}
 			else if (installedAgents.length === 1 || options.yes) {
 				targetAgents = ensureUniversalAgents(installedAgents);
@@ -4865,15 +4991,18 @@ async function runAdd(args, options = {}) {
 				} else log.info(`Installing to: ${installedAgents.map((a) => import_picocolors.default.cyan(agents[a].displayName)).join(", ")}`);
 			} else {
 				const selected = await selectAgentsInteractive({ global: options.global });
-				if (isCancel(selected)) {
-					cancel("Installation cancelled");
+				if (isCancelled$1(selected)) {
 					await cleanup(tempDir);
-					process.exit(0);
+					exitInstallationCancelled();
 				}
 				targetAgents = selected;
+				for (const agent of targetAgents) explicitlySelectedAgents.add(agent);
 			}
 		}
-		if (options.subagent && options.subagent.length > 0 && !targetAgents.includes("eve")) targetAgents = [...targetAgents, "eve"];
+		if (options.subagent && options.subagent.length > 0) {
+			explicitlySelectedAgents.add("eve");
+			if (!targetAgents.includes("eve")) targetAgents = [...targetAgents, "eve"];
+		}
 		let eveSubagentTargets = [void 0];
 		if (targetAgents.includes("eve")) {
 			const availableSubagents = getEveSubagents(process.cwd());
@@ -4894,9 +5023,8 @@ async function runAdd(args, options = {}) {
 					required: true
 				});
 				if (isCancel(selectedSubagents)) {
-					cancel("Installation cancelled");
 					await cleanup(tempDir);
-					process.exit(0);
+					exitInstallationCancelled();
 				}
 				eveSubagentTargets = selectedSubagents.map((s) => s === "" ? void 0 : s);
 			}
@@ -4918,9 +5046,8 @@ async function runAdd(args, options = {}) {
 				}]
 			});
 			if (isCancel(scope)) {
-				cancel("Installation cancelled");
 				await cleanup(tempDir);
-				process.exit(0);
+				exitInstallationCancelled();
 			}
 			installGlobally = scope;
 		}
@@ -4941,9 +5068,8 @@ async function runAdd(args, options = {}) {
 				}]
 			});
 			if (isCancel(modeChoice)) {
-				cancel("Installation cancelled");
 				await cleanup(tempDir);
-				process.exit(0);
+				exitInstallationCancelled();
 			}
 			installMode = modeChoice;
 		} else if (uniqueDirs.size <= 1 || allEve) installMode = "copy";
@@ -5000,8 +5126,10 @@ async function runAdd(args, options = {}) {
 		}
 		console.log();
 		note(summaryLines.join("\n"), "Installation Summary");
+		let auditDataForJson = null;
 		try {
 			const auditData = await auditPromise;
+			auditDataForJson = auditData;
 			if (auditData && ownerRepoForAudit) {
 				const securityLines = buildSecurityLines(auditData, selectedSkills.map((s) => ({
 					slug: getSkillDisplayName(s),
@@ -5013,9 +5141,8 @@ async function runAdd(args, options = {}) {
 		if (!options.yes) {
 			const confirmed = await confirm({ message: "Proceed with installation?" });
 			if (isCancel(confirmed) || !confirmed) {
-				cancel("Installation cancelled");
 				await cleanup(tempDir);
-				process.exit(0);
+				exitInstallationCancelled();
 			}
 		}
 		spinner$3.start("Installing skills…");
@@ -5031,12 +5158,14 @@ async function runAdd(args, options = {}) {
 				}, agent, {
 					global: installGlobally,
 					mode: installMode,
-					eveSubagent: subagent
+					eveSubagent: subagent,
+					createMissingAgentRoot: explicitlySelectedAgents.has(agent)
 				});
 			} else result = await installSkillForAgent(skill, agent, {
 				global: installGlobally,
 				mode: installMode,
-				eveSubagent: subagent
+				eveSubagent: subagent,
+				createMissingAgentRoot: explicitlySelectedAgents.has(agent)
 			});
 			results.push({
 				skill: getSkillDisplayName(skill),
@@ -5049,6 +5178,7 @@ async function runAdd(args, options = {}) {
 		console.log();
 		const successful = results.filter((r) => r.success);
 		const failed = results.filter((r) => !r.success);
+		const successfulSkillNames = new Set(successful.map((r) => r.skill));
 		const skillFiles = {};
 		for (const skill of selectedSkills) if (blobResult && "repoPath" in skill) skillFiles[skill.name] = skill.repoPath;
 		else if (tempDir && skill.path === tempDir) skillFiles[skill.name] = "SKILL.md";
@@ -5076,8 +5206,16 @@ async function runAdd(args, options = {}) {
 			skillFiles: JSON.stringify(skillFiles),
 			metadata: options.metadata
 		});
+		const installedSkillHashes = /* @__PURE__ */ new Map();
+		if (successful.length > 0 && (jsonMode || !installGlobally)) for (const skill of selectedSkills) {
+			const skillDisplayName = getSkillDisplayName(skill);
+			if (!successfulSkillNames.has(skillDisplayName)) continue;
+			try {
+				const computedHash = blobResult && "snapshotHash" in skill ? skill.snapshotHash : await computeSkillFolderHash(skill.path);
+				installedSkillHashes.set(skillDisplayName, computedHash);
+			} catch {}
+		}
 		if (successful.length > 0 && installGlobally && normalizedSource) {
-			const successfulSkillNames = new Set(successful.map((r) => r.skill));
 			let cachedTree;
 			if (parsed.type === "github" && !blobResult) cachedTree = await fetchRepoTree(normalizedSource, parsed.ref, getGitHubToken);
 			for (const skill of selectedSkills) {
@@ -5108,13 +5246,13 @@ async function runAdd(args, options = {}) {
 			}
 		}
 		if (successful.length > 0 && !installGlobally && !directDownload) {
-			const successfulSkillNames = new Set(successful.map((r) => r.skill));
 			const eveSubagents = targetAgents.includes("eve") ? eveSubagentTargets.map((s) => s ?? "") : void 0;
 			const recordSubagents = eveSubagents && (eveSubagents.length > 1 || eveSubagents.some((s) => s !== ""));
 			for (const skill of selectedSkills) {
 				const skillDisplayName = getSkillDisplayName(skill);
 				if (successfulSkillNames.has(skillDisplayName)) try {
-					const computedHash = blobResult && "snapshotHash" in skill ? skill.snapshotHash : await computeSkillFolderHash(skill.path);
+					const computedHash = installedSkillHashes.get(skillDisplayName);
+					if (computedHash === void 0) continue;
 					const skillPathValue = skillFiles[skill.name];
 					await addSkillToLocalLock(skill.name, {
 						source: lockSource || parsed.url,
@@ -5128,6 +5266,37 @@ async function runAdd(args, options = {}) {
 				} catch {}
 			}
 		}
+		if (jsonMode) {
+			const jsonSource = normalizedSource ?? (parsed.type === "local" ? parsed.localPath : parsed.url);
+			for (const skill of selectedSkills) {
+				const name = getSkillDisplayName(skill);
+				const skillResults = results.filter((r) => r.skill === name);
+				const failures = skillResults.filter((r) => !r.success);
+				if (failures.length > 0) {
+					jsonResults.push({
+						name,
+						status: "failed",
+						error: failures[0].error ?? "Installation failed"
+					});
+					continue;
+				}
+				jsonResults.push({
+					name,
+					status: "installed",
+					source: jsonSource,
+					ref: parsed.ref ?? null,
+					hash: installedSkillHashes.get(name) ?? null,
+					path: skillResults[0]?.canonicalPath ?? skillResults[0]?.path,
+					scope: installGlobally ? "global" : "project",
+					agents: skillResults.filter((r) => !r.skipped).map((r) => r.agent),
+					mode: skillResults[0]?.mode ?? installMode,
+					security: buildJsonSecurity(auditDataForJson, name, ownerRepoForAudit)
+				});
+			}
+			emitJson();
+			if (failed.length > 0 || jsonResults.some((result) => result.status === "skipped")) process.exitCode = 1;
+			return;
+		}
 		if (successful.length > 0) {
 			const bySkill = /* @__PURE__ */ new Map();
 			const groupedResults = {};
@@ -5205,8 +5374,10 @@ async function runAdd(args, options = {}) {
 		} else log.error(error instanceof Error ? error.message : "Unknown error occurred");
 		showInstallTip();
 		outro(import_picocolors.default.red("Installation failed"));
-		process.exit(1);
+		emitJsonAndExit(1, error instanceof GitCloneError ? `Failed to clone repository\n${error.message}` : error instanceof Error ? error.message : "Unknown error occurred");
 	} finally {
+		if (jsonMode) process.removeListener("exit", emitJsonOnExit);
+		restoreStdout();
 		await cleanup(tempDir);
 	}
 }
@@ -5294,6 +5465,7 @@ function parseAddOptions(args) {
 				errors.push("--metadata must be valid JSON");
 			}
 		} else if (arg === "--full-depth") options.fullDepth = true;
+		else if (arg === "--json") options.json = true;
 		else if (arg === "--copy") options.copy = true;
 		else if (arg === "--subagent") {
 			options.subagent = options.subagent || [];
@@ -6192,7 +6364,11 @@ async function removeCommand(skillNames, options) {
 	const scanDir = async (dir) => {
 		try {
 			const entries = await readdir(dir, { withFileTypes: true });
-			for (const entry of entries) if (entry.isDirectory()) skillNamesSet.add(entry.name);
+			for (const entry of entries) {
+				if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
+				if (!await hasSkillMd(join(dir, entry.name))) continue;
+				skillNamesSet.add(entry.name);
+			}
 		} catch (err) {
 			if (err instanceof Error && err.code !== "ENOENT") log.warn(`Could not scan directory ${dir}: ${err.message}`);
 		}
@@ -7124,7 +7300,8 @@ async function runUpdate(args = []) {
 const BLOB_ALLOWED_OWNERS = [
 	"vercel",
 	"vercel-labs",
-	"heygen-com"
+	"heygen-com",
+	"remotion-dev"
 ];
 const EXCLUDE_FILES = /* @__PURE__ */ new Set(["metadata.json"]);
 const EXCLUDE_DIRS = /* @__PURE__ */ new Set([
@@ -7140,6 +7317,10 @@ const USE_AGENT_CONFIGS = {
 	codex: {
 		command: "codex",
 		args: []
+	},
+	"sarvam-code": {
+		command: "sarvam-code",
+		args: []
 	}
 };
 const SUPPORTED_USE_AGENTS = Object.keys(USE_AGENT_CONFIGS);
@@ -7602,6 +7783,7 @@ ${BOLD}Add Options:${RESET}
   --subagent <names>     Install to Eve subagents (use 'root' for the root agent)
   --all                  Shorthand for --skill '*' --agent '*' -y
   --full-depth           Search all subdirectories even when a root SKILL.md exists
+  --json                 Output results as JSON (machine-readable, no ANSI codes)
 
 ${BOLD}Use Options:${RESET}
   -s, --skill <skill>    Specify the skill to use
@@ -7635,6 +7817,7 @@ ${BOLD}Examples:${RESET}
   ${DIM}$${RESET} skills add vercel-labs/agent-skills -g
   ${DIM}$${RESET} skills add vercel-labs/agent-skills --agent claude-code cursor
   ${DIM}$${RESET} skills add vercel-labs/agent-skills --skill pr-review commit
+  ${DIM}$${RESET} skills add vercel-labs/agent-skills --json -y ${DIM}# JSON output${RESET}
   ${DIM}$${RESET} skills remove                        ${DIM}# interactive remove${RESET}
   ${DIM}$${RESET} skills remove web-design             ${DIM}# remove by name${RESET}
   ${DIM}$${RESET} skills rm --global frontend-design
@@ -7769,10 +7952,11 @@ async function main() {
 		case "install":
 		case "a":
 		case "add": {
-			if (!inAgent) showLogo();
 			const { source: addSource, options: addOpts, errors } = parseAddOptions(restArgs);
+			if (!inAgent && !addOpts.json) showLogo();
 			if (errors.length > 0) {
 				for (const error of errors) console.error(`Error: ${error}`);
+				if (addOpts.json) console.log("[]");
 				process.exitCode = 1;
 				break;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skills",
-  "version": "1.5.24",
+  "version": "1.5.26",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {
@@ -64,6 +64,7 @@
     "eve",
     "firebender",
     "forgecode",
+    "fx",
     "gemini-cli",
     "github-copilot",
     "goose",
@@ -97,6 +98,7 @@
     "reasonix",
     "rovodev",
     "roo",
+    "sarvam-code",
     "tabnine-cli",
     "terramind",
     "tinycloud",