skills 1.5.19 → 1.5.20

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 [69 more](#supported-agents).
+Supports **OpenCode**, **Claude Code**, **Codex**, **Cursor**, and [70 more](#supported-agents).
 <!-- agent-list:end -->
 
 [![skills.sh](https://skills.sh/b/vercel-labs/skills)](https://skills.sh/vercel-labs/skills)
@@ -272,12 +272,14 @@ Skills can be installed to any of these agents:
 | Gemini CLI | `gemini-cli` | `.agents/skills/` | `~/.gemini/skills/` |
 | GitHub Copilot | `github-copilot` | `.agents/skills/` | `~/.copilot/skills/` |
 | Goose | `goose` | `.goose/skills/` | `~/.config/goose/skills/` |
+| Grok Build | `grok` | `.grok/skills/` | `~/.grok/skills/` |
 | Hermes Agent | `hermes-agent` | `.hermes/skills/` | `~/.hermes/skills/` |
 | inference.sh | `inference-sh` | `.inferencesh/skills/` | `~/.inferencesh/skills/` |
 | 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/` |
+| Kimchi | `kimchi` | `.kimchi/skills/` | `~/.config/kimchi/harness/skills/` |
 | Kiro CLI | `kiro-cli` | `.kiro/skills/` | `~/.kiro/skills/` |
 | Kode | `kode` | `.kode/skills/` | `~/.kode/skills/` |
 | Lingma | `lingma` | `.lingma/skills/` | `~/.lingma/skills/` |
@@ -402,12 +404,14 @@ to also discover `SKILL.md` files outside these container directories
 - `agent/skills/`
 - `.forge/skills/`
 - `.goose/skills/`
+- `.grok/skills/`
 - `.hermes/skills/`
 - `.inferencesh/skills/`
 - `.jazz/skills/`
 - `.junie/skills/`
 - `.iflow/skills/`
 - `.kilocode/skills/`
+- `.kimchi/skills/`
 - `.kiro/skills/`
 - `.kode/skills/`
 - `.lingma/skills/`

package/dist/cli.mjs

@@ -21,6 +21,22 @@ import { createHash } from "crypto";
 import { createHash as createHash$1 } from "node:crypto";
 import { gunzipSync, inflateRawSync } from "node:zlib";
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
+const DEFAULT_GITHUB_HOST = "github.com";
+function getGitHubHost() {
+	const configuredHost = process.env.GH_HOST?.trim();
+	if (!configuredHost) return DEFAULT_GITHUB_HOST;
+	try {
+		const parsed = new URL(`https://${configuredHost}`);
+		if (parsed.username || parsed.password || parsed.port || parsed.pathname !== "/" || parsed.search || parsed.hash) return DEFAULT_GITHUB_HOST;
+		return parsed.hostname;
+	} catch {
+		return DEFAULT_GITHUB_HOST;
+	}
+}
+function isGitHubHost(host) {
+	const normalizedHost = host.toLowerCase();
+	return normalizedHost === DEFAULT_GITHUB_HOST || normalizedHost === getGitHubHost().toLowerCase();
+}
 function getOwnerRepo(parsed) {
 	if (parsed.type === "local") return null;
 	const sshMatch = parsed.url.match(/^git@[^:]+:(.+)$/);
@@ -88,7 +104,7 @@ function looksLikeGitSource(input) {
 	if (input.startsWith("http://") || input.startsWith("https://")) try {
 		const parsed = new URL(input);
 		const pathname = parsed.pathname;
-		if (parsed.hostname === "github.com") return /^\/[^/]+\/[^/]+(?:\.git)?(?:\/tree\/[^/]+(?:\/.*)?)?\/?$/.test(pathname);
+		if (isGitHubHost(parsed.host)) return /^\/[^/]+\/[^/]+(?:\.git)?(?:\/tree\/[^/]+(?:\/.*)?)?\/?$/.test(pathname);
 		if (parsed.hostname === "gitlab.com") return /^\/.+?\/[^/]+(?:\.git)?(?:\/-\/tree\/[^/]+(?:\/.*)?)?\/?$/.test(pathname);
 	} catch {}
 	if (/^https?:\/\/.+\.git(?:$|[/?])/i.test(input)) return true;
@@ -134,6 +150,22 @@ function parseSource(input) {
 	if (githubPrefixMatch) return parseSource(appendFragmentRef(githubPrefixMatch[1], fragmentRef, fragmentSkillFilter));
 	const gitlabPrefixMatch = input.match(/^gitlab:(.+)$/);
 	if (gitlabPrefixMatch) return parseSource(appendFragmentRef(`https://gitlab.com/${gitlabPrefixMatch[1]}`, fragmentRef, fragmentSkillFilter));
+	if (getGitHubHost() !== "github.com" && /^https?:\/\//.test(input)) try {
+		const parsedUrl = new URL(input);
+		if (isGitHubHost(parsedUrl.host) && parsedUrl.host !== "github.com") {
+			const [owner, rawRepo, marker, ref, ...subpathSegments] = parsedUrl.pathname.split("/").filter(Boolean);
+			if (owner && rawRepo) {
+				const repo = rawRepo.replace(/\.git$/, "");
+				const isTreeUrl = marker === "tree" && ref;
+				return {
+					type: "git",
+					url: `${parsedUrl.protocol}//${parsedUrl.host}/${owner}/${repo}.git`,
+					...isTreeUrl ? { ref } : fragmentRef ? { ref: fragmentRef } : {},
+					...isTreeUrl && subpathSegments.length > 0 ? { subpath: sanitizeSubpath(subpathSegments.join("/")) } : {}
+				};
+			}
+		}
+	} catch {}
 	const githubTreeWithPathMatch = input.match(/github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)\/(.+)/);
 	if (githubTreeWithPathMatch) {
 		const [, owner, repo, ref, subpath] = githubTreeWithPathMatch;
@@ -190,12 +222,14 @@ function parseSource(input) {
 			...fragmentRef ? { ref: fragmentRef } : {}
 		};
 	}
+	const githubHost = getGitHubHost();
+	const shorthandSourceType = githubHost === "github.com" ? "github" : "git";
 	const atSkillMatch = input.match(/^([^/]+)\/([^/@]+)@(.+)$/);
 	if (atSkillMatch && !input.includes(":") && !input.startsWith(".") && !input.startsWith("/")) {
 		const [, owner, repo, skillFilter] = atSkillMatch;
 		return {
-			type: "github",
-			url: `https://github.com/${owner}/${repo}.git`,
+			type: shorthandSourceType,
+			url: `https://${githubHost}/${owner}/${repo}.git`,
 			...fragmentRef ? { ref: fragmentRef } : {},
 			skillFilter: fragmentSkillFilter || skillFilter
 		};
@@ -204,8 +238,8 @@ function parseSource(input) {
 	if (shorthandMatch && !input.includes(":") && !input.startsWith(".") && !input.startsWith("/")) {
 		const [, owner, repo, subpath] = shorthandMatch;
 		return {
-			type: "github",
-			url: `https://github.com/${owner}/${repo}.git`,
+			type: shorthandSourceType,
+			url: `https://${githubHost}/${owner}/${repo}.git`,
 			...fragmentRef ? { ref: fragmentRef } : {},
 			subpath: subpath ? sanitizeSubpath(subpath) : subpath,
 			...fragmentSkillFilter ? { skillFilter: fragmentSkillFilter } : {}
@@ -573,20 +607,21 @@ var GitCloneError = class extends Error {
 	}
 };
 function parseGitHubRepoUrl(url) {
-	const sshMatch = url.match(/^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/i);
-	if (sshMatch) {
-		const owner = sshMatch[1];
-		const repo = sshMatch[2];
+	const sshMatch = url.match(/^git@([^:]+):([^/]+)\/([^/]+?)(?:\.git)?$/i);
+	if (sshMatch && isGitHubHost(sshMatch[1])) {
+		const host = sshMatch[1];
+		const owner = sshMatch[2];
+		const repo = sshMatch[3];
 		return {
 			owner,
 			repo,
 			slug: `${owner}/${repo}`,
-			sshUrl: `git@github.com:${owner}/${repo}.git`
+			sshUrl: `git@${host}:${owner}/${repo}.git`
 		};
 	}
 	try {
 		const parsed = new URL(url);
-		if (parsed.hostname !== "github.com") return null;
+		if (!isGitHubHost(parsed.host)) return null;
 		const match = parsed.pathname.match(/^\/([^/]+)\/([^/]+?)(?:\.git)?\/?$/);
 		if (!match) return null;
 		const owner = match[1];
@@ -595,7 +630,7 @@ function parseGitHubRepoUrl(url) {
 			owner,
 			repo,
 			slug: `${owner}/${repo}`,
-			sshUrl: `git@github.com:${owner}/${repo}.git`
+			sshUrl: `git@${parsed.host}:${owner}/${repo}.git`
 		};
 	} catch {
 		return null;
@@ -604,7 +639,7 @@ function parseGitHubRepoUrl(url) {
 function isGitHubHttpsCloneUrl(url) {
 	try {
 		const parsed = new URL(url);
-		return parsed.protocol === "https:" && parsed.hostname === "github.com";
+		return parsed.protocol === "https:" && isGitHubHost(parsed.host);
 	} catch {
 		return false;
 	}
@@ -665,12 +700,13 @@ async function resetTempDir(dir) {
 }
 async function tryGhClone(repo, tempDir, ref) {
 	let cloneTarget = repo.slug;
+	const host = repo.sshUrl.match(/^git@([^:]+):/)?.[1] || "github.com";
 	try {
 		const { stdout, stderr } = await execFileAsync("gh", [
 			"auth",
 			"status",
 			"-h",
-			"github.com"
+			host
 		], {
 			timeout: 5e3,
 			env: {
@@ -705,8 +741,9 @@ async function tryGhClone(repo, tempDir, ref) {
 	return true;
 }
 function buildGitHubAuthError(url, repo, message) {
-	if (repo && isGitHubSsoAuthError(message)) return `GitHub blocked HTTPS access to ${url} because the organization enforces SAML SSO.\n  skills tried your existing git credentials and available fallbacks, but none succeeded.\n  - Re-authorize your GitHub credentials/app for that org's SSO policy\n  - Or rerun with SSH: npx skills add ${repo.sshUrl}\n  - Verify access with: gh auth status -h github.com or ssh -T git@github.com`;
-	if (repo) return `Authentication failed for ${url}.\n  - For private repos, ensure you have access\n  - Retry with SSH: npx skills add ${repo.sshUrl}\n  - Check access with: gh auth status -h github.com or ssh -T git@github.com`;
+	const host = repo?.sshUrl.match(/^git@([^:]+):/)?.[1] || "github.com";
+	if (repo && isGitHubSsoAuthError(message)) return `GitHub blocked HTTPS access to ${url} because the organization enforces SAML SSO.\n  skills tried your existing git credentials and available fallbacks, but none succeeded.\n  - Re-authorize your GitHub credentials/app for that org's SSO policy\n  - Or rerun with SSH: npx skills add ${repo.sshUrl}\n  - Verify access with: gh auth status -h ${host} or ssh -T git@${host}`;
+	if (repo) return `Authentication failed for ${url}.\n  - For private repos, ensure you have access\n  - Retry with SSH: npx skills add ${repo.sshUrl}\n  - Check access with: gh auth status -h ${host} or ssh -T git@${host}`;
 	return `Authentication failed for ${url}.\n  - For private repos, ensure you have access\n  - For SSH: Check your keys with 'ssh -T git@github.com'\n  - For HTTPS: Run 'gh auth login' or configure git credentials`;
 }
 async function cloneRepo(url, ref) {
@@ -897,6 +934,13 @@ async function addSkillToLocalLock(skillName, entry, cwd) {
 	lock.skills[skillName] = entry;
 	await writeLocalLock(lock, cwd);
 }
+async function removeSkillFromLocalLock(skillName, cwd) {
+	const lock = await readLocalLock(cwd);
+	if (!(skillName in lock.skills)) return false;
+	delete lock.skills[skillName];
+	await writeLocalLock(lock, cwd);
+	return true;
+}
 function createEmptyLocalLock() {
 	return {
 		version: CURRENT_VERSION$1,
@@ -920,9 +964,11 @@ const AGENT_PROJECT_SKILL_DIRS = [
 	".continue/skills",
 	".github/skills",
 	".goose/skills",
+	".grok/skills",
 	".iflow/skills",
 	".junie/skills",
 	".kilocode/skills",
+	".kimchi/skills",
 	".kiro/skills",
 	".mux/skills",
 	".neovate/skills",
@@ -956,24 +1002,44 @@ async function hasSkillMd(dir) {
 		return false;
 	}
 }
+function warnSkippedSkill(skillMdPath, reason) {
+	console.warn(`⚠ Skipped ${sanitizeMetadata(skillMdPath)} — ${stripTerminalEscapes(reason)}`);
+}
 async function parseSkillMd(skillMdPath, options) {
+	let content;
 	try {
-		const content = await readFile(skillMdPath, "utf-8");
-		const { data } = parseFrontmatter(content);
-		if (!data.name || !data.description) return null;
-		if (typeof data.name !== "string" || typeof data.description !== "string") return null;
-		const metadata = isRecord(data.metadata) ? data.metadata : void 0;
-		if (metadata?.internal === true && !shouldInstallInternalSkills() && !options?.includeInternal) return null;
-		return {
-			name: sanitizeMetadata(data.name),
-			description: sanitizeMetadata(data.description),
-			path: dirname(skillMdPath),
-			rawContent: content,
-			metadata
-		};
-	} catch {
+		content = await readFile(skillMdPath, "utf-8");
+	} catch (err) {
+		warnSkippedSkill(skillMdPath, `failed to read file: ${err.message}`);
+		return null;
+	}
+	let data;
+	try {
+		({data} = parseFrontmatter(content));
+	} catch (err) {
+		warnSkippedSkill(skillMdPath, `YAML parse error: ${err.message}`);
+		return null;
+	}
+	if (!data.name || !data.description) {
+		const missing = [];
+		if (!data.name) missing.push("name");
+		if (!data.description) missing.push("description");
+		warnSkippedSkill(skillMdPath, `missing required frontmatter field(s): ${missing.join(", ")}`);
+		return null;
+	}
+	if (typeof data.name !== "string" || typeof data.description !== "string") {
+		warnSkippedSkill(skillMdPath, `frontmatter "name" and "description" must be strings (got ${typeof data.name} and ${typeof data.description})`);
 		return null;
 	}
+	const metadata = isRecord(data.metadata) ? data.metadata : void 0;
+	if (metadata?.internal === true && !shouldInstallInternalSkills() && !options?.includeInternal) return null;
+	return {
+		name: sanitizeMetadata(data.name),
+		description: sanitizeMetadata(data.description),
+		path: dirname(skillMdPath),
+		rawContent: content,
+		metadata
+	};
 }
 async function findSkillDirs(dir, depth = 0, maxDepth = 5) {
 	if (depth > maxDepth) return [];
@@ -994,6 +1060,7 @@ function isSubpathSafe(basePath, subpath) {
 async function discoverSkills(basePath, subpath, options) {
 	const skills = [];
 	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));
 	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.`);
@@ -1012,8 +1079,14 @@ async function discoverSkills(basePath, subpath, options) {
 		const directoryName = normalizeSkillName(basename(skill.path));
 		return lockedSkillNames.has(skillName) || lockedSkillNames.has(directoryName);
 	};
+	const parseSkillAt = async (skillDir) => {
+		const skillMdPath = resolve(skillDir, "SKILL.md");
+		if (parsedSkillPaths.has(skillMdPath)) return null;
+		parsedSkillPaths.add(skillMdPath);
+		return parseSkillMd(skillMdPath, options);
+	};
 	if (await hasSkillMd(searchPath)) {
-		let skill = await parseSkillMd(join(searchPath, "SKILL.md"), options);
+		let skill = await parseSkillAt(searchPath);
 		if (skill) {
 			if (!isInstalledProjectSkill(skill)) {
 				skill = enhanceSkill(skill);
@@ -1035,7 +1108,7 @@ async function discoverSkills(basePath, subpath, options) {
 	prioritySearchDirs.push(...await getPluginSkillPaths(searchPath));
 	const tryAddSkillAt = async (skillDir) => {
 		if (!await hasSkillMd(skillDir)) return false;
-		let skill = await parseSkillMd(join(skillDir, "SKILL.md"), options);
+		let skill = await parseSkillAt(skillDir);
 		if (!skill || seenNames.has(skill.name)) return true;
 		if (isInstalledProjectSkill(skill)) return true;
 		skill = enhanceSkill(skill);
@@ -1065,7 +1138,7 @@ async function discoverSkills(basePath, subpath, options) {
 	if (skills.length === 0 || options?.fullDepth) {
 		const allSkillDirs = await findSkillDirs(searchPath);
 		for (const skillDir of allSkillDirs) {
-			let skill = await parseSkillMd(join(skillDir, "SKILL.md"), options);
+			let skill = await parseSkillAt(skillDir);
 			if (skill && !seenNames.has(skill.name) && !isInstalledProjectSkill(skill)) {
 				skill = enhanceSkill(skill);
 				skills.push(skill);
@@ -1093,6 +1166,7 @@ const claudeHome = process.env.CLAUDE_CONFIG_DIR?.trim() || join(home, ".claude"
 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 zedAppDataHome = process.env.APPDATA?.trim();
 const zedFlatpakConfigHome = process.env.FLATPAK_XDG_CONFIG_HOME?.trim();
 function packageJsonHasDependency(packageJsonPath, dependencyName) {
@@ -1112,6 +1186,9 @@ function getOpenClawGlobalSkillsDir(homeDir = home, pathExists = existsSync) {
 function isZCodeInstalled(homeDir = home, pathExists = existsSync) {
 	return pathExists(join(homeDir, ".zcode")) || pathExists("/Applications/ZCode.app");
 }
+function isKimchiInstalled(homeDir = home, pathExists = existsSync) {
+	return pathExists(join(homeDir, ".config", "kimchi"));
+}
 const agents = {
 	"aider-desk": {
 		name: "aider-desk",
@@ -1395,6 +1472,15 @@ const agents = {
 			return existsSync(join(configHome, "goose"));
 		}
 	},
+	grok: {
+		name: "grok",
+		displayName: "Grok Build",
+		skillsDir: ".grok/skills",
+		globalSkillsDir: join(grokHome, "skills"),
+		detectInstalled: async () => {
+			return existsSync(grokHome);
+		}
+	},
 	"hermes-agent": {
 		name: "hermes-agent",
 		displayName: "Hermes Agent",
@@ -1449,6 +1535,15 @@ const agents = {
 			return existsSync(join(home, ".kilocode"));
 		}
 	},
+	kimchi: {
+		name: "kimchi",
+		displayName: "Kimchi",
+		skillsDir: ".kimchi/skills",
+		globalSkillsDir: join(home, ".config", "kimchi", "harness", "skills"),
+		detectInstalled: async () => {
+			return isKimchiInstalled();
+		}
+	},
 	"kimi-code-cli": {
 		name: "kimi-code-cli",
 		displayName: "Kimi Code CLI",
@@ -2244,7 +2339,7 @@ async function installBlobSkillForAgent(skill, agentType, options = {}) {
 			mode: "symlink"
 		};
 		if (!isGlobal && !isUniversalAgent(agentType)) {
-			if (!existsSync(join(cwd, agents[agentType].skillsDir.split("/")[0]))) return {
+			if (!existsSync(join(cwd, agents[agentType].skillsDir.split("/")[0])) && agentType !== "claude-code") return {
 				success: true,
 				path: canonicalDir,
 				canonicalPath: canonicalDir,
@@ -3165,9 +3260,11 @@ const PRIORITY_PREFIXES = [
 	".continue/skills/",
 	".github/skills/",
 	".goose/skills/",
+	".grok/skills/",
 	".iflow/skills/",
 	".junie/skills/",
 	".kilocode/skills/",
+	".kimchi/skills/",
 	".kiro/skills/",
 	".mux/skills/",
 	".neovate/skills/",
@@ -3334,7 +3431,7 @@ async function tryBlobInstall(ownerRepo, options = {}) {
 		tree
 	};
 }
-var version$1 = "1.5.19";
+var version$1 = "1.5.20";
 const isCancelled$1 = (value) => typeof value === "symbol";
 const EVE_AGENT_LABEL = "eve agent";
 async function isSourcePrivate(source) {
@@ -3885,6 +3982,7 @@ async function runAdd(args, options = {}) {
 		spinner$3.stop(`Source: ${parsed.type === "local" ? parsed.localPath : parsed.url}${parsed.ref ? ` @ ${import_picocolors.default.yellow(parsed.ref)}` : ""}${parsed.subpath ? ` (${parsed.subpath})` : ""}${parsed.skillFilter ? ` ${import_picocolors.default.dim("@")}${import_picocolors.default.cyan(parsed.skillFilter)}` : ""}`);
 		const ownerRepoRaw = getOwnerRepo(parsed);
 		const repoPrivacyPromise = (() => {
+			if (parsed.type !== "github") return Promise.resolve(null);
 			if (!ownerRepoRaw) return Promise.resolve(null);
 			const ownerRepo = parseOwnerRepo(ownerRepoRaw);
 			if (!ownerRepo) return Promise.resolve(null);
@@ -5155,7 +5253,7 @@ function deriveSkillFolder(skillPath) {
 	return folder;
 }
 function supportsAppendedSubpath(source) {
-	if (source.startsWith("git@")) return false;
+	if (source.startsWith("git@") || source.startsWith("ssh://")) return false;
 	if (source.endsWith(".git")) return false;
 	if (source.startsWith("http://") || source.startsWith("https://")) try {
 		const host = new URL(source).hostname;
@@ -5173,6 +5271,11 @@ function getLocalSource(entry) {
 	if ((entry.sourceType === "git" || entry.sourceType === "gitlab") && isBareShorthand(entry.source)) return null;
 	return entry.source;
 }
+function shouldUseFullDepthForUpdate(entry) {
+	if (!entry.skillPath) return false;
+	const source = entry.sourceType && entry.sourceType !== "github" ? getLocalSource(entry) : entry.source;
+	return source !== null && !supportsAppendedSubpath(source);
+}
 function appendFolderAndRef(source, skillPath, ref) {
 	if (!supportsAppendedSubpath(source)) return formatSourceInput(source, ref);
 	const folder = deriveSkillFolder(skillPath);
@@ -5296,18 +5399,26 @@ async function runList(args) {
 		global: scope,
 		agentFilter
 	});
+	const cwd = process.cwd();
+	const lockedSkills = scope ? await getAllLockedSkills() : (await readLocalLock(cwd)).skills;
+	const lockEntriesBySanitizedName = new Map(Object.entries(lockedSkills).map(([name, entry]) => [sanitizeName(name), entry]));
+	const getLockEntry = (skillName) => lockedSkills[skillName] ?? lockEntriesBySanitizedName.get(sanitizeName(skillName));
 	if (options.json) {
-		const jsonOutput = installedSkills.map((skill) => ({
-			name: skill.name,
-			path: skill.canonicalPath,
-			scope: skill.scope,
-			agents: skill.agents.map((a) => agents[a].displayName)
-		}));
+		const jsonOutput = installedSkills.map((skill) => {
+			const lockEntry = getLockEntry(skill.name);
+			return {
+				name: skill.name,
+				path: skill.canonicalPath,
+				scope: skill.scope,
+				agents: skill.agents.map((a) => agents[a].displayName),
+				source: lockEntry?.source ?? null,
+				sourceUrl: lockEntry?.sourceUrl ?? null,
+				sourceType: lockEntry?.sourceType ?? null
+			};
+		});
 		console.log(JSON.stringify(jsonOutput, null, 2));
 		return;
 	}
-	const lockedSkills = await getAllLockedSkills();
-	const cwd = process.cwd();
 	const scopeLabel = scope ? "Global" : "Project";
 	if (installedSkills.length === 0) {
 		if (options.json) {
@@ -5326,14 +5437,17 @@ async function runList(args) {
 		const agentInfo = skill.agents.length > 0 ? formatList(agentNames) : `${YELLOW}not linked${RESET$2}`;
 		const paddedName = sanitizeMetadata(skill.name).padEnd(maxNameLength);
 		const paddedPath = shortPath.padEnd(maxPathLength);
-		console.log(`${prefix}${CYAN}${paddedName}${RESET$2} ${DIM$2}${paddedPath}${RESET$2} ${DIM$2}Agents:${RESET$2} ${agentInfo}`);
+		const source = getLockEntry(skill.name)?.source ?? null;
+		const sourceLabel = source ? sanitizeMetadata(source) : "local";
+		console.log(`${prefix}${CYAN}${paddedName}${RESET$2} ${DIM$2}${paddedPath}${RESET$2}`);
+		console.log(`${prefix}  ${DIM$2}Agents:${RESET$2} ${agentInfo}  ${DIM$2}Source:${RESET$2} ${sourceLabel}`);
 	}
 	console.log(`${BOLD$2}${scopeLabel} Skills${RESET$2}`);
 	console.log();
 	const groupedSkills = {};
 	const ungroupedSkills = [];
 	for (const skill of installedSkills) {
-		const lockEntry = lockedSkills[skill.name];
+		const lockEntry = getLockEntry(skill.name);
 		if (lockEntry?.pluginName) {
 			const group = lockEntry.pluginName;
 			if (!groupedSkills[group]) groupedSkills[group] = [];
@@ -5385,6 +5499,17 @@ async function runList(args) {
 		console.log();
 	}
 }
+function resolveSkillsToRemove(requested, folderNames, lockKeys = []) {
+	const identityBySanitized = /* @__PURE__ */ new Map();
+	for (const folder of folderNames) identityBySanitized.set(sanitizeName(folder), folder);
+	for (const key of lockKeys) identityBySanitized.set(sanitizeName(key), key);
+	const matched = /* @__PURE__ */ new Set();
+	for (const name of requested) {
+		const hit = identityBySanitized.get(sanitizeName(name));
+		if (hit) matched.add(hit);
+	}
+	return Array.from(matched);
+}
 async function removeCommand(skillNames, options) {
 	const agentResult = await detectAgent();
 	if (agentResult.isAgent) {
@@ -5414,7 +5539,10 @@ async function removeCommand(skillNames, options) {
 	}
 	const installedSkills = Array.from(skillNamesSet).sort();
 	spinner$1.stop(`Found ${installedSkills.length} unique installed skill(s)`);
-	if (installedSkills.length === 0) {
+	const lockSkillsKeys = isGlobal ? Object.keys((await readSkillLock()).skills) : Object.keys((await readLocalLock(cwd)).skills);
+	const requestedSkills = options.all ? [...installedSkills, ...lockSkillsKeys] : skillNames;
+	const resolvedRequestedSkills = options.all || skillNames.length > 0 ? resolveSkillsToRemove(requestedSkills, installedSkills, lockSkillsKeys) : [];
+	if (installedSkills.length === 0 && resolvedRequestedSkills.length === 0) {
 		outro(import_picocolors.default.yellow("No skills found to remove."));
 		return;
 	}
@@ -5428,9 +5556,9 @@ async function removeCommand(skillNames, options) {
 		}
 	}
 	let selectedSkills = [];
-	if (options.all) selectedSkills = installedSkills;
+	if (options.all) selectedSkills = resolvedRequestedSkills;
 	else if (skillNames.length > 0) {
-		selectedSkills = installedSkills.filter((s) => skillNames.some((name) => name.toLowerCase() === s.toLowerCase()));
+		selectedSkills = resolvedRequestedSkills;
 		if (selectedSkills.length === 0) {
 			log.error(`No matching skills found for: ${skillNames.join(", ")}`);
 			return;
@@ -5449,7 +5577,7 @@ async function removeCommand(skillNames, options) {
 			cancel("Removal cancelled");
 			process.exit(0);
 		}
-		selectedSkills = selected;
+		selectedSkills = resolveSkillsToRemove(selected, installedSkills, lockSkillsKeys);
 	}
 	let targetAgents;
 	if (options.agent && options.agent.length > 0) targetAgents = options.agent;
@@ -5513,10 +5641,19 @@ async function removeCommand(skillNames, options) {
 			recursive: true,
 			force: true
 		});
-		const lockEntry = isGlobal ? await getSkillFromLock(skillName) : null;
-		const effectiveSource = lockEntry?.source || "local";
-		const effectiveSourceType = lockEntry?.sourceType || "local";
-		if (isGlobal) await removeSkillFromLock(skillName);
+		let effectiveSource = "local";
+		let effectiveSourceType = "local";
+		if (isGlobal) {
+			const lockEntry = await getSkillFromLock(skillName);
+			effectiveSource = lockEntry?.source || "local";
+			effectiveSourceType = lockEntry?.sourceType || "local";
+			await removeSkillFromLock(skillName);
+		} else {
+			const lockEntry = (await readLocalLock(cwd)).skills[skillName];
+			effectiveSource = lockEntry?.source || "local";
+			effectiveSourceType = lockEntry?.sourceType || "local";
+			await removeSkillFromLocalLock(skillName, cwd);
+		}
 		results.push({
 			skill: skillName,
 			success: true,
@@ -5786,7 +5923,7 @@ async function updateGlobalSkills(options = {}) {
 					console.log(`  ${DIM$1}✗ Failed to fetch tree for ${source}${RESET$1}`);
 					continue;
 				}
-				const discoveredPaths = findSkillMdPaths(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).map(([name, _]) => name), lock.skills, true, options, discoveredPaths);
 				const deletedSkillSet = new Set(deletedSkills);
 				for (const { name: skillName, entry } of itemsForSource) {
@@ -5801,7 +5938,7 @@ async function updateGlobalSkills(options = {}) {
 				continue;
 			}
 			tempDir = await cloneRepo(sourceUrl, firstEntry.ref);
-			const discoveredPaths = (await discoverSkills(tempDir)).map((skill) => {
+			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).map(([name, _]) => name), lock.skills, true, options, discoveredPaths);
@@ -5866,10 +6003,12 @@ async function updateGlobalSkills(options = {}) {
 			console.log(`  ${DIM$1}✗ Failed to update ${safeName}: CLI entrypoint not found at ${cliEntry}${RESET$1}`);
 			continue;
 		}
+		const fullDepthArgs = shouldUseFullDepthForUpdate(update.entry) ? ["--full-depth"] : [];
 		if (spawnSync(process.execPath, [
 			cliEntry,
 			"add",
 			installUrl,
+			...fullDepthArgs,
 			"-g",
 			"-y"
 		], {
@@ -5967,7 +6106,7 @@ async function updateProjectSkills(options = {}) {
 		}
 		try {
 			tempDir = await cloneRepo(sourceUrl, ref);
-			const discoveredPaths = (await discoverSkills(tempDir)).map((s) => {
+			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);
@@ -5987,6 +6126,7 @@ async function updateProjectSkills(options = {}) {
 				continue;
 			}
 			const subagentArgs = skill.entry.subagents?.length ? ["--subagent", ...skill.entry.subagents.map((s) => s === "" ? "root" : s)] : [];
+			const fullDepthArgs = shouldUseFullDepthForUpdate(skill.entry) ? ["--full-depth"] : [];
 			if (spawnSync(process.execPath, [
 				cliEntry,
 				"add",
@@ -5994,6 +6134,7 @@ async function updateProjectSkills(options = {}) {
 				"--skill",
 				skill.name,
 				...subagentArgs,
+				...fullDepthArgs,
 				"-y"
 			], {
 				stdio: [
@@ -6674,6 +6815,11 @@ async function main() {
 	}
 	const command = args[0];
 	const restArgs = args.slice(1);
+	if (command !== "--help" && command !== "-h" && command !== "--version" && command !== "-v" && (restArgs.includes("--help") || restArgs.includes("-h"))) {
+		if (command === "remove" || command === "rm" || command === "r") showRemoveHelp();
+		else showHelp();
+		return;
+	}
 	switch (command) {
 		case "find":
 		case "search":
@@ -6713,14 +6859,11 @@ async function main() {
 		}
 		case "remove":
 		case "rm":
-		case "r":
-			if (restArgs.includes("--help") || restArgs.includes("-h")) {
-				showRemoveHelp();
-				break;
-			}
+		case "r": {
 			const { skills, options: removeOptions } = parseRemoveOptions(restArgs);
 			await removeCommand(skills, removeOptions);
 			break;
+		}
 		case "experimental_sync": {
 			if (!inAgent) showLogo();
 			const { options: syncOptions } = parseSyncOptions(restArgs);
@@ -6747,6 +6890,7 @@ async function main() {
 		default:
 			console.log(`Unknown command: ${command}`);
 			console.log(`Run ${BOLD}skills --help${RESET} for usage.`);
+			process.exitCode = 1;
 	}
 }
 main().finally(() => flushTelemetry().then(() => process.exit(process.exitCode ?? 0)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skills",
-  "version": "1.5.19",
+  "version": "1.5.20",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {
@@ -67,12 +67,14 @@
     "gemini-cli",
     "github-copilot",
     "goose",
+    "grok",
     "hermes-agent",
     "inference-sh",
     "jazz",
     "junie",
     "iflow-cli",
     "kilo",
+    "kimchi",
     "kimi-code-cli",
     "kiro-cli",
     "kode",