skills 1.5.23 → 1.5.25

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

@@ -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();
 	});
 }
@@ -685,6 +699,25 @@ const CLONE_TIMEOUT_MS = (() => {
 	return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_CLONE_TIMEOUT_MS;
 })();
 const execFileAsync = promisify(execFile);
+function isCommitSha(ref) {
+	return /^[0-9a-f]{40}$/i.test(ref);
+}
+function isMissingRefError(message) {
+	return /Remote branch .* not found in upstream origin/i.test(message) || /couldn't find remote ref/i.test(message) || /upload-pack: not our ref/i.test(message);
+}
+async function cloneAtSha(url, sha, tempDir, extraEnv) {
+	const git = createGitClient(extraEnv);
+	await git.cwd(tempDir);
+	await git.init();
+	await git.addRemote("origin", url);
+	await git.fetch([
+		"--depth",
+		"1",
+		"origin",
+		sha
+	]);
+	await git.checkout("FETCH_HEAD");
+}
 var GitCloneError = class extends Error {
 	url;
 	isTimeout;
@@ -742,7 +775,7 @@ function isGitHubSsoAuthError(message) {
 function isAuthFailure(message) {
 	return message.includes("Authentication failed") || message.includes("could not read Username") || message.includes("Permission denied") || message.includes("Repository not found") || message.includes("requested URL returned error: 403") || isGitHubSsoAuthError(message);
 }
-function createGitClient(sshCommand) {
+function createGitClient(extraEnv) {
 	const git = esm_default({
 		timeout: { block: CLONE_TIMEOUT_MS },
 		config: [
@@ -778,7 +811,7 @@ function createGitClient(sshCommand) {
 		GIT_TERMINAL_PROMPT: "0",
 		GIT_ALLOW_PROTOCOL: ALLOWED_GIT_PROTOCOLS,
 		GIT_LFS_SKIP_SMUDGE: "1",
-		...sshCommand ? { GIT_SSH_COMMAND: sshCommand } : {}
+		...extraEnv
 	});
 	return git;
 }
@@ -846,12 +879,18 @@ async function cloneRepo(url, ref) {
 		"--branch",
 		ref
 	] : ["--depth", "1"];
+	const refCanBeSha = !!ref && isCommitSha(ref);
 	const repo = parseGitHubRepoUrl(url);
 	try {
 		await createGitClient().clone(url, tempDir, cloneOptions);
 		return tempDir;
 	} catch (error) {
 		const errorMessage = error instanceof Error ? error.message : String(error);
+		if (refCanBeSha && isMissingRefError(errorMessage)) try {
+			await resetTempDir(tempDir);
+			await cloneAtSha(url, ref, tempDir);
+			return tempDir;
+		} catch {}
 		const isTimeout = errorMessage.includes("block timeout") || errorMessage.includes("timed out");
 		const isAuthError = isAuthFailure(errorMessage);
 		if (isTimeout) {
@@ -868,7 +907,16 @@ async function cloneRepo(url, ref) {
 			} catch {}
 			try {
 				await resetTempDir(tempDir);
-				await createGitClient(process.env.GIT_SSH_COMMAND ?? "ssh -o BatchMode=yes").clone(repo.sshUrl, tempDir, cloneOptions);
+				const sshEnv = { GIT_SSH_COMMAND: process.env.GIT_SSH_COMMAND ?? "ssh -o BatchMode=yes" };
+				try {
+					await createGitClient(sshEnv).clone(repo.sshUrl, tempDir, cloneOptions);
+				} catch (sshError) {
+					const sshMessage = sshError instanceof Error ? sshError.message : String(sshError);
+					if (refCanBeSha && isMissingRefError(sshMessage)) {
+						await resetTempDir(tempDir);
+						await cloneAtSha(repo.sshUrl, ref, tempDir, sshEnv);
+					} else throw sshError;
+				}
 				return tempDir;
 			} catch {}
 		}
@@ -1105,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",
@@ -1127,7 +1177,7 @@ const AGENT_PROJECT_SKILL_DIRS = [
 	".zcode/skills",
 	".zencoder/skills"
 ];
-function normalizeSkillName(name) {
+function normalizeSkillName$1(name) {
 	return name.toLowerCase().replace(/[\s_]+/g, "-");
 }
 function normalizeRelativePath(path) {
@@ -1207,7 +1257,7 @@ async function discoverSkills(basePath, subpath, options) {
 	const seenNames = /* @__PURE__ */ new Set();
 	const parsedSkillPaths = /* @__PURE__ */ new Set();
 	const localLock = await readLocalLock(basePath);
-	const lockedSkillNames = new Set(Object.keys(localLock.skills).map(normalizeSkillName));
+	const lockedSkillNames = new Set(Object.keys(localLock.skills).map(normalizeSkillName$1));
 	if (subpath && !isSubpathSafe(basePath, subpath)) throw new Error(`Invalid subpath: "${subpath}" resolves outside the repository directory. Subpath must not contain ".." segments that escape the base path.`);
 	const searchPath = subpath ? join(basePath, subpath) : basePath;
 	const pluginGroupings = await getPluginGroupings(searchPath);
@@ -1220,8 +1270,8 @@ async function discoverSkills(basePath, subpath, options) {
 		if (lockedSkillNames.size === 0) return false;
 		const relativeDir = normalizeRelativePath(relative(basePath, skill.path));
 		if (!AGENT_PROJECT_SKILL_DIRS.some((dir) => relativeDir === dir || relativeDir.startsWith(`${dir}/`))) return false;
-		const skillName = normalizeSkillName(skill.name);
-		const directoryName = normalizeSkillName(basename(skill.path));
+		const skillName = normalizeSkillName$1(skill.name);
+		const directoryName = normalizeSkillName$1(basename(skill.path));
 		return lockedSkillNames.has(skillName) || lockedSkillNames.has(directoryName);
 	};
 	const parseSkillAt = async (skillDir) => {
@@ -1254,7 +1304,7 @@ async function discoverSkills(basePath, subpath, options) {
 	const tryAddSkillAt = async (skillDir) => {
 		if (!await hasSkillMd(skillDir)) return false;
 		let skill = await parseSkillAt(skillDir);
-		if (!skill || seenNames.has(skill.name)) return true;
+		if (!skill || !options?.includeDuplicateNames && seenNames.has(skill.name)) return true;
 		if (isInstalledProjectSkill(skill)) return true;
 		skill = enhanceSkill(skill);
 		skills.push(skill);
@@ -1277,7 +1327,7 @@ async function discoverSkills(basePath, subpath, options) {
 		const allSkillDirs = await findSkillDirs(searchPath);
 		for (const skillDir of allSkillDirs) {
 			let skill = await parseSkillAt(skillDir);
-			if (skill && !seenNames.has(skill.name) && !isInstalledProjectSkill(skill)) {
+			if (skill && (options?.includeDuplicateNames || !seenNames.has(skill.name)) && !isInstalledProjectSkill(skill)) {
 				skill = enhanceSkill(skill);
 				skills.push(skill);
 				seenNames.add(skill.name);
@@ -1305,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) {
@@ -1357,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"));
 		}
@@ -1366,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"));
 		}
@@ -1528,6 +1581,7 @@ const agents = {
 		displayName: "Deep Agents",
 		skillsDir: ".agents/skills",
 		globalSkillsDir: join(home, ".deepagents/agent/skills"),
+		showInUniversalPrompt: false,
 		detectInstalled: async () => {
 			return existsSync(join(home, ".deepagents"));
 		}
@@ -1554,7 +1608,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"));
@@ -1589,6 +1643,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",
@@ -1673,10 +1736,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: {
@@ -1888,6 +1951,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",
@@ -3837,11 +3910,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/",
@@ -3943,6 +4018,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);
@@ -3999,10 +4103,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,
@@ -4017,7 +4121,7 @@ async function tryBlobInstall(ownerRepo, options = {}) {
 		tree
 	};
 }
-var version$1 = "1.5.23";
+var version$1 = "1.5.25";
 const isCancelled$1 = (value) => typeof value === "symbol";
 const EVE_AGENT_LABEL = "eve agent";
 async function isSourcePrivate(source) {
@@ -4170,6 +4274,14 @@ function buildResultLines(results, targetAgents) {
 	if (failedSymlinks.length > 0) lines.push(`  ${import_picocolors.default.yellow("copied:")} ${formatList$1(failedSymlinks)}`);
 	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 {
@@ -4303,10 +4415,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;
@@ -4336,10 +4445,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) {
@@ -4350,10 +4456,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;
 		}
 	}
@@ -4372,10 +4475,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";
@@ -4393,10 +4493,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();
@@ -4426,10 +4523,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);
@@ -4758,9 +4852,8 @@ async function runAdd(args, options = {}) {
 				selectAll: true
 			});
 			if (isCancelled$1(selected)) {
-				cancel("Installation cancelled");
 				await cleanup(tempDir);
-				process.exit(0);
+				exitInstallationCancelled();
 			}
 			selectedSkills = selected;
 		}
@@ -4791,19 +4884,17 @@ async function runAdd(args, options = {}) {
 					initialValue: true
 				});
 				if (isCancel(useEve)) {
-					cancel("Installation cancelled");
 					await cleanup(tempDir);
-					process.exit(0);
+					exitInstallationCancelled();
 				}
 				if (useEve) {
 					targetAgents = ["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;
 				}
@@ -4816,10 +4907,9 @@ 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;
 			}
@@ -4831,10 +4921,9 @@ 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;
 			}
@@ -4860,9 +4949,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);
 			}
@@ -4884,9 +4972,8 @@ async function runAdd(args, options = {}) {
 				}]
 			});
 			if (isCancel(scope)) {
-				cancel("Installation cancelled");
 				await cleanup(tempDir);
-				process.exit(0);
+				exitInstallationCancelled();
 			}
 			installGlobally = scope;
 		}
@@ -4907,9 +4994,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";
@@ -4979,9 +5065,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…");
@@ -6158,7 +6243,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}`);
 		}
@@ -6366,6 +6455,46 @@ function parseRemoveOptions(args) {
 		options
 	};
 }
+function normalizeSkillName(name) {
+	return name.toLowerCase().replace(/[\s_]+/g, "-");
+}
+function normalizeSkillPath(path) {
+	return path.replace(/\\/g, "/").replace(/\/+/g, "/");
+}
+function resolveSkillLocations(lockedSkillNames, lockSkills, discovered) {
+	const discoveredPaths = new Set(discovered.map((skill) => normalizeSkillPath(skill.skillPath)));
+	const pathsByName = /* @__PURE__ */ new Map();
+	for (const skill of discovered) {
+		const key = normalizeSkillName(skill.name);
+		const paths = pathsByName.get(key) ?? /* @__PURE__ */ new Set();
+		paths.add(normalizeSkillPath(skill.skillPath));
+		pathsByName.set(key, paths);
+	}
+	const deletedSkills = [];
+	const ambiguousSkills = [];
+	const resolvedPaths = /* @__PURE__ */ new Map();
+	for (const name of lockedSkillNames) {
+		const lockedPath = lockSkills[name]?.skillPath;
+		if (!lockedPath) continue;
+		const normalizedLockedPath = normalizeSkillPath(lockedPath);
+		const candidates = [...pathsByName.get(normalizeSkillName(name)) ?? []];
+		if (candidates.length > 1) {
+			ambiguousSkills.push(name);
+			continue;
+		}
+		if (discoveredPaths.has(normalizedLockedPath)) {
+			resolvedPaths.set(name, normalizedLockedPath);
+			continue;
+		}
+		if (candidates.length === 1) resolvedPaths.set(name, candidates[0]);
+		else deletedSkills.push(name);
+	}
+	return {
+		deletedSkills,
+		ambiguousSkills,
+		resolvedPaths
+	};
+}
 const __dirname$1 = dirname(fileURLToPath(import.meta.url));
 const RESET$1 = "\x1B[0m";
 const BOLD$1 = "\x1B[1m";
@@ -6512,14 +6641,15 @@ async function promptDeletions(source, deletedSkills, isGlobal, options) {
 		});
 	}
 }
-async function checkAndPromptForDeletions(source, allLockedForSource, lockSkills, isGlobal, options, discoveredPaths) {
-	const deletedSkills = allLockedForSource.filter((name) => {
-		const entry = lockSkills[name];
-		if (!entry?.skillPath) return false;
-		return !discoveredPaths.includes(entry.skillPath);
-	});
-	await promptDeletions(source, deletedSkills, isGlobal, options);
-	return deletedSkills;
+async function checkAndPromptForDeletions(source, allLockedForSource, lockSkills, isGlobal, options, discovered) {
+	const resolution = resolveSkillLocations(allLockedForSource, lockSkills, discovered);
+	if (resolution.ambiguousSkills.length > 0) {
+		console.log();
+		console.log(`${DIM$1}Warning:${RESET$1} Multiple current paths match these skills from ${DIM$1}${source}${RESET$1}; skipping them rather than deleting or migrating the wrong skill:`);
+		for (const name of resolution.ambiguousSkills) console.log(`  ${DIM$1}•${RESET$1} ${sanitizeMetadata(name)}`);
+	}
+	await promptDeletions(source, resolution.deletedSkills, isGlobal, options);
+	return resolution;
 }
 async function checkWellKnownForUpdates(baseUrl, items) {
 	let indexResult;
@@ -6703,36 +6833,42 @@ async function updateGlobalSkills(options = {}) {
 				const tree = await fetchRepoTree(source, firstEntry.ref, getGitHubToken);
 				if (tree) {
 					const discoveredPaths = tree.tree.filter((entry) => entry.type === "blob").map((entry) => entry.path);
-					const deletedSkills = await checkAndPromptForDeletions(source, Object.entries(lock.skills).filter(([_, entry]) => entry.source === source && entry.ref === firstEntry.ref).map(([name, _]) => name), lock.skills, true, options, discoveredPaths);
-					const deletedSkillSet = new Set(deletedSkills);
-					for (const { name: skillName, entry } of itemsForSource) {
-						if (deletedSkillSet.has(skillName)) continue;
-						const latestHash = getSkillFolderHashFromTree(tree, entry.skillPath);
-						if (latestHash && latestHash !== entry.skillFolderHash) updates.push({
-							name: skillName,
-							source,
-							entry
-						});
+					if (!Object.entries(lock.skills).filter(([_, entry]) => entry.source === source && entry.ref === firstEntry.ref).map(([name, _]) => name).some((name) => lock.skills[name]?.skillPath && !discoveredPaths.includes(lock.skills[name].skillPath))) {
+						for (const { name: skillName, entry } of itemsForSource) {
+							const latestHash = getSkillFolderHashFromTree(tree, entry.skillPath);
+							if (latestHash && latestHash !== entry.skillFolderHash) updates.push({
+								name: skillName,
+								source,
+								entry
+							});
+						}
+						continue;
 					}
-					continue;
-				}
-				console.log(`  ${DIM$1}GitHub API unavailable; checking via Git clone${RESET$1}`);
+					console.log(`  ${DIM$1}Skill paths changed; resolving via Git clone${RESET$1}`);
+				} else console.log(`  ${DIM$1}GitHub API unavailable; checking via Git clone${RESET$1}`);
 			}
 			tempDir = await cloneRepo(sourceUrl, firstEntry.ref);
-			const discoveredPaths = (await discoverSkills(tempDir, void 0, { fullDepth: true })).map((skill) => {
-				return join(relative(tempDir, skill.path), "SKILL.md").split(sep).join("/");
-			});
-			const deletedSkills = await checkAndPromptForDeletions(source, Object.entries(lock.skills).filter(([_, entry]) => entry.source === source && entry.ref === firstEntry.ref).map(([name, _]) => name), lock.skills, true, options, discoveredPaths);
-			const deletedSkillSet = new Set(deletedSkills);
+			const discoveredLocations = (await discoverSkills(tempDir, void 0, {
+				fullDepth: true,
+				includeDuplicateNames: true
+			})).map((skill) => ({
+				name: skill.name,
+				skillPath: join(relative(tempDir, skill.path), "SKILL.md").split(sep).join("/")
+			}));
+			const resolution = await checkAndPromptForDeletions(source, Object.entries(lock.skills).filter(([_, entry]) => entry.source === source && entry.ref === firstEntry.ref).map(([name, _]) => name), lock.skills, true, options, discoveredLocations);
+			const deletedSkillSet = new Set(resolution.deletedSkills);
 			for (const { name: skillName, entry } of itemsForSource) {
 				if (deletedSkillSet.has(skillName)) continue;
-				const skillPath = entry.skillPath;
-				if (!discoveredPaths.includes(skillPath)) continue;
+				const skillPath = resolution.resolvedPaths.get(skillName);
+				if (!skillPath) continue;
 				const latestHash = isGitHubSource && /^[0-9a-f]{40}$/i.test(entry.skillFolderHash) ? await getGitTreeHash(tempDir, skillPath) : await computeSkillFolderHash(join(tempDir, dirname(skillPath)));
-				if (latestHash && latestHash !== entry.skillFolderHash) updates.push({
+				if (skillPath !== entry.skillPath || latestHash && latestHash !== entry.skillFolderHash) updates.push({
 					name: skillName,
 					source,
-					entry
+					entry: {
+						...entry,
+						skillPath
+					}
 				});
 			}
 		} catch (error) {
@@ -6910,6 +7046,7 @@ async function updateProjectSkills(options = {}) {
 		const allLockedForSource = Object.entries(localLock.skills).filter(([_, entry]) => (entry.sourceUrl || entry.source) === source && entry.ref === ref).map(([name, _]) => name);
 		let tempDir = null;
 		let deletedSkills = [];
+		let resolvedPaths = null;
 		if (cloneSource === null) {
 			failCount += skillsForSource.length;
 			console.log(`${DIM$1}✗ Cannot update ${source}: skills-lock.json is missing sourceUrl for this generic Git source${RESET$1}`);
@@ -6917,27 +7054,43 @@ async function updateProjectSkills(options = {}) {
 		}
 		try {
 			tempDir = await cloneRepo(cloneSource, ref);
-			const discoveredPaths = (await discoverSkills(tempDir, void 0, { fullDepth: true })).map((s) => {
-				return join(relative(tempDir, s.path), "SKILL.md").split(sep).join("/");
-			});
-			deletedSkills = await checkAndPromptForDeletions(source, allLockedForSource, localLock.skills, false, options, discoveredPaths);
+			const discoveredLocations = (await discoverSkills(tempDir, void 0, {
+				fullDepth: true,
+				includeDuplicateNames: true
+			})).map((skill) => ({
+				name: skill.name,
+				skillPath: join(relative(tempDir, skill.path), "SKILL.md").split(sep).join("/")
+			}));
+			const resolution = await checkAndPromptForDeletions(source, allLockedForSource, localLock.skills, false, options, discoveredLocations);
+			deletedSkills = resolution.deletedSkills;
+			resolvedPaths = resolution.resolvedPaths;
 		} catch (error) {
 			console.log(`${DIM$1}✗ Failed to check for deleted skills from ${source}${RESET$1}`);
 		} finally {
 			if (tempDir) await cleanupTempDir(tempDir);
 		}
+		if (resolvedPaths === null) {
+			failCount += skillsForSource.length;
+			continue;
+		}
 		const remainingSkills = skillsForSource.filter((s) => !deletedSkills.includes(s.name));
 		for (const skill of remainingSkills) {
 			const safeName = sanitizeMetadata(skill.name);
+			const resolvedPath = resolvedPaths?.get(skill.name);
+			if (resolvedPaths && !resolvedPath) continue;
+			const entry = resolvedPath ? {
+				...skill.entry,
+				skillPath: resolvedPath
+			} : skill.entry;
 			console.log(`${TEXT$1}Updating ${safeName}…${RESET$1}`);
-			const installUrl = buildLocalUpdateSource(skill.entry);
+			const installUrl = buildLocalUpdateSource(entry);
 			if (!installUrl) {
 				failCount++;
 				console.log(`  ${DIM$1}✗ Cannot update ${safeName}: skills-lock.json is missing sourceUrl for this generic Git source${RESET$1}`);
 				continue;
 			}
 			const subagentArgs = skill.entry.subagents?.length ? ["--subagent", ...skill.entry.subagents.map((s) => s === "" ? "root" : s)] : [];
-			const fullDepthArgs = shouldUseFullDepthForUpdate(skill.entry) ? ["--full-depth"] : [];
+			const fullDepthArgs = shouldUseFullDepthForUpdate(entry) ? ["--full-depth"] : [];
 			if (spawnSync(process.execPath, [
 				cliEntry,
 				"add",
@@ -6954,7 +7107,7 @@ async function updateProjectSkills(options = {}) {
 					"pipe"
 				],
 				encoding: "utf-8",
-				env: getUpdateChildEnv(skill.entry.sourceType),
+				env: getUpdateChildEnv(entry.sourceType),
 				shell: false
 			}).status === 0) {
 				successCount++;
@@ -7042,6 +7195,10 @@ const USE_AGENT_CONFIGS = {
 	codex: {
 		command: "codex",
 		args: []
+	},
+	"sarvam-code": {
+		command: "sarvam-code",
+		args: []
 	}
 };
 const SUPPORTED_USE_AGENTS = Object.keys(USE_AGENT_CONFIGS);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skills",
-  "version": "1.5.23",
+  "version": "1.5.25",
   "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",