ccski 1.1.0 → 2.1.0

package/dist/{registry-DtGaEhsM.mjs → registry-DNMfmLqa.mjs}

@@ -1,41 +1,11 @@
-import { createRequire } from "node:module";
+import { n as __require, r as __toESM, t as __commonJS } from "./chunk-B7onSSqq.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { TextDecoder } from "node:util";
 import { homedir } from "node:os";
-import { dirname, isAbsolute, join, resolve } from "node:path";
+import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import * as tty from "tty";
+import debug from "debug";
 
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function() {
-	return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i$1 = 0, n = keys.length, key; i$1 < n; i$1++) {
-			key = keys[i$1];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
-
-//#endregion
 //#region src/types/errors.ts
 /**
 * Base error class for ccski errors
@@ -62,8 +32,8 @@ var SkillNotFoundError = class extends CcskiError {
 * Error thrown when a skill name is ambiguous
 */
 var AmbiguousSkillNameError = class extends CcskiError {
-	constructor(skillName, matches) {
-		super(`Skill name '${skillName}' is ambiguous. Multiple skills found: ${matches.join(", ")}`);
+	constructor(skillName, matches, suggestions = []) {
+		super(`Skill name '${skillName}' is ambiguous. Multiple skills found: ${matches.join(", ")}`, suggestions.length ? suggestions : matches);
 		this.skillName = skillName;
 		this.matches = matches;
 		this.name = "AmbiguousSkillNameError";
@@ -3687,15 +3657,20 @@ const PluginEntrySchema = objectType({
 	lastUpdated: stringType(),
 	installPath: stringType(),
 	gitCommitSha: stringType(),
-	isLocal: booleanType()
-});
+	isLocal: booleanType(),
+	scope: stringType().optional()
+}).passthrough();
 /**
 * Schema for installed_plugins.json
 */
 const InstalledPluginsSchema = objectType({
 	version: numberType(),
-	plugins: recordType(stringType(), PluginEntrySchema)
+	plugins: recordType(stringType(), unionType([PluginEntrySchema, arrayType(PluginEntrySchema)]))
 });
+/**
+* Schema for Claude settings.json (subset we care about)
+*/
+const ClaudeSettingsSchema = objectType({ enabledPlugins: recordType(stringType(), booleanType()).optional() }).passthrough();
 
 //#endregion
 //#region node_modules/.pnpm/kind-of@6.0.3/node_modules/kind-of/index.js
@@ -11699,9 +11674,9 @@ var require_excerpt = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/gray-matt
 		const opts = defaults$2(options);
 		if (file.data == null) file.data = {};
 		if (typeof opts.excerpt === "function") return opts.excerpt(file, opts);
-		const sep = file.data.excerpt_separator || opts.excerpt_separator;
-		if (sep == null && (opts.excerpt === false || opts.excerpt == null)) return file;
-		const delimiter = typeof opts.excerpt === "string" ? opts.excerpt : sep || opts.delimiters[0];
+		const sep$1 = file.data.excerpt_separator || opts.excerpt_separator;
+		if (sep$1 == null && (opts.excerpt === false || opts.excerpt == null)) return file;
+		const delimiter = typeof opts.excerpt === "string" ? opts.excerpt : sep$1 || opts.delimiters[0];
 		const idx = file.content.indexOf(delimiter);
 		if (idx !== -1) file.excerpt = file.content.slice(0, idx);
 		return file;
@@ -12323,9 +12298,37 @@ function error(text) {
 function warn(text) {
 	return tone.warning(text);
 }
+function info(text) {
+	return tone.info(text);
+}
 function heading(text) {
 	return tone.underline(tone.bold(tone.accent(text)));
 }
+const SUPERSCRIPT_DIGITS = [
+	"⁰",
+	"¹",
+	"²",
+	"³",
+	"⁴",
+	"⁵",
+	"⁶",
+	"⁷",
+	"⁸",
+	"⁹"
+];
+function toSuperscript(num) {
+	return num.toString().split("").map((d) => SUPERSCRIPT_DIGITS[parseInt(d, 10)] ?? d).join("");
+}
+/**
+* Create a duplicate badge with superscript number.
+* isPrimary: the chosen skill in auto mode (shows just the number)
+* !isPrimary: the duplicate that was filtered out (shows [dup] + number)
+*/
+function duplicateBadge(groupIndex, isPrimary) {
+	const sup = toSuperscript(groupIndex);
+	if (isPrimary) return tone.accent(sup);
+	return tone.accent(`[dup]${sup}`);
+}
 function escapeRegExp$1(value) {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -12375,15 +12378,34 @@ function displayWidth(value) {
 
 //#endregion
 //#region src/core/discovery.ts
-/**
-* Skill directories in priority order (highest to lowest)
-*/
-const SKILL_DIRECTORIES = [
-	".agent/skills",
-	".claude/skills",
-	`${homedir()}/.agent/skills`,
-	`${homedir()}/.claude/skills`
-];
+function getDefaultSkillDirectories(userDir) {
+	return [
+		{
+			path: ".agent/skills",
+			provider: "claude"
+		},
+		{
+			path: ".claude/skills",
+			provider: "claude"
+		},
+		{
+			path: join(userDir, ".agent/skills"),
+			provider: "claude"
+		},
+		{
+			path: join(userDir, ".claude/skills"),
+			provider: "claude"
+		},
+		{
+			path: ".codex/skills",
+			provider: "codex"
+		},
+		{
+			path: join(userDir, ".codex/skills"),
+			provider: "codex"
+		}
+	];
+}
 /**
 * Check if a directory has bundled resources
 */
@@ -12397,12 +12419,12 @@ function checkBundledResources(skillDir) {
 /**
 * Determine skill location type based on directory path
 */
-function determineLocation(dirPath) {
+function determineLocation(dirPath, userDir) {
 	const normalizedPath = resolve(dirPath);
 	const cwd = process.cwd();
-	const home = homedir();
-	if (normalizedPath.startsWith(join(cwd, ".agent")) || normalizedPath.startsWith(join(cwd, ".claude"))) return "project";
-	if (normalizedPath.startsWith(join(home, ".agent")) || normalizedPath.startsWith(join(home, ".claude"))) return "user";
+	const home = userDir;
+	if (normalizedPath.startsWith(join(cwd, ".agent")) || normalizedPath.startsWith(join(cwd, ".claude")) || normalizedPath.startsWith(join(cwd, ".codex"))) return "project";
+	if (normalizedPath.startsWith(join(home, ".agent")) || normalizedPath.startsWith(join(home, ".claude")) || normalizedPath.startsWith(join(home, ".codex"))) return "user";
 	return "user";
 }
 function collectSkillDirectories(root, recursive, diagnostics, accumulator, includeDisabled) {
@@ -12428,7 +12450,7 @@ function collectSkillDirectories(root, recursive, diagnostics, accumulator, incl
 /**
 * Scan a single skill directory and return found skills
 */
-function scanSkillDirectory(dirPath, { location, recursive = true, diagnostics, includeDisabled = false }) {
+function scanSkillDirectory(dirPath, { location, recursive = true, diagnostics, includeDisabled = false }, provider, userDir = homedir(), scope) {
 	const skills = [];
 	const skillDirectories = /* @__PURE__ */ new Set();
 	collectSkillDirectories(dirPath, recursive, diagnostics, skillDirectories, includeDisabled);
@@ -12450,16 +12472,20 @@ function scanSkillDirectory(dirPath, { location, recursive = true, diagnostics,
 		if (candidates.length === 0) continue;
 		for (const candidate of candidates) try {
 			const parsed = parseSkillFile(candidate.path);
+			const baseName = parsed.frontmatter.name;
+			const scopedName = scope && !baseName.includes(":") ? `${scope}:${baseName}` : baseName;
 			const resources = checkBundledResources(skillDir);
-			const skillLocation = location ?? determineLocation(skillDir);
+			const skillLocation = location ?? determineLocation(skillDir, userDir);
 			skills.push({
-				name: parsed.frontmatter.name,
+				name: scopedName,
 				description: parsed.frontmatter.description,
+				provider,
 				location: skillLocation,
 				path: skillDir,
 				disabled: candidate.disabled,
 				...resources
 			});
+			diagnostics.byProvider[provider] = (diagnostics.byProvider[provider] ?? 0) + 1;
 		} catch (error$1) {
 			console.warn(colors.yellow(`Warning: Failed to parse ${candidate.path}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`));
 			diagnostics.warnings.push(`Failed to parse ${candidate.path}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`);
@@ -12474,26 +12500,46 @@ function discoverSkills(options = {}) {
 	const diagnostics = {
 		scannedDirectories: [],
 		warnings: [],
-		conflicts: []
+		conflicts: [],
+		byProvider: {
+			claude: 0,
+			codex: 0,
+			file: 0
+		}
 	};
+	const userDir = options.userDir ? resolve(options.userDir) : homedir();
 	const directories = [];
-	if (options.customDirs?.length) directories.push(...options.customDirs);
-	if (options.scanDefaultDirs !== false) directories.push(...SKILL_DIRECTORIES);
-	const skillMap = /* @__PURE__ */ new Map();
-	for (const dir of directories) {
-		const skills = scanSkillDirectory(dir.startsWith("/") ? dir : resolve(process.cwd(), dir), {
+	if (options.customDirs?.length) for (const entry of options.customDirs) {
+		const provider = options.customProvider ?? "file";
+		if (typeof entry === "string") directories.push({
+			path: entry,
+			provider,
+			scope: provider === "file" ? "other" : void 0
+		});
+		else directories.push({
+			path: entry.path,
+			provider,
+			scope: entry.scope ?? (provider === "file" ? "other" : void 0)
+		});
+	}
+	if (options.scanDefaultDirs !== false) directories.push(...getDefaultSkillDirectories(userDir));
+	const skills = [];
+	const firstPathByName = /* @__PURE__ */ new Map();
+	for (const entry of directories) {
+		const { path: dir, provider, scope } = entry;
+		const skillsFromDir = scanSkillDirectory(dir.startsWith("/") ? dir : resolve(process.cwd(), dir), {
 			diagnostics,
 			recursive: true,
 			includeDisabled: options.includeDisabled === true
-		});
-		for (const skill of skills) if (!skillMap.has(skill.name)) skillMap.set(skill.name, skill);
-		else {
-			const existing = skillMap.get(skill.name);
-			diagnostics.conflicts.push(`Keeping ${existing?.path ?? "unknown"} and skipping ${skill.path} for skill '${skill.name}' (higher priority already loaded).`);
+		}, provider, userDir, scope);
+		for (const skill of skillsFromDir) {
+			if (firstPathByName.has(skill.name)) diagnostics.conflicts.push(`Duplicate skill '${skill.name}' found at ${skill.path} (first seen at ${firstPathByName.get(skill.name)})`);
+			else firstPathByName.set(skill.name, skill.path);
+			skills.push(skill);
 		}
 	}
 	return {
-		skills: Array.from(skillMap.values()),
+		skills,
 		diagnostics
 	};
 }
@@ -12511,15 +12557,52 @@ function loadSkill(metadata) {
 
 //#endregion
 //#region src/core/plugins.ts
-const PLUGINS_FILE = join(homedir(), ".claude/plugins/installed_plugins.json");
-const PLUGINS_ROOT = join(homedir(), ".claude/plugins");
+function defaultPluginsFile(userDir) {
+	return join(userDir, ".claude/plugins/installed_plugins.json");
+}
+function defaultPluginsRoot(userDir) {
+	return join(userDir, ".claude/plugins");
+}
+function defaultSettingsFile(userDir) {
+	return join(userDir, ".claude/settings.json");
+}
 function resolveInstallPath(rawPath, pluginsRoot) {
 	return isAbsolute(rawPath) ? rawPath : join(pluginsRoot, rawPath);
 }
+function normalizePluginEntries(entry) {
+	return Array.isArray(entry) ? entry : [entry];
+}
+function loadClaudeSettings(settingsFile, diagnostics) {
+	if (!existsSync(settingsFile)) {
+		diagnostics?.warnings.push(`Settings file not found at ${settingsFile}`);
+		return null;
+	}
+	try {
+		const content = readFileSync(settingsFile, "utf-8");
+		const json = JSON.parse(content);
+		const validation = ClaudeSettingsSchema.safeParse(json);
+		if (!validation.success) {
+			console.warn(colors.yellow(`Warning: Invalid settings.json format:`), validation.error);
+			diagnostics?.warnings.push("Invalid settings.json format");
+			return null;
+		}
+		return validation.data;
+	} catch (error$1) {
+		console.warn(colors.yellow(`Warning: Failed to load settings.json:`), error$1);
+		diagnostics?.warnings.push(`Failed to load settings.json: ${error$1 instanceof Error ? error$1.message : String(error$1)}`);
+		return null;
+	}
+}
+function resolveEnabledPlugins(settings) {
+	const enabledPlugins = settings?.enabledPlugins;
+	if (!enabledPlugins) return null;
+	const enabled = Object.entries(enabledPlugins).filter(([, isEnabled]) => isEnabled).map(([pluginKey]) => pluginKey);
+	return new Set(enabled);
+}
 /**
 * Parse installed_plugins.json
 */
-function loadInstalledPlugins(pluginsFile = PLUGINS_FILE, diagnostics) {
+function loadInstalledPlugins(pluginsFile, diagnostics) {
 	if (!existsSync(pluginsFile)) {
 		console.info(`[ccski] No plugin marketplace skills found at ${pluginsFile}`);
 		diagnostics?.warnings.push(`Plugins file not found at ${pluginsFile}`);
@@ -12564,31 +12647,104 @@ function findSkillFiles(dir, diagnostics) {
 * Discover skills from installed plugins
 */
 function discoverPluginSkills(options = {}) {
+	const log = debug("ccski:plugins");
 	const diagnostics = {
 		scannedPlugins: [],
 		warnings: []
 	};
-	const pluginsFile = options.pluginsFile ?? PLUGINS_FILE;
+	const userDir = options.userDir ? resolve(options.userDir) : homedir();
+	const pluginsFile = options.pluginsFile ?? defaultPluginsFile(userDir);
 	diagnostics.scannedPlugins.push(pluginsFile);
-	const plugins = loadInstalledPlugins(pluginsFile, diagnostics);
-	if (!plugins) return {
-		skills: [],
-		diagnostics
-	};
+	const settingsFile = options.settingsFile ?? defaultSettingsFile(userDir);
 	const skills = [];
-	const pluginsRoot = options.pluginsRoot ?? PLUGINS_ROOT;
-	for (const [pluginKey, plugin] of Object.entries(plugins.plugins)) {
+	const seenPaths = /* @__PURE__ */ new Set();
+	const pluginsRoot = options.pluginsRoot ?? defaultPluginsRoot(userDir);
+	let missingOrEmpty = false;
+	const plugins = loadInstalledPlugins(pluginsFile, diagnostics);
+	const enabledPlugins = resolveEnabledPlugins(loadClaudeSettings(settingsFile, diagnostics));
+	log("plugins file=%s loaded=%s", pluginsFile, Boolean(plugins));
+	log("settings file=%s enabledPlugins=%s", settingsFile, enabledPlugins?.size ?? "all");
+	if (plugins) for (const [pluginKey, plugin] of Object.entries(plugins.plugins)) {
+		if (enabledPlugins && !enabledPlugins.has(pluginKey)) {
+			log("plugin %s disabled by settings", pluginKey);
+			continue;
+		}
 		const [pluginName, marketplace] = pluginKey.split("@");
 		if (!pluginName || !marketplace) continue;
-		const installPath = resolveInstallPath(plugin.installPath, pluginsRoot);
-		const skillFiles = findSkillFiles(installPath, diagnostics);
-		diagnostics.scannedPlugins.push(installPath);
+		const entries = normalizePluginEntries(plugin);
+		for (const entry of entries) {
+			const installPath = resolveInstallPath(entry.installPath, pluginsRoot);
+			const skillFiles = findSkillFiles(installPath, diagnostics);
+			if (!skillFiles.length) {
+				if (!existsSync(installPath)) {
+					diagnostics.warnings.push(`Plugin install path not found: ${installPath}`);
+					log("missing installPath: %s", installPath);
+				} else {
+					diagnostics.warnings.push(`No skills found in plugin install path: ${installPath}`);
+					log("empty installPath: %s", installPath);
+				}
+				missingOrEmpty = true;
+			}
+			diagnostics.scannedPlugins.push(installPath);
+			log("scanned manifest plugin=%s skills=%d", pluginName, skillFiles.length);
+			for (const skillFile of skillFiles) try {
+				const parsed = parseSkillFile(skillFile);
+				const skillDir = dirname(skillFile);
+				if (seenPaths.has(skillDir)) continue;
+				const skillName = parsed.frontmatter.name;
+				const namespaced = skillName.includes(":") ? skillName : pluginName === skillName ? skillName : `${pluginName}:${skillName}`;
+				skills.push({
+					name: namespaced,
+					description: parsed.frontmatter.description,
+					provider: "claude",
+					location: "plugin",
+					path: skillDir,
+					hasReferences: existsSync(join(skillDir, "references")),
+					hasScripts: existsSync(join(skillDir, "scripts")),
+					hasAssets: existsSync(join(skillDir, "assets")),
+					pluginInfo: {
+						pluginName,
+						marketplace,
+						version: entry.version
+					}
+				});
+				seenPaths.add(skillDir);
+			} catch (error$1) {
+				console.warn(colors.yellow(`Warning: Failed to parse plugin skill ${skillFile}:`), error$1);
+				diagnostics.warnings.push(`Failed to parse plugin skill ${skillFile}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`);
+			}
+		}
+	}
+	if (!(process.env.CCSKI_CLAUDE_PLUGINS_FALLBACK === "true")) {
+		log("fallback scan skipped (CCSKI_CLAUDE_PLUGINS_FALLBACK!=true)");
+		return {
+			skills,
+			diagnostics
+		};
+	}
+	if (enabledPlugins) {
+		log("fallback scan skipped (enabledPlugins present)");
+		return {
+			skills,
+			diagnostics
+		};
+	}
+	if (!plugins || skills.length === 0 || missingOrEmpty) {
+		const fallbackRoot = join(pluginsRoot, "skills");
+		diagnostics.scannedPlugins.push(fallbackRoot);
+		log("running fallback scan at %s", fallbackRoot);
+		const skillFiles = findSkillFiles(fallbackRoot, diagnostics);
 		for (const skillFile of skillFiles) try {
 			const parsed = parseSkillFile(skillFile);
 			const skillDir = dirname(skillFile);
+			if (seenPaths.has(skillDir)) continue;
+			const pluginName = relative(fallbackRoot, skillDir).split(sep).filter(Boolean)[0] ?? "local";
+			const skillName = parsed.frontmatter.name;
+			const namespaced = skillName.includes(":") ? skillName : pluginName === skillName ? skillName : `${pluginName}:${skillName}`;
 			skills.push({
-				name: `${pluginName}:${parsed.frontmatter.name}`,
+				name: namespaced,
 				description: parsed.frontmatter.description,
+				provider: "claude",
 				location: "plugin",
 				path: skillDir,
 				hasReferences: existsSync(join(skillDir, "references")),
@@ -12596,10 +12752,12 @@ function discoverPluginSkills(options = {}) {
 				hasAssets: existsSync(join(skillDir, "assets")),
 				pluginInfo: {
 					pluginName,
-					marketplace,
-					version: plugin.version
+					marketplace: "local",
+					version: "unknown"
 				}
 			});
+			seenPaths.add(skillDir);
+			log("fallback skill added %s (%s)", namespaced, skillDir);
 		} catch (error$1) {
 			console.warn(colors.yellow(`Warning: Failed to parse plugin skill ${skillFile}:`), error$1);
 			diagnostics.warnings.push(`Failed to parse plugin skill ${skillFile}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`);
@@ -12657,8 +12815,8 @@ var require_uFuzzy = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/@leeoniya+
 		toUpper: (str) => str.toLocaleUpperCase(),
 		toLower: (str) => str.toLocaleLowerCase(),
 		compare: null,
-		sort: (info, haystack, needle, compare = cmp) => {
-			let { idx, chars, terms, interLft2, interLft1, start, intraIns, interIns, cases } = info;
+		sort: (info$1, haystack, needle, compare = cmp) => {
+			let { idx, chars, terms, interLft2, interLft1, start, intraIns, interIns, cases } = info$1;
 			return idx.map((v, i$1) => i$1).sort((ia, ib) => chars[ib] - chars[ia] || intraIns[ia] - intraIns[ib] || terms[ib] + interLft2[ib] + .5 * interLft1[ib] - (terms[ia] + interLft2[ia] + .5 * interLft1[ia]) || interIns[ia] - interIns[ib] || start[ia] - start[ib] || cases[ib] - cases[ia] || compare(haystack[idx[ia]], haystack[idx[ib]]));
 		}
 	};
@@ -12806,7 +12964,7 @@ var require_uFuzzy = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/@leeoniya+
 		let withIntraBound = !!_intraBound;
 		let interBound = new RegExp(_interBound, uFlag);
 		let intraBound = new RegExp(_intraBound, uFlag);
-		const info = (idxs, haystack, needle) => {
+		const info$1 = (idxs, haystack, needle) => {
 			let [query, parts, contrs] = prepQuery(needle, 1);
 			let partsCased = split(needle, true);
 			let [queryR] = prepQuery(needle, 2);
@@ -12823,7 +12981,7 @@ var require_uFuzzy = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/@leeoniya+
 			}
 			let len = idxs.length;
 			let field = Array(len).fill(0);
-			let info$1 = {
+			let info$2 = {
 				idx: Array(len),
 				start: field.slice(),
 				chars: field.slice(),
@@ -12958,17 +13116,17 @@ var require_uFuzzy = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/@leeoniya+
 					if (j < partsLen - 1) idxAcc += groupLen + m[k + 1].length;
 				}
 				if (!disc) {
-					info$1.idx[ii] = idxs[i$1];
-					info$1.interLft2[ii] = lft2;
-					info$1.interLft1[ii] = lft1;
-					info$1.interRgt2[ii] = rgt2;
-					info$1.interRgt1[ii] = rgt1;
-					info$1.chars[ii] = chars;
-					info$1.terms[ii] = terms;
-					info$1.cases[ii] = cases;
-					info$1.interIns[ii] = inter;
-					info$1.intraIns[ii] = intra;
-					info$1.start[ii] = start;
+					info$2.idx[ii] = idxs[i$1];
+					info$2.interLft2[ii] = lft2;
+					info$2.interLft1[ii] = lft1;
+					info$2.interRgt2[ii] = rgt2;
+					info$2.interRgt1[ii] = rgt1;
+					info$2.chars[ii] = chars;
+					info$2.terms[ii] = terms;
+					info$2.cases[ii] = cases;
+					info$2.interIns[ii] = inter;
+					info$2.intraIns[ii] = intra;
+					info$2.start[ii] = start;
 					let m$1 = mhstr.match(queryR);
 					let idxAcc$1 = m$1.index + m$1[1].length;
 					let refLen = refine.length;
@@ -12995,7 +13153,7 @@ var require_uFuzzy = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/@leeoniya+
 						}
 					}
 					idxAcc$1 = m$1.index + m$1[1].length;
-					let ranges = info$1.ranges[ii] = [];
+					let ranges = info$2.ranges[ii] = [];
 					let from = idxAcc$1;
 					let to = idxAcc$1;
 					for (let i$2 = 2; i$2 < m$1.length; i$2++) {
@@ -13011,8 +13169,8 @@ var require_uFuzzy = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/@leeoniya+
 					ii++;
 				}
 			}
-			if (ii < idxs.length) for (let k in info$1) info$1[k] = info$1[k].slice(0, ii);
-			return info$1;
+			if (ii < idxs.length) for (let k in info$2) info$2[k] = info$2[k].slice(0, ii);
+			return info$2;
 		};
 		const refineMatch = (m, k, idxInNext, termLen) => {
 			let prepend = m[k] + m[k + 1].slice(0, idxInNext);
@@ -13093,7 +13251,7 @@ var require_uFuzzy = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/@leeoniya+
 					let idxs = matches[ni];
 					if (idxs == null || idxs.length == 0) continue;
 					let needle$1 = needles[ni];
-					let _info = info(idxs, haystack, needle$1);
+					let _info = info$1(idxs, haystack, needle$1);
 					let order = opts.sort(_info, haystack, needle$1, compare);
 					if (ni > 0) for (let i$1 = 0; i$1 < order.length; i$1++) order[i$1] += retOrder.length;
 					for (let k in _info) retInfo[k] = (retInfo[k] ?? []).concat(_info[k]);
@@ -13112,7 +13270,7 @@ var require_uFuzzy = /* @__PURE__ */ __commonJS({ "node_modules/.pnpm/@leeoniya+
 			},
 			split,
 			filter,
-			info,
+			info: info$1,
 			sort: opts.sort
 		};
 	}
@@ -13217,18 +13375,85 @@ function containsCaseInsensitive(haystack, needle) {
 	return haystack.toLowerCase().includes(needle.toLowerCase());
 }
 
+//#endregion
+//#region src/utils/skill-id.ts
+function stripPluginPrefix(name, pluginName) {
+	const prefix = `${pluginName}:`;
+	return name.startsWith(prefix) ? name.slice(prefix.length) : name;
+}
+const defaultFormatOptions = {
+	includeProvider: true,
+	color: true
+};
+/**
+* Build a copy/paste friendly skill id that includes provider and plugin (when present).
+* Format: provider:@plugin:name or provider:name
+*/
+function formatSkillId(skill, opts) {
+	const { includeProvider } = {
+		...defaultFormatOptions,
+		...opts
+	};
+	if (skill.pluginInfo) {
+		const base = stripPluginPrefix(skill.name, skill.pluginInfo.pluginName);
+		const id = `@${skill.pluginInfo.pluginName}:${base}`;
+		return includeProvider ? `${skill.provider}:${id}` : id;
+	}
+	return includeProvider ? `${skill.provider}:${skill.name}` : skill.name;
+}
+/**
+* Return a set of aliases (lowercased) that should match user input, including plugin-qualified variants.
+*/
+function skillAliases(skill) {
+	const aliases = /* @__PURE__ */ new Set();
+	aliases.add(skill.name.toLowerCase());
+	const short = skill.name.toLowerCase().split(":").pop() ?? skill.name.toLowerCase();
+	aliases.add(short);
+	if (skill.pluginInfo) {
+		const plugin = skill.pluginInfo.pluginName.toLowerCase();
+		const base = stripPluginPrefix(skill.name.toLowerCase(), plugin);
+		aliases.add(`${plugin}:${base}`);
+		aliases.add(`@${plugin}:${base}`);
+		aliases.add(`${skill.provider}:${plugin}:${base}`);
+		aliases.add(`${skill.provider}:@${plugin}:${base}`);
+	}
+	return Array.from(aliases);
+}
+/**
+* Render a human-friendly label with colors, highlighting provider/plugin/name components.
+* Default includes provider to stay copy/pasteable; set includeProvider=false when a provider badge already exists.
+*/
+function formatSkillLabel(skill, opts) {
+	const { includeProvider, color, providerColor } = {
+		...defaultFormatOptions,
+		...opts
+	};
+	const useColor = color !== false;
+	const providerPart = includeProvider ? `${skill.provider}:` : "";
+	const pluginPart = skill.pluginInfo ? `@${skill.pluginInfo.pluginName}:` : "";
+	const baseName = skill.pluginInfo ? stripPluginPrefix(skill.name, skill.pluginInfo.pluginName) : skill.name;
+	if (!useColor) return `${providerPart}${pluginPart}${baseName}`;
+	const defaultProviderColor = skill.provider === "claude" ? colors.green : skill.provider === "codex" ? colors.cyan : dim;
+	const green$1 = (providerColor ?? defaultProviderColor)(providerPart.replace(/:$/, ""));
+	const blue$1 = colors.blue(baseName);
+	const pluginColored = pluginPart ? dim(pluginPart) : "";
+	return `${includeProvider ? `${green$1}:` : ""}${pluginColored}${blue$1}`;
+}
+
 //#endregion
 //#region src/core/registry.ts
 /**
 * Skill registry for managing discovered skills
 */
 var SkillRegistry = class {
-	skills = /* @__PURE__ */ new Map();
+	skills = [];
 	diagnostics = {
 		directoriesScanned: [],
 		pluginSources: [],
 		warnings: [],
-		conflicts: []
+		conflicts: [],
+		byProvider: {},
+		byLocation: {}
 	};
 	constructor(options = {}) {
 		this.options = options;
@@ -13238,56 +13463,75 @@ var SkillRegistry = class {
 	* Refresh the skill registry by rescanning directories
 	*/
 	refresh() {
-		this.skills.clear();
+		this.skills = [];
 		this.diagnostics = {
 			directoriesScanned: [],
 			pluginSources: [],
 			warnings: [],
-			conflicts: []
+			conflicts: [],
+			byProvider: {},
+			byLocation: {}
 		};
 		const discovered = discoverSkills(this.options);
 		this.diagnostics.directoriesScanned.push(...discovered.diagnostics.scannedDirectories);
 		this.diagnostics.warnings.push(...discovered.diagnostics.warnings);
 		this.diagnostics.conflicts.push(...discovered.diagnostics.conflicts);
-		for (const skill of discovered.skills) this.skills.set(skill.name, skill);
+		for (const skill of discovered.skills) {
+			this.skills.push(skill);
+			this.diagnostics.byProvider[skill.provider] = (this.diagnostics.byProvider[skill.provider] ?? 0) + 1;
+			this.diagnostics.byLocation[skill.location] = (this.diagnostics.byLocation[skill.location] ?? 0) + 1;
+		}
 		if (!this.options.skipPlugins) {
 			const pluginOptions = {};
 			if (this.options.pluginsFile) pluginOptions.pluginsFile = this.options.pluginsFile;
 			if (this.options.pluginsRoot) pluginOptions.pluginsRoot = this.options.pluginsRoot;
+			if (this.options.userDir) pluginOptions.userDir = this.options.userDir;
 			const pluginSkills = discoverPluginSkills(pluginOptions);
 			this.diagnostics.pluginSources.push(...pluginSkills.diagnostics.scannedPlugins);
 			this.diagnostics.warnings.push(...pluginSkills.diagnostics.warnings);
-			for (const skill of pluginSkills.skills) if (!this.skills.has(skill.name)) this.skills.set(skill.name, skill);
-			else this.diagnostics.conflicts.push(`Skipping plugin skill ${skill.name} from ${skill.path} because a higher-priority skill is already loaded.`);
+			for (const skill of pluginSkills.skills) {
+				if (this.skills.some((existing) => existing.name.toLowerCase() === skill.name.toLowerCase() && existing.location !== "plugin")) this.diagnostics.conflicts.push(`Duplicate skill ${skill.name} from plugin at ${skill.path}; keeping for filter-stage resolution.`);
+				this.skills.push(skill);
+				this.diagnostics.byProvider[skill.provider] = (this.diagnostics.byProvider[skill.provider] ?? 0) + 1;
+				this.diagnostics.byLocation[skill.location] = (this.diagnostics.byLocation[skill.location] ?? 0) + 1;
+			}
 		}
 	}
 	/**
 	* Get all skills
 	*/
 	getAll() {
-		return Array.from(this.skills.values());
+		return [...this.skills];
 	}
 	/**
 	* Find a skill by name (case-insensitive, supports full and short names)
 	*/
 	find(name) {
 		const normalizedName = name.toLowerCase();
-		for (const skill of this.skills.values()) if (skill.name.toLowerCase() === normalizedName) return skill;
-		if (name.includes(":")) throw new SkillNotFoundError(name, this.getSuggestions(name));
-		const shortMatches = Array.from(this.skills.values()).filter((skill) => {
-			return skill.name.split(":").pop()?.toLowerCase() === normalizedName;
+		const [maybeProvider, rest] = normalizedName.includes(":") ? (() => {
+			const parts = normalizedName.split(":");
+			if (parts.length > 1 && [
+				"claude",
+				"codex",
+				"file"
+			].includes(parts[0])) return [parts.shift(), parts.join(":")];
+			return [void 0, normalizedName];
+		})() : [void 0, normalizedName];
+		const targetProvider = maybeProvider;
+		const targetName = rest;
+		const candidates = this.skills.filter((skill) => {
+			const skillName = skill.name.toLowerCase();
+			const shortName = skillName.split(":").pop();
+			const matchesName = skillName === targetName || shortName === targetName;
+			const matchesProvider = targetProvider ? skill.provider === targetProvider : true;
+			return matchesName && matchesProvider;
 		});
-		if (shortMatches.length === 0) throw new SkillNotFoundError(name, this.getSuggestions(name));
-		for (const tier of [
-			"project",
-			"user",
-			"plugin"
-		]) {
-			const tierMatches = shortMatches.filter((skill) => skill.location === tier);
-			if (tierMatches.length === 1) return tierMatches[0];
-			if (tierMatches.length > 1) throw new AmbiguousSkillNameError(name, tierMatches.map((s) => s.name));
-		}
-		throw new SkillNotFoundError(name, this.getSuggestions(name));
+		if (candidates.length === 1) return candidates[0];
+		if (candidates.length > 1) {
+			const suggestions = candidates.map((s) => this.formatNameWithProvider(s));
+			throw new AmbiguousSkillNameError(name, candidates.map((s) => s.name), suggestions);
+		}
+		throw new SkillNotFoundError(name, this.getSuggestions(name, targetProvider));
 	}
 	/**
 	* Check if a skill exists
@@ -13309,27 +13553,29 @@ var SkillRegistry = class {
 	/**
 	* Get suggestions for similar skill names (fuzzy matching)
 	*/
-	getSuggestions(query, limit = 3) {
-		const names = Array.from(this.skills.keys());
-		return rankStrings(names, query).slice(0, limit).map((index) => names[index]);
+	getSuggestions(query, provider, limit = 3) {
+		const pool = this.skills.filter((s) => provider ? s.provider === provider : true).map((s) => this.formatNameWithProvider(s));
+		return rankStrings(pool, query).slice(0, limit).map((index) => pool[index]);
+	}
+	formatNameWithProvider(skill) {
+		return formatSkillId(skill);
 	}
 	/**
 	* Get diagnostic information
 	*/
 	getDiagnostics() {
-		const byLocation = {};
-		for (const skill of this.skills.values()) byLocation[skill.location] = (byLocation[skill.location] ?? 0) + 1;
 		return {
-			totalSkills: this.skills.size,
-			byLocation,
-			directoriesScanned: this.diagnostics.directoriesScanned,
-			pluginSources: this.diagnostics.pluginSources,
-			warnings: this.diagnostics.warnings,
-			conflicts: this.diagnostics.conflicts
+			totalSkills: this.skills.length,
+			byLocation: { ...this.diagnostics.byLocation },
+			byProvider: { ...this.diagnostics.byProvider },
+			directoriesScanned: [...this.diagnostics.directoriesScanned],
+			pluginSources: [...this.diagnostics.pluginSources],
+			warnings: [...this.diagnostics.warnings],
+			conflicts: [...this.diagnostics.conflicts]
 		};
 	}
 };
 
 //#endregion
-export { intersectionType as A, CcskiError as B, PluginEntrySchema as C, custom as D, booleanType as E, recordType as F, __require as G, SkillNotFoundError as H, stringType as I, __toESM as K, unionType as L, numberType as M, objectType as N, discriminatedUnionType as O, optionalType as P, unknownType as R, InstalledPluginsSchema as S, arrayType as T, ValidationError as U, ParseError as V, __commonJS as W, tone as _, discoverSkills as a, parseSkillFile as b, colors as c, formatBytes as d, heading as f, success as g, setColorEnabled as h, SKILL_DIRECTORIES as i, literalType as j, enumType as k, dim as l, renderList as m, containsCaseInsensitive as n, loadSkill as o, highlight$1 as p, rankStrings as r, scanSkillDirectory as s, SkillRegistry as t, error as u, warn as v, SkillFrontmatterSchema as w, validateSkillFile as x, wrap as y, AmbiguousSkillNameError as z };
-//# sourceMappingURL=registry-DtGaEhsM.mjs.map
+export { SkillFrontmatterSchema as A, optionalType as B, warn as C, ClaudeSettingsSchema as D, validateSkillFile as E, enumType as F, AmbiguousSkillNameError as G, stringType as H, intersectionType as I, SkillNotFoundError as J, CcskiError as K, literalType as L, booleanType as M, custom as N, InstalledPluginsSchema as O, discriminatedUnionType as P, numberType as R, tone as S, parseSkillFile as T, unionType as U, recordType as V, unknownType as W, ValidationError as Y, highlight$1 as _, containsCaseInsensitive as a, setColorEnabled as b, getDefaultSkillDirectories as c, colors as d, dim as f, heading as g, formatBytes as h, skillAliases as i, arrayType as j, PluginEntrySchema as k, loadSkill as l, error as m, formatSkillId as n, rankStrings as o, duplicateBadge as p, ParseError as q, formatSkillLabel as r, discoverSkills as s, SkillRegistry as t, scanSkillDirectory as u, info as v, wrap as w, success as x, renderList as y, objectType as z };
+//# sourceMappingURL=registry-DNMfmLqa.mjs.map