wittyhub 0.0.4 → 0.0.5

package/dist/cli.mjs

@@ -14,8 +14,9 @@ import { createHash } from "node:crypto";
 import { execFile } from "node:child_process";
 import { promisify, stripVTControlCharacters } from "node:util";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { existsSync as existsSync$1, statSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { dirname as dirname$1, join as join$1, sep as sep$1 } from "node:path";
+import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, resolve as resolve$1, sep as sep$1 } from "node:path";
 import { homedir as homedir$1, platform, tmpdir as tmpdir$1 } from "os";
 import { parse } from "yaml";
 import * as readline from "readline";
@@ -59,15 +60,6 @@ function parseOwnerRepo(ownerRepo) {
 	};
 	return null;
 }
-async function isRepoPrivate(owner, repo) {
-	try {
-		const res = await fetch(`https://api.github.com/repos/${owner}/${repo}`);
-		if (!res.ok) return null;
-		return (await res.json()).private === true;
-	} catch {
-		return null;
-	}
-}
 function sanitizeSubpath(subpath) {
 	const segments = subpath.replace(/\\/g, "/").split("/");
 	for (const segment of segments) if (segment === "..") throw new Error(`Unsafe subpath: "${subpath}" contains path traversal segments. Subpaths must not contain ".." components.`);
@@ -266,19 +258,145 @@ function loadCliConfig() {
 		return {};
 	}
 }
-const DEFAULT_API_URL = "https://skillhub.openeuler.org/api/v1";
-const DEFAULT_SEARCH_URL = "https://skillhub.openeuler.org/api/v1/index/search";
-const DEFAULT_TELEMETRY_URL = "https://skillhub.openeuler.org/api/v1/skills/telemetry";
-const DEFAULT_AUDIT_URL = "https://skillhub.openeuler.org/api/v1/skills/{skill_id}/audit";
-const DEFAULT_GET_URL = "https://skillhub.openeuler.org/api/v1/skills/{skill_id}";
-const DEFAULT_LIST_URL = "https://skillhub.openeuler.org/api/v1/skills/";
 const cliConfig = loadCliConfig();
-const DOWNLOAD_URL = `${typeof cliConfig.api_url === "string" && cliConfig.api_url.trim() ? cliConfig.api_url.trim() : process.env.SKILLS_API_URL ? `${process.env.SKILLS_API_URL.replace(/\/$/, "")}/api/v1` : DEFAULT_API_URL}/skills/{skill_id}/download`;
-const SEARCH_URL = typeof cliConfig.search_url === "string" && cliConfig.search_url.trim() ? cliConfig.search_url.trim() : process.env.SKILLS_API_URL ? `${process.env.SKILLS_API_URL.replace(/\/$/, "")}/api/v1/index/search` : DEFAULT_SEARCH_URL;
-const TELEMETRY_URL = typeof cliConfig.telemetry_url === "string" && cliConfig.telemetry_url.trim() ? cliConfig.telemetry_url.trim() : DEFAULT_TELEMETRY_URL;
-const AUDIT_URL = typeof cliConfig.audit_url === "string" && cliConfig.audit_url.trim() ? cliConfig.audit_url.trim() : DEFAULT_AUDIT_URL;
-const GET_URL = typeof cliConfig.get_url === "string" && cliConfig.get_url.trim() ? cliConfig.get_url.trim() : DEFAULT_GET_URL;
-const LIST_URL = typeof cliConfig.list_url === "string" && cliConfig.list_url.trim() ? cliConfig.list_url.trim() : GET_URL.replace(/\{skill_id\}[^/]*$/, "") || DEFAULT_LIST_URL;
+const API_URL = typeof cliConfig.api_url === "string" && cliConfig.api_url.trim() ? cliConfig.api_url.trim().replace(/\/$/, "") : process.env.SKILLS_API_URL ? `${process.env.SKILLS_API_URL.replace(/\/$/, "")}/api/v1` : "https://skillhub.openeuler.org/api/v1";
+const SEARCH_URL = `${API_URL}/index/search`;
+const TELEMETRY_URL = `${API_URL}/skills/telemetry`;
+const AUDIT_URL = `${API_URL}/skills/{skill_id}/audit`;
+const GET_URL = `${API_URL}/skills/{skill_id}`;
+const LIST_URL = `${API_URL}/skills/`;
+const DOWNLOAD_URL = `${API_URL}/skills/{skill_id}/download`;
+let cliVersion = null;
+let detectedAgentName = null;
+function setDetectedAgent(agentName) {
+	detectedAgentName = agentName;
+}
+function isCI() {
+	return !!(process.env.CI || process.env.GITHUB_ACTIONS || process.env.GITLAB_CI || process.env.CIRCLECI || process.env.TRAVIS || process.env.BUILDKITE || process.env.JENKINS_URL || process.env.TEAMCITY_VERSION);
+}
+function isEnabled() {
+	return !process.env.DISABLE_TELEMETRY && !process.env.DO_NOT_TRACK;
+}
+function setVersion(version) {
+	cliVersion = version;
+}
+function slugifyTelemetryValue(value) {
+	const lowered = value.trim().toLowerCase();
+	if (!lowered) return "";
+	let normalized = lowered.replace(/[^a-z0-9._-]+/g, "-");
+	normalized = normalized.replace(/-{2,}/g, "-");
+	return normalized.replace(/^-|-$/g, "");
+}
+async function fetchAuditBySkillId(skillId, timeoutMs = 15e3) {
+	const controller = new AbortController();
+	const timeout = setTimeout(() => controller.abort(), timeoutMs);
+	try {
+		const response = await fetch(AUDIT_URL.replace("{skill_id}", skillId), { signal: controller.signal });
+		if (response.ok) {
+			const data = await response.json();
+			if (!data.error) {
+				const auditData = data.data || data;
+				return { [skillId.split("/").pop() || skillId]: {
+					risk_level: auditData.risk_level ?? "unknown",
+					risk_score: auditData.risk_score ?? null,
+					risk_signals: auditData.risk_signals ?? [],
+					audited_at: auditData.audited_at ?? null
+				} };
+			}
+		}
+		return null;
+	} catch {
+		return null;
+	} finally {
+		clearTimeout(timeout);
+	}
+}
+const pendingTelemetry = [];
+function track(data) {
+	if (!isEnabled()) return;
+	try {
+		const params = new URLSearchParams();
+		if (cliVersion) params.set("v", cliVersion);
+		if (isCI()) params.set("ci", "1");
+		if (detectedAgentName) params.set("agent", detectedAgentName);
+		for (const [key, value] of Object.entries(data)) if (value !== void 0 && value !== null) params.set(key, String(value));
+		const p = fetch(`${TELEMETRY_URL}?${params.toString()}`).catch(() => {}).then(() => {});
+		pendingTelemetry.push(p);
+	} catch {}
+}
+async function flushTelemetry(timeoutMs = 5e3) {
+	if (pendingTelemetry.length === 0) return;
+	const timeout = new Promise((resolve) => setTimeout(resolve, timeoutMs));
+	await Promise.race([Promise.all(pendingTelemetry), timeout]);
+}
+const SOURCE_TYPE_PREFIXES = [
+	"github",
+	"gitcode",
+	"gitlab",
+	"gitee"
+];
+function normalizeSkillId(input) {
+	const trimmed = input.trim();
+	const colonIdx = trimmed.indexOf(":");
+	if (colonIdx > 0) {
+		const prefix = trimmed.slice(0, colonIdx).toLowerCase();
+		if (SOURCE_TYPE_PREFIXES.includes(prefix)) return trimmed;
+	}
+	return `github:${trimmed}`;
+}
+function isRepoLevelRef(input) {
+	const trimmed = input.trim();
+	const colonIdx = trimmed.indexOf(":");
+	if (colonIdx <= 0) return false;
+	const prefix = trimmed.slice(0, colonIdx).toLowerCase();
+	if (!SOURCE_TYPE_PREFIXES.includes(prefix)) return false;
+	return trimmed.slice(colonIdx + 1).split("/").length === 2;
+}
+const HOST_TO_SOURCE_TYPE = {
+	"github.com": "github",
+	"gitcode.com": "gitcode",
+	"gitlab.com": "gitlab",
+	"gitee.com": "gitee"
+};
+function repoUrlToRef(input) {
+	const trimmed = input.trim().replace(/\.git$/, "");
+	if (!trimmed) return null;
+	const scpLike = trimmed.match(/^git@([^:]+):(.+)$/);
+	if (scpLike) return refFromHostAndPath(scpLike[1], scpLike[2]);
+	const sshLike = trimmed.match(/^ssh:\/\/[^@]+@([^/]+)\/(.+)$/);
+	if (sshLike) return refFromHostAndPath(sshLike[1], sshLike[2]);
+	const urlLike = trimmed.match(/^[a-z][a-z0-9+.-]*:\/\/([^/]+)\/(.+)$/i);
+	if (urlLike) return refFromHostAndPath(urlLike[1], urlLike[2]);
+	return null;
+}
+function refFromHostAndPath(host, path) {
+	const sourceType = HOST_TO_SOURCE_TYPE[host.toLowerCase()];
+	if (!sourceType) return null;
+	const parts = path.replace(/\/+$/, "").split("/");
+	if (parts.length !== 2 || parts.some((p) => !p)) return null;
+	return `${sourceType}:${parts.join("/")}`;
+}
+async function listSkillsByRepo(sourceType, ownerRepo) {
+	const slugifiedOwnerRepo = ownerRepo.split("/").map(slugifyTelemetryValue).join("/");
+	const url = `${LIST_URL}?${new URLSearchParams({
+		source_type: sourceType,
+		repo: slugifiedOwnerRepo,
+		limit: "100"
+	}).toString()}`;
+	try {
+		const res = await fetch(url);
+		if (!res.ok) return [];
+		const raw = await res.json();
+		return ((raw.data || raw).skills ?? []).filter((skill) => skill && typeof skill.skill_id === "string" && skill.skill_id).map((skill) => ({
+			skill_id: skill.skill_id,
+			name: skill.name ?? "",
+			description: skill.description ?? "",
+			source_url: skill.source_url ?? ""
+		}));
+	} catch {
+		return [];
+	}
+}
 const CSI_RE = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/g;
 const OSC_RE = /\x1b\][\s\S]*?(?:\x07|\x1b\\)/g;
 const DCS_PM_APC_RE = /\x1b[P^_][\s\S]*?(?:\x1b\\)/g;
@@ -541,12 +659,6 @@ function isAuthFailure(message) {
 function createGitClient(extraEnv) {
 	return esm_default({
 		timeout: { block: CLONE_TIMEOUT_MS },
-		env: {
-			...process.env,
-			GIT_TERMINAL_PROMPT: "0",
-			GIT_LFS_SKIP_SMUDGE: "1",
-			...extraEnv
-		},
 		config: [
 			"filter.lfs.required=false",
 			"filter.lfs.smudge=",
@@ -554,6 +666,11 @@ function createGitClient(extraEnv) {
 			"filter.lfs.process="
 		],
 		unsafe: { allowUnsafeFilter: true }
+	}).env({
+		...process.env,
+		GIT_TERMINAL_PROMPT: "0",
+		GIT_LFS_SKIP_SMUDGE: "1",
+		...extraEnv
 	});
 }
 async function resetTempDir(dir) {
@@ -856,13 +973,14 @@ async function parseSkillMd(skillMdPath, options) {
 		const { data } = parseFrontmatter(content);
 		if (!data.name || !data.description) return null;
 		if (typeof data.name !== "string" || typeof data.description !== "string") return null;
-		if (data.metadata?.internal === true && !shouldInstallInternalSkills() && !options?.includeInternal) return null;
+		const metadata = typeof data.metadata === "object" && data.metadata !== null ? 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: data.metadata
+			metadata
 		};
 	} catch {
 		return null;
@@ -2207,99 +2325,6 @@ async function listInstalledSkills(options = {}) {
 	} catch {}
 	return Array.from(skillsMap.values());
 }
-let cliVersion = null;
-let detectedAgentName = null;
-function setDetectedAgent(agentName) {
-	detectedAgentName = agentName;
-}
-function isCI() {
-	return !!(process.env.CI || process.env.GITHUB_ACTIONS || process.env.GITLAB_CI || process.env.CIRCLECI || process.env.TRAVIS || process.env.BUILDKITE || process.env.JENKINS_URL || process.env.TEAMCITY_VERSION);
-}
-function isEnabled() {
-	return !process.env.DISABLE_TELEMETRY && !process.env.DO_NOT_TRACK;
-}
-function setVersion(version) {
-	cliVersion = version;
-}
-function slugifyTelemetryValue(value) {
-	const lowered = value.trim().toLowerCase();
-	if (!lowered) return "";
-	let normalized = lowered.replace(/[^a-z0-9._-]+/g, "-");
-	normalized = normalized.replace(/-{2,}/g, "-");
-	return normalized.replace(/^-|-$/g, "");
-}
-function buildSkillId(sourceType, ownerRepo, skillName, skillFiles) {
-	if (![
-		"github",
-		"gitcode",
-		"gitlab",
-		"gitee"
-	].includes(sourceType)) return null;
-	if (!ownerRepo) return null;
-	const slugifiedOwnerRepo = ownerRepo.split("/").map(slugifyTelemetryValue).join("/");
-	if (skillFiles) {
-		const relativePath = skillFiles[skillName];
-		if (relativePath) {
-			const normalizedPath = relativePath.trim().replace(/\\/g, "/").replace(/\/+$/, "");
-			if (normalizedPath === "SKILL.md") return `${sourceType}/${slugifiedOwnerRepo}/${slugifiedOwnerRepo.split("/").pop()}`;
-			if (normalizedPath.endsWith("/SKILL.md")) return `${sourceType}/${slugifiedOwnerRepo}/${normalizedPath.slice(0, -9)}`;
-		}
-	}
-	const skillPath = slugifyTelemetryValue(skillName);
-	if (!skillPath) return null;
-	return `${sourceType}/${slugifiedOwnerRepo}/${skillPath}`;
-}
-async function fetchAuditData(source, skillSlugs, sourceType = "github", skillFiles, timeoutMs = 15e3) {
-	if (skillSlugs.length === 0) return null;
-	const controller = new AbortController();
-	const timeout = setTimeout(() => controller.abort(), timeoutMs);
-	try {
-		const results = {};
-		const promises = skillSlugs.map(async (skillName) => {
-			const skillId = buildSkillId(sourceType, source, skillName, skillFiles);
-			if (!skillId) return;
-			try {
-				const response = await fetch(AUDIT_URL.replace("{skill_id}", skillId.split("/").map(encodeURIComponent).join("/")), { signal: controller.signal });
-				if (response.ok) {
-					const data = await response.json();
-					if (!data.error) {
-						const auditData = data.data || data;
-						results[skillName] = {
-							risk_level: auditData.risk_level ?? "unknown",
-							risk_score: auditData.risk_score ?? null,
-							risk_signals: auditData.risk_signals ?? [],
-							audited_at: auditData.audited_at ?? null
-						};
-					}
-				}
-			} catch {}
-		});
-		await Promise.all(promises);
-		return Object.keys(results).length > 0 ? results : null;
-	} catch {
-		return null;
-	} finally {
-		clearTimeout(timeout);
-	}
-}
-const pendingTelemetry = [];
-function track(data) {
-	if (!isEnabled()) return;
-	try {
-		const params = new URLSearchParams();
-		if (cliVersion) params.set("v", cliVersion);
-		if (isCI()) params.set("ci", "1");
-		if (detectedAgentName) params.set("agent", detectedAgentName);
-		for (const [key, value] of Object.entries(data)) if (value !== void 0 && value !== null) params.set(key, String(value));
-		const p = fetch(`${TELEMETRY_URL}?${params.toString()}`).catch(() => {}).then(() => {});
-		pendingTelemetry.push(p);
-	} catch {}
-}
-async function flushTelemetry(timeoutMs = 5e3) {
-	if (pendingTelemetry.length === 0) return;
-	const timeout = new Promise((resolve) => setTimeout(resolve, timeoutMs));
-	await Promise.race([Promise.all(pendingTelemetry), timeout]);
-}
 var import_dist = require_dist();
 let cachedResult = null;
 const agentNameToType = {
@@ -3153,7 +3178,7 @@ async function tryBlobInstall(ownerRepo, options = {}) {
 		tree
 	};
 }
-var version$1 = "0.0.4";
+var version$1 = "0.0.5";
 const isCancelled$1 = (value) => typeof value === "symbol";
 function getLockSource(parsedUrl, normalizedSource) {
 	return parsedUrl.startsWith("git@") || parsedUrl.startsWith("ssh://") ? parsedUrl : normalizedSource;
@@ -3170,14 +3195,37 @@ function normalizeRepoRef(input) {
 	s = s.replace(/\/+$/, "");
 	return s;
 }
+function looksLikeLocalPath(source) {
+	const s = source.trim();
+	if (!s) return false;
+	if (isAbsolute$1(s)) return true;
+	if (s.startsWith("./") || s.startsWith("../") || s === "." || s === "..") return true;
+	if (s.startsWith("~/")) return true;
+	if (!s.includes(":") && !s.includes("/") && existsSync$1(resolve$1(process.cwd(), s))) return statSync(resolve$1(process.cwd(), s)).isDirectory();
+	return false;
+}
+function expandLocalPath(source) {
+	const s = source.trim();
+	if (s.startsWith("~/")) return join$1(homedir(), s.slice(2));
+	return resolve$1(process.cwd(), s);
+}
+function isDirectory(path) {
+	return statSync(path).isDirectory();
+}
 function looksLikeRepoSource(source) {
 	const s = source.trim();
 	if (s.startsWith("http://") || s.startsWith("https://")) return true;
 	if (s.startsWith("git@") || s.startsWith("ssh://") || s.startsWith("git://")) return true;
 	return (s.match(/\//g) || []).length <= 1 && !s.includes(":") && !/\s/.test(s);
 }
-async function resolveSkillId$1(source, skillName) {
-	if (!looksLikeRepoSource(source)) return source;
+async function resolveSkillId(source, skillName) {
+	if (isRepoLevelRef(source)) {
+		const [sourceType, ownerRepo] = source.split(":", 2);
+		const skills = await listSkillsByRepo(sourceType, ownerRepo);
+		if (skills.length === 0) throw new Error(`仓库 "${source}" 下未找到已收录的技能。`);
+		return skills.map((s) => s.skill_id);
+	}
+	if (!looksLikeRepoSource(source)) return normalizeSkillId(source);
 	if (!skillName || !skillName.trim()) throw new Error(`源 "${source}" 看起来是仓库地址，需要同时传入 --skill <skill_name> 才能定位具体技能。`);
 	const searchUrl = `${SEARCH_URL}?${new URLSearchParams({
 		q: skillName.trim(),
@@ -3203,11 +3251,15 @@ async function resolveSkillId$1(source, skillName) {
 	if (!match) throw new Error(`未找到名称匹配 "${skillName}" 的技能。`);
 	return match.skill_id;
 }
-async function downloadAndExtractSkill(skillId) {
-	const downloadUrl = DOWNLOAD_URL.replace("{skill_id}", encodeURIComponent(skillId));
+async function downloadAndExtractSkill(skillId, targetDir, version) {
+	let downloadUrl = DOWNLOAD_URL.replace("{skill_id}", skillId);
+	if (version) downloadUrl += `?version=${encodeURIComponent(version)}`;
 	const response = await fetch(downloadUrl);
-	if (!response.ok) throw new Error(`HTTP ${response.status} ${response.statusText}`);
-	const tempDir = await mkdtemp(join$1(tmpdir(), "skills-"));
+	if (!response.ok) {
+		const detail = await response.json().then((data) => typeof data?.detail === "string" && data.detail ? `: ${data.detail}` : "").catch(() => "");
+		throw new Error(`HTTP ${response.status} ${response.statusText}${detail}`);
+	}
+	const tempDir = targetDir ?? await mkdtemp(join$1(tmpdir(), "skills-"));
 	const zipPath = join$1(tempDir, ".skill.zip");
 	try {
 		await writeFile(zipPath, Buffer.from(await response.arrayBuffer()));
@@ -3365,12 +3417,28 @@ function buildCopyResultLines(results, cwd) {
 	}
 	return lines;
 }
+function withQuitOnQ(promise) {
+	const handler = (_str, key) => {
+		if (key?.name !== "q" || key.ctrl || key.meta) return;
+		process.stdin.removeListener("keypress", handler);
+		if (process.stdin.isTTY) try {
+			process.stdin.setRawMode(false);
+		} catch {}
+		process.stdout.write("\n");
+		xe("Cancelled");
+		process.exit(0);
+	};
+	process.stdin.on("keypress", handler);
+	return promise.finally(() => {
+		process.stdin.removeListener("keypress", handler);
+	});
+}
 function multiselect(opts) {
-	return fe({
+	return withQuitOnQ(fe({
 		...opts,
 		options: opts.options,
-		message: `${opts.message} ${import_picocolors.default.dim("(space to toggle)")}`
-	});
+		message: `${opts.message} ${import_picocolors.default.dim("(space to toggle, q to quit)")}`
+	}));
 }
 async function promptForAgents(message, choices) {
 	let lastSelected;
@@ -3431,6 +3499,171 @@ async function selectAgentsInteractive(options) {
 	return selected;
 }
 setVersion(version$1);
+async function installLocalSkills(source, localDir, skills, options, agentResult) {
+	const spinner = Y();
+	if (options.list) {
+		console.log();
+		M.step(import_picocolors.default.bold("Available Skills"));
+		for (const skill of skills) {
+			M.message(`  ${import_picocolors.default.cyan(getSkillDisplayName(skill))}`);
+			M.message(`    ${import_picocolors.default.dim(skill.description)}`);
+		}
+		console.log();
+		Se("Use --skill <name> to install specific skills");
+		return;
+	}
+	let selectedSkills;
+	if (options.skill?.includes("*")) {
+		selectedSkills = skills;
+		M.info(`Installing all ${skills.length} skills`);
+	} else if (options.skill && options.skill.length > 0) {
+		selectedSkills = filterSkills(skills, options.skill);
+		if (selectedSkills.length === 0) {
+			M.error(`No matching skills found for: ${options.skill.join(", ")}`);
+			M.info("Available skills:");
+			for (const s of skills) M.message(`  - ${getSkillDisplayName(s)}`);
+			process.exit(1);
+		}
+		M.info(`Selected ${selectedSkills.length} skill${selectedSkills.length !== 1 ? "s" : ""}: ${selectedSkills.map((s) => import_picocolors.default.cyan(getSkillDisplayName(s))).join(", ")}`);
+	} else if (skills.length === 1 || options.yes) {
+		selectedSkills = skills;
+		if (skills.length === 1) {
+			M.info(`Skill: ${import_picocolors.default.cyan(getSkillDisplayName(skills[0]))}`);
+			M.message(import_picocolors.default.dim(skills[0].description));
+		} else M.info(`Installing all ${skills.length} skills`);
+	} else {
+		const selected = await multiselect({
+			message: "Select skills to install",
+			options: [...skills].sort((a, b) => getSkillDisplayName(a).localeCompare(getSkillDisplayName(b))).map((s) => ({
+				value: s,
+				label: getSkillDisplayName(s),
+				hint: s.description.length > 60 ? s.description.slice(0, 57) + "..." : s.description
+			})),
+			required: true
+		});
+		if (pD(selected)) {
+			xe("Installation cancelled");
+			process.exit(0);
+		}
+		selectedSkills = selected;
+	}
+	let targetAgents;
+	const validAgents = Object.keys(agents);
+	if (options.agent?.includes("*")) {
+		targetAgents = validAgents;
+		M.info(`Installing to all ${targetAgents.length} agents`);
+	} else if (options.agent && options.agent.length > 0) {
+		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
+		if (invalidAgents.length > 0) {
+			M.error(`Invalid agents: ${invalidAgents.join(", ")}`);
+			M.info(`Valid agents: ${validAgents.join(", ")}`);
+			process.exit(1);
+		}
+		targetAgents = options.agent;
+	} else {
+		spinner.start("Loading agents...");
+		const installedAgents = await detectInstalledAgents();
+		const totalAgents = Object.keys(agents).length;
+		spinner.stop(`${totalAgents} agents`);
+		if (installedAgents.length === 0) if (options.yes) {
+			targetAgents = validAgents;
+			M.info("Installing to all agents");
+		} else {
+			M.info("Select agents to install skills to");
+			const selected = await promptForAgents("Which agents do you want to install to?", Object.entries(agents).filter(([key]) => key !== "eve").map(([key, config]) => ({
+				value: key,
+				label: config.displayName
+			})));
+			if (pD(selected)) {
+				xe("Installation cancelled");
+				process.exit(0);
+			}
+			targetAgents = selected;
+		}
+		else {
+			targetAgents = ensureUniversalAgents(installedAgents);
+			M.info(`Installing to: ${installedAgents.map((a) => import_picocolors.default.cyan(agents[a].displayName)).join(", ")}`);
+		}
+	}
+	const installTargets = buildInstallTargets(targetAgents, [void 0]);
+	let installGlobally = options.global ?? false;
+	if (options.global === void 0 && !options.yes) {
+		const scope = await ve({
+			message: "Installation scope",
+			options: [{
+				value: false,
+				label: "Project",
+				hint: "Install in current directory (committed with your project)"
+			}, {
+				value: true,
+				label: "Global",
+				hint: "Install in home directory (available across all projects)"
+			}]
+		});
+		if (pD(scope)) {
+			xe("Installation cancelled");
+			process.exit(0);
+		}
+		installGlobally = scope;
+	}
+	if (!options.yes) {
+		const confirmed = await ye({
+			message: "Proceed with installation?",
+			initialValue: true
+		});
+		if (pD(confirmed) || !confirmed) {
+			xe("Installation cancelled");
+			process.exit(0);
+		}
+	}
+	spinner.start("Installing skills...");
+	const results = [];
+	for (const skill of selectedSkills) for (const target of installTargets) {
+		const result = await installSkillForAgent(skill, target.agent, {
+			global: installGlobally,
+			mode: "copy",
+			eveSubagent: target.subagent
+		});
+		results.push({
+			skill: getSkillDisplayName(skill),
+			agent: targetDisplayName(target),
+			...result
+		});
+	}
+	spinner.stop("Installation complete");
+	console.log();
+	const successful = results.filter((r) => r.success);
+	const failed = results.filter((r) => !r.success);
+	if (successful.length > 0) {
+		const bySkill = /* @__PURE__ */ new Map();
+		for (const r of successful) {
+			if (!bySkill.has(r.skill)) bySkill.set(r.skill, []);
+			bySkill.get(r.skill).push(r);
+		}
+		const resultLines = [];
+		for (const [skillName, skillResults] of bySkill) {
+			resultLines.push(`${import_picocolors.default.green("✓")} ${skillName} ${import_picocolors.default.dim("(copied)")}`);
+			resultLines.push(...buildCopyResultLines(skillResults, process.cwd()));
+		}
+		Me(resultLines.join("\n"), import_picocolors.default.green(`Installed ${bySkill.size} skill${bySkill.size !== 1 ? "s" : ""}`));
+	}
+	if (failed.length > 0) {
+		console.log();
+		M.error(import_picocolors.default.red(`Failed to install ${failed.length}`));
+		for (const r of failed) M.message(`  ${import_picocolors.default.red("✗")} ${r.skill} → ${r.agent}: ${import_picocolors.default.dim(r.error)}`);
+	}
+	console.log();
+	Se(import_picocolors.default.green("Done!") + import_picocolors.default.dim("  Review skills before use; they run with full agent permissions."));
+	if (successful.length > 0 && !installGlobally) for (const skill of selectedSkills) try {
+		const computedHash = await computeSkillFolderHash(skill.path);
+		await addSkillToLocalLock(skill.name, {
+			source,
+			sourceType: "local",
+			computedHash
+		}, process.cwd());
+	} catch {}
+	await promptForFindSkills(options, targetAgents);
+}
 async function runAdd(args, options = {}) {
 	const source = args[0];
 	let installTipShown = false;
@@ -3469,42 +3702,124 @@ async function runAdd(args, options = {}) {
 	if (agentResult.isAgent) M.info(import_picocolors.default.bgCyan(import_picocolors.default.black(import_picocolors.default.bold(` ${agentResult.agent.name} `))) + " Agent detected — installing non-interactively");
 	else if (!process.stdin.isTTY) showInstallTip();
 	let tempDir = null;
+	if (source.split("/")[0]?.toLowerCase() === "openclaw" && !options.dangerouslyAcceptOpenclawRisks) {
+		console.log();
+		M.warn(import_picocolors.default.yellow(import_picocolors.default.bold("⚠ OpenClaw skills are unverified community submissions.")));
+		M.message(import_picocolors.default.yellow("This source contains user-submitted skills that have not been reviewed for safety or quality."));
+		M.message(import_picocolors.default.yellow("Skills run with full agent permissions and could be malicious."));
+		console.log();
+		M.message(`If you understand the risks, re-run with:\n\n  ${import_picocolors.default.cyan(`npx wittyhub add ${source} --dangerously-accept-openclaw-risks`)}\n`);
+		Se(import_picocolors.default.red("Installation blocked"));
+		process.exit(1);
+	}
 	try {
 		const spinner = Y();
+		if (looksLikeLocalPath(source)) {
+			const expanded = expandLocalPath(source);
+			if (!existsSync$1(expanded)) {
+				Se(import_picocolors.default.red(`Local path does not exist: ${expanded}`));
+				process.exit(1);
+			}
+			if (!isDirectory(expanded)) {
+				Se(import_picocolors.default.red(`Local path is not a directory: ${expanded}`));
+				process.exit(1);
+			}
+			const includeInternal = !!(options.skill && options.skill.length > 0);
+			spinner.start("Discovering skills...");
+			let skills;
+			try {
+				skills = await discoverSkills(expanded, void 0, {
+					includeInternal,
+					fullDepth: options.fullDepth
+				});
+			} finally {
+				spinner.stop("Discovery complete");
+			}
+			if (skills.length === 0) {
+				M.error(import_picocolors.default.red("No skills found"));
+				Se(import_picocolors.default.red("No valid skills found. Skills require a SKILL.md with name and description."));
+				process.exit(1);
+			}
+			await installLocalSkills(source, expanded, skills, options, agentResult);
+			return;
+		}
 		const skillNameForLookup = options.skill?.[0];
-		let skillId;
-		try {
-			skillId = await resolveSkillId$1(source, skillNameForLookup);
+		let skillIds;
+		const repoRef = isRepoLevelRef(source) ? source : repoUrlToRef(source);
+		const repoLevel = repoRef !== null;
+		if (repoLevel) {
+			const [sourceType, ownerRepo] = repoRef.split(":", 2);
+			spinner.start("查询仓库下的技能...");
+			let repoSkills;
+			try {
+				repoSkills = await listSkillsByRepo(sourceType, ownerRepo);
+			} finally {
+				spinner.stop("查询完成");
+			}
+			if (repoSkills.length === 0) {
+				Se(import_picocolors.default.red(`仓库 "${source}" 下未找到已收录的技能。`));
+				process.exit(1);
+			}
+			if (options.list) {
+				console.log();
+				M.step(import_picocolors.default.bold("Available Skills"));
+				const sorted = [...repoSkills].sort((a, b) => a.name.localeCompare(b.name));
+				for (const skill of sorted) {
+					M.message(`  ${import_picocolors.default.cyan(skill.name)}`);
+					if (skill.description) M.message(`    ${import_picocolors.default.dim(skill.description)}`);
+				}
+				console.log();
+				Se("Use --skill <name> to install specific skills");
+				process.exit(0);
+			}
+			if (options.skill && !options.skill.includes("*")) {
+				const matched = repoSkills.filter((s) => options.skill.some((name) => s.name === name || s.skill_id.endsWith("/" + name)));
+				if (matched.length === 0) {
+					Se(import_picocolors.default.red(`未找到匹配 --skill 的技能: ${options.skill.join(", ")}`));
+					process.exit(1);
+				}
+				skillIds = matched.map((s) => s.skill_id);
+			} else if (options.skill?.includes("*") || options.all || options.yes) skillIds = repoSkills.map((s) => s.skill_id);
+			else {
+				const selected = await multiselect({
+					message: "Select skills to install",
+					options: [...repoSkills].sort((a, b) => a.name.localeCompare(b.name)).map((s) => ({
+						value: s.skill_id,
+						label: s.name,
+						hint: s.description && s.description.length > 60 ? s.description.slice(0, 57) + "..." : s.description ?? ""
+					})),
+					required: true
+				});
+				if (pD(selected)) {
+					xe("Installation cancelled");
+					process.exit(0);
+				}
+				skillIds = selected;
+			}
+		} else try {
+			const result = await resolveSkillId(source, skillNameForLookup);
+			skillIds = Array.isArray(result) ? result : [result];
 		} catch (e) {
 			const message = e instanceof Error ? e.message : String(e);
 			Se(import_picocolors.default.red(message));
 			process.exit(1);
 		}
-		spinner.start(`Downloading skill ${import_picocolors.default.cyan(skillId)} from API...`);
+		spinner.start(`Downloading ${skillIds.length > 1 ? `${skillIds.length} skills` : `skill ${import_picocolors.default.cyan(skillIds[0])}`} from API...`);
 		try {
-			tempDir = await downloadAndExtractSkill(skillId);
+			tempDir = await mkdtemp(join$1(tmpdir(), "skills-"));
+			for (const id of skillIds) await downloadAndExtractSkill(id, tempDir, options.version);
 		} catch (e) {
 			spinner.stop(import_picocolors.default.red("Download failed"));
 			const message = e instanceof Error ? e.message : String(e);
-			Se(import_picocolors.default.red(`Failed to download skill "${skillId}": ${message}`));
+			Se(import_picocolors.default.red(`Failed to download skill: ${message}`));
 			process.exit(1);
 		}
 		spinner.stop(`Skill archive downloaded from ${import_picocolors.default.cyan("API")}`);
 		const parsed = {
 			type: "git",
-			url: skillId
+			url: skillIds[0]
 		};
 		const repoPrivacyPromise = Promise.resolve(null);
-		if (source.split("/")[0]?.toLowerCase() === "openclaw" && !options.dangerouslyAcceptOpenclawRisks) {
-			console.log();
-			M.warn(import_picocolors.default.yellow(import_picocolors.default.bold("⚠ OpenClaw skills are unverified community submissions.")));
-			M.message(import_picocolors.default.yellow("This source contains user-submitted skills that have not been reviewed for safety or quality."));
-			M.message(import_picocolors.default.yellow("Skills run with full agent permissions and could be malicious."));
-			console.log();
-			M.message(`If you understand the risks, re-run with:\n\n  ${import_picocolors.default.cyan(`npx wittyhub add ${source} --dangerously-accept-openclaw-risks`)}\n`);
-			Se(import_picocolors.default.red("Installation blocked"));
-			process.exit(1);
-		}
 		const includeInternal = !!(options.skill && options.skill.length > 0);
 		let skills;
 		let blobResult = null;
@@ -3553,7 +3868,13 @@ async function runAdd(args, options = {}) {
 			process.exit(0);
 		}
 		let selectedSkills;
-		if (options.skill?.includes("*")) {
+		if (repoLevel) {
+			selectedSkills = skills;
+			if (skills.length === 1) {
+				M.info(`Skill: ${import_picocolors.default.cyan(getSkillDisplayName(skills[0]))}`);
+				M.message(import_picocolors.default.dim(skills[0].description));
+			} else M.info(`Installing ${skills.length} skills`);
+		} else if (options.skill?.includes("*")) {
 			selectedSkills = skills;
 			M.info(`Installing all ${skills.length} skills`);
 		} else if (options.skill && options.skill.length > 0) {
@@ -3616,9 +3937,10 @@ async function runAdd(args, options = {}) {
 			}
 			selectedSkills = selected;
 		}
-		const ownerRepoForAudit = getOwnerRepo(parsed);
-		const auditSkillFiles = buildSkillFiles(selectedSkills, tempDir, blobResult);
-		const auditPromise = ownerRepoForAudit ? fetchAuditData(ownerRepoForAudit, selectedSkills.map((s) => s.name), parsed.type, auditSkillFiles) : Promise.resolve(null);
+		const auditPromise = skillIds.length === 1 ? fetchAuditBySkillId(skillIds[0]) : Promise.all(skillIds.map((id) => fetchAuditBySkillId(id))).then((results) => results.reduce((acc, r) => ({
+			...acc,
+			...r
+		}), {}));
 		let targetAgents;
 		const validAgents = Object.keys(agents);
 		if (options.agent?.includes("*")) {
@@ -3826,7 +4148,7 @@ async function runAdd(args, options = {}) {
 		let auditData = null;
 		try {
 			auditData = await auditPromise;
-			if (auditData && ownerRepoForAudit) {
+			if (auditData) {
 				const securityLines = buildSecurityLines(auditData, auditSkills);
 				if (securityLines.length > 0) Me(securityLines.join("\n"), "Security Risk Assessments");
 			}
@@ -4127,139 +4449,26 @@ function parseAddOptions(args) {
 			}
 			i--;
 		} else if (arg === "--dangerously-accept-openclaw-risks") options.dangerouslyAcceptOpenclawRisks = true;
-		else if (arg && !arg.startsWith("-")) source.push(arg);
+		else if (arg === "-v" || arg === "--version") {
+			i++;
+			options.version = args[i];
+		} else if (arg && !arg.startsWith("-")) source.push(arg);
 	}
 	return {
 		source,
 		options
 	};
 }
-const SOURCE_TYPE_PREFIXES = [
-	"github",
-	"gitcode",
-	"gitlab",
-	"gitee"
-];
-function normalizeSkillId(input) {
-	const trimmed = input.trim();
-	const first = trimmed.split("/")[0];
-	if (first && SOURCE_TYPE_PREFIXES.includes(first.toLowerCase())) return trimmed;
-	return `github/${trimmed}`;
-}
-function buildSkillIdFromSource(source, skillName) {
-	const parsed = parseSource(source);
-	if (!SOURCE_TYPE_PREFIXES.includes(parsed.type)) return null;
-	const ownerRepo = getOwnerRepo(parsed);
-	if (!ownerRepo) return null;
-	const slugifiedOwnerRepo = ownerRepo.split("/").map(slugifyTelemetryValue).join("/");
-	const skillPath = slugifyTelemetryValue(skillName);
-	if (!skillPath) return null;
-	return `${parsed.type}/${slugifiedOwnerRepo}/${skillPath}`;
-}
-async function listSkillsByRepo(source) {
-	const parsed = parseSource(source);
-	if (!SOURCE_TYPE_PREFIXES.includes(parsed.type)) return [];
-	const ownerRepo = getOwnerRepo(parsed);
-	if (!ownerRepo) return [];
-	const slugifiedOwnerRepo = ownerRepo.split("/").map(slugifyTelemetryValue).join("/");
-	if (!slugifiedOwnerRepo || slugifiedOwnerRepo.split("/").length < 2) return [];
-	const url = `${LIST_URL}?${new URLSearchParams({
-		source_type: parsed.type,
-		repo: slugifiedOwnerRepo,
-		limit: "100"
-	}).toString()}`;
-	try {
-		const res = await fetch(url);
-		if (!res.ok) return [];
-		const raw = await res.json();
-		return ((raw.data || raw).skills ?? []).filter((skill) => skill && typeof skill.skill_id === "string" && skill.skill_id).map((skill) => ({
-			skill_id: skill.skill_id,
-			name: skill.name ?? "",
-			source_url: skill.source_url ?? ""
-		}));
-	} catch {
-		return [];
-	}
-}
-async function resolveBySearch(source, skillName) {
-	let results = [];
-	try {
-		const params = new URLSearchParams({
-			q: skillName,
-			limit: "10",
-			mode: "text"
-		});
-		const res = await fetch(`${SEARCH_URL}?${params.toString()}`);
-		if (res.ok) {
-			const raw = await res.json();
-			results = (raw.data || raw).results ?? [];
-		}
-	} catch {
-		return null;
-	}
-	const sourceLower = source.trim().toLowerCase();
-	const matches = results.filter((skill) => {
-		const url = (skill.source_url || "").toLowerCase();
-		if (!url) return false;
-		if (url.startsWith(sourceLower)) return true;
-		if (!sourceLower.includes("://") && sourceLower.split("/").length === 2) return url.includes(`/${sourceLower}/`);
-		return false;
-	});
-	const exact = matches.find((skill) => skill.name.toLowerCase() === skillName.trim().toLowerCase());
-	return exact ? exact.skill_id : matches.length > 0 ? matches[0].skill_id : null;
-}
-async function resolveSkillIdBySourceAndName(source, skillName) {
-	const repoSkills = await listSkillsByRepo(source);
-	if (repoSkills.length > 0) {
-		const nameLower = skillName.trim().toLowerCase();
-		const exact = repoSkills.find((skill) => skill.name.toLowerCase() === nameLower);
-		if (exact) return exact.skill_id;
-		const slug = slugifyTelemetryValue(skillName);
-		if (slug) {
-			const bySlug = repoSkills.find((skill) => {
-				return (skill.skill_id.split("/").pop() ?? "").toLowerCase() === slug;
-			});
-			if (bySlug) return bySlug.skill_id;
-		}
-		return null;
-	}
-	return resolveBySearch(source, skillName);
-}
-async function resolveSkillId(source, skillName) {
-	if (!skillName) return {
-		skillId: normalizeSkillId(source),
-		derived: false
-	};
-	const resolved = await resolveSkillIdBySourceAndName(source, skillName);
-	if (resolved) return {
-		skillId: resolved,
-		derived: false
-	};
-	const derived = buildSkillIdFromSource(source, skillName);
-	if (derived) return {
-		skillId: derived,
-		derived: true
-	};
-	return {
-		skillId: null,
-		derived: false
-	};
-}
 function parseAuditOptions(args) {
-	let source = "";
-	let skill = "";
 	const errors = [];
-	for (let i = 0; i < args.length; i++) {
-		const arg = args[i];
-		if (arg === "-s" || arg === "--skill") {
-			i++;
-			skill = args[i]?.trim() ?? "";
-		} else if (arg && !arg.startsWith("-")) source = arg.trim();
+	let skillId = "";
+	for (const arg of args) if (arg && !arg.startsWith("-")) {
+		skillId = arg.trim();
+		break;
 	}
-	if (!source) errors.push("Missing source or skill id");
+	if (!skillId) errors.push("Missing skill id");
 	return {
-		source,
-		skill,
+		skillId: normalizeSkillId(skillId),
 		errors
 	};
 }
@@ -4267,7 +4476,7 @@ async function fetchSkillAudit(skillId, timeoutMs = 15e3) {
 	const controller = new AbortController();
 	const timeout = setTimeout(() => controller.abort(), timeoutMs);
 	try {
-		const url = AUDIT_URL.replace("{skill_id}", skillId.split("/").map(encodeURIComponent).join("/"));
+		const url = AUDIT_URL.replace("{skill_id}", skillId);
 		let response;
 		try {
 			response = await fetch(url, { signal: controller.signal });
@@ -4361,20 +4570,12 @@ function buildAuditOutput(skillId, data) {
 	return lines;
 }
 async function runAudit(args) {
-	const { source, skill, errors } = parseAuditOptions(args);
+	const { skillId, errors } = parseAuditOptions(args);
 	if (errors.length > 0) {
 		for (const error of errors) console.error(import_picocolors.default.red(error));
-		console.error("Usage: wittyhub audit <source> --skill <skill>");
-		console.error("       wittyhub audit <skill_id>");
+		console.error("Usage: wittyhub audit <skill_id>");
 		return;
 	}
-	const { skillId, derived } = await resolveSkillId(source, skill || void 0);
-	if (!skillId) {
-		console.error(import_picocolors.default.red(`Unable to resolve skill id from source: ${source}`));
-		console.error("Usage: wittyhub audit <source> --skill <skill>");
-		return;
-	}
-	if (derived) console.error(import_picocolors.default.yellow(`Could not locate skill in repo; trying derived id: ${skillId}`));
 	const result = await fetchSkillAudit(skillId);
 	track({
 		event: "audit",
@@ -4406,18 +4607,21 @@ const YELLOW$1 = "\x1B[33m";
 const RED = "\x1B[31m";
 const GREEN = "\x1B[32m";
 function formatInstalls$1(count) {
-	if (count === void 0 || count === null || Number.isNaN(count)) return "";
-	if (count <= 0) return "0 installs";
-	if (count >= 1e6) return `${(count / 1e6).toFixed(1).replace(/\.0$/, "")}M installs`;
-	if (count >= 1e3) return `${(count / 1e3).toFixed(1).replace(/\.0$/, "")}K installs`;
-	return `${count} install${count === 1 ? "" : "s"}`;
+	if (count === void 0 || count === null || Number.isNaN(count)) return "0";
+	if (count >= 1e6) return `${(count / 1e6).toFixed(1).replace(/\.0$/, "")}M`;
+	if (count >= 1e3) return `${(count / 1e3).toFixed(1).replace(/\.0$/, "")}K`;
+	return String(count);
 }
 function formatRiskLevel$1(riskScore) {
 	if (riskScore === void 0 || riskScore === null) return "";
-	if (riskScore <= 20) return `${GREEN}safe risk${RESET$3}`;
-	if (riskScore <= 50) return `${GREEN}low risk${RESET$3}`;
-	if (riskScore <= 80) return `${YELLOW$1}medium risk${RESET$3}`;
-	return `${RED}high risk${RESET$3}`;
+	if (riskScore <= 20) return `${GREEN}safe${RESET$3}`;
+	if (riskScore <= 50) return `${GREEN}low${RESET$3}`;
+	if (riskScore <= 80) return `${YELLOW$1}medium${RESET$3}`;
+	return `${RED}high${RESET$3}`;
+}
+const KV_KEY_WIDTH = 12;
+function kvKey(key) {
+	return `${DIM$3}${key.padEnd(KV_KEY_WIDTH)}${RESET$3}`;
 }
 function escapeRegExp(s) {
 	return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -4545,27 +4749,22 @@ async function runSearchPrompt(initialQuery = "", owner) {
 		else if (results.length === 0 && searchError) lines.push(`${RED}${searchError}${RESET$3}`);
 		else if (results.length === 0) lines.push(`${DIM$3}No skills found${RESET$3}`);
 		else {
-			const visible = results.slice(0, 8);
+			const visible = results.slice(0, 6);
 			for (let i = 0; i < visible.length; i++) {
 				const skill = visible[i];
 				const isSelected = i === selectedIndex;
 				const arrow = isSelected ? `${BOLD$3}>${RESET$3}` : " ";
 				const hlName = highlightMatches(skill.name, query);
 				const name = isSelected ? `${BOLD$3}${hlName}${RESET$3}` : `${TEXT$2}${hlName}${RESET$3}`;
-				const source = skill.source ? ` ${DIM$3}${skill.source}${RESET$3}` : "";
-				const installs = formatInstalls$1(skill.installs);
-				const installsBadge = installs ? ` ${CYAN$1}${installs}${RESET$3}` : "";
 				const risk = formatRiskLevel$1(skill.riskScore);
-				const riskBadge = risk ? ` ${risk}` : "";
 				const loadingIndicator = loading && i === 0 ? ` ${DIM$3}...${RESET$3}` : "";
-				lines.push(`  ${arrow} ${name}${source}${loadingIndicator}`);
-				if (installsBadge || riskBadge) {
-					const meta = [installsBadge.trimStart(), riskBadge.trimStart()].filter(Boolean).join(" ");
-					lines.push(`    ${meta}`);
-				}
+				lines.push(`  ${arrow} ${kvKey("skill_name:")} ${name}${loadingIndicator}`);
+				lines.push(`    ${kvKey("skill_id:")} ${CYAN$1}${skill.slug}${RESET$3}`);
+				lines.push(`    ${kvKey("installs:")} ${CYAN$1}${formatInstalls$1(skill.installs)}${RESET$3}`);
+				if (risk) lines.push(`    ${kvKey("risk:")} ${risk}`);
 				if (skill.description) {
 					const descPlain = skill.description.length > 80 ? `${skill.description.slice(0, 77)}...` : skill.description;
-					lines.push(`    ${DIM$3}${highlightMatches(descPlain, query)}${RESET$3}`);
+					lines.push(`    ${kvKey("description:")} ${DIM$3}${highlightMatches(descPlain, query)}${RESET$3}`);
 				}
 			}
 		}
@@ -4655,44 +4854,16 @@ async function runSearchPrompt(initialQuery = "", owner) {
 		process.stdin.on("keypress", handleKeypress);
 	});
 }
-function getOwnerRepoFromString(pkg) {
-	const atIndex = pkg.lastIndexOf("@");
-	const repoPath = atIndex > 0 ? pkg.slice(0, atIndex) : pkg;
-	const urlMatch = repoPath.match(/^https?:\/\/[^/]+\/([^/]+)\/([^/]+?)(?:\.git)?\/?$/);
-	if (urlMatch) return {
-		owner: urlMatch[1],
-		repo: urlMatch[2]
-	};
-	const blobMatch = repoPath.match(/^https?:\/\/[^/]+\/([^/]+)\/([^/]+?)\/blob\//);
-	if (blobMatch) return {
-		owner: blobMatch[1],
-		repo: blobMatch[2]
-	};
-	const shorthandMatch = repoPath.match(/^([^/]+)\/([^/]+)$/);
-	if (shorthandMatch) return {
-		owner: shorthandMatch[1],
-		repo: shorthandMatch[2]
-	};
-	const slugMatch = repoPath.match(/^[^/]+\/([^/]+)\/([^/]+)/);
-	if (slugMatch) return {
-		owner: slugMatch[1],
-		repo: slugMatch[2]
-	};
-	return null;
-}
-async function isRepoPublic(owner, repo) {
-	return await isRepoPrivate(owner, repo) === false;
-}
 async function runFind(args) {
 	const { query, options: findOptions, errors } = parseFindOptions(args);
 	const owner = findOptions.owner;
 	const isNonInteractive = !process.stdin.isTTY;
 	const agentTip = `${DIM$3}Tip: if running in a coding agent, follow these steps:${RESET$3}
 ${DIM$3}  1) npx wittyhub find [query] [--owner <owner>]${RESET$3}
-${DIM$3}  2) npx wittyhub add <owner/repo@skill>${RESET$3}`;
+${DIM$3}  2) npx wittyhub add <skill_id>${RESET$3}`;
 	if (errors.length > 0) {
 		for (const error of errors) console.error(error);
-		console.error("Usage: npx skills find <query> [--owner <owner>]");
+		console.error("Usage: npx wittyhub find <query> [--owner <owner>]");
 		return;
 	}
 	if (query) {
@@ -4711,26 +4882,19 @@ ${DIM$3}  2) npx wittyhub add <owner/repo@skill>${RESET$3}`;
 			console.log(`${DIM$3}No skills found for "${query}"${ownerSuffix}${RESET$3}`);
 			return;
 		}
-		console.log(`${DIM$3}Install with${RESET$3} npx wittyhub add <repo-url> --skill <skill>`);
+		console.log(`${DIM$3}Install with${RESET$3} npx wittyhub add ${TEXT$2}<skill_id>${RESET$3}`);
 		console.log();
 		for (const skill of results.slice(0, 6)) {
-			const raw = skill.sourceUrl || skill.source || skill.slug;
 			const hlName = highlightMatches(skill.name, query);
-			const installTarget = skill.sourceUrl ? `${skill.sourceUrl} --skill ${hlName}` : `${raw}@${hlName}`;
-			const installs = formatInstalls$1(skill.installs);
-			const installsBadge = installs ? ` ${CYAN$1}${installs}${RESET$3}` : "";
 			const risk = formatRiskLevel$1(skill.riskScore);
-			const riskBadge = risk ? ` ${risk}` : "";
-			console.log(`${TEXT$2}${installTarget}${RESET$3}`);
-			if (installsBadge || riskBadge) {
-				const meta = [installsBadge.trimStart(), riskBadge.trimStart()].filter(Boolean).join(" ");
-				console.log(`  ${meta}`);
-			}
+			console.log(`${BOLD$3}●${RESET$3} ${kvKey("skill_name:")} ${BOLD$3}${hlName}${RESET$3}`);
+			console.log(`  ${kvKey("skill_id:")} ${CYAN$1}${skill.slug}${RESET$3}`);
+			console.log(`  ${kvKey("installs:")} ${CYAN$1}${formatInstalls$1(skill.installs)}${RESET$3}`);
+			if (risk) console.log(`  ${kvKey("risk:")} ${risk}`);
 			if (skill.description) {
 				const descPlain = skill.description.length > 100 ? `${skill.description.slice(0, 97)}...` : skill.description;
-				console.log(`${DIM$3}  ${highlightMatches(descPlain, query)}${RESET$3}`);
+				console.log(`  ${kvKey("description:")} ${DIM$3}${highlightMatches(descPlain, query)}${RESET$3}`);
 			}
-			console.log(`${DIM$3}└ ${skill.sourceUrl || `https://skills.sh/${skill.slug}`}${RESET$3}`);
 			console.log();
 		}
 		return;
@@ -4753,38 +4917,27 @@ ${DIM$3}  2) npx wittyhub add <owner/repo@skill>${RESET$3}`;
 		console.log();
 		return;
 	}
-	const pkg = selected.sourceUrl || selected.source || selected.slug;
+	const skillId = selected.slug;
 	const skillName = selected.name;
 	console.log();
-	console.log(`${TEXT$2}Installing ${BOLD$3}${skillName}${RESET$3} from ${DIM$3}${pkg}${RESET$3}...`);
+	console.log(`${TEXT$2}Installing ${BOLD$3}${skillName}${RESET$3} ${DIM$3}(${skillId})${RESET$3}...`);
 	console.log();
-	const { source, options: addOptions } = parseAddOptions([
-		pkg,
-		"--skill",
-		skillName
-	]);
+	const { source, options: addOptions } = parseAddOptions([skillId]);
 	await runAdd(source, addOptions);
 	console.log();
-	const info = getOwnerRepoFromString(pkg);
-	if (info && await isRepoPublic(info.owner, info.repo)) console.log(`${DIM$3}View the skill at${RESET$3} ${TEXT$2}https://skills.sh/${selected.slug}${RESET$3}`);
-	else console.log(`${DIM$3}Discover more skills at${RESET$3} ${TEXT$2}https://skills.sh${RESET$3}`);
+	console.log(`${DIM$3}View the skill at${RESET$3} ${TEXT$2}https://skillhub.openeuler.org/skills/${selected.slug}${RESET$3}`);
 	console.log();
 }
 function parseGetOptions(args) {
-	let source = "";
-	let skill = "";
 	const errors = [];
-	for (let i = 0; i < args.length; i++) {
-		const arg = args[i];
-		if (arg === "-s" || arg === "--skill") {
-			i++;
-			skill = args[i]?.trim() ?? "";
-		} else if (arg && !arg.startsWith("-")) source = arg.trim();
+	let skillId = "";
+	for (const arg of args) if (arg && !arg.startsWith("-")) {
+		skillId = arg.trim();
+		break;
 	}
-	if (!source) errors.push("Missing source or skill id");
+	if (!skillId) errors.push("Missing skill id");
 	return {
-		source,
-		skill,
+		skillId: normalizeSkillId(skillId),
 		errors
 	};
 }
@@ -4792,7 +4945,7 @@ async function fetchSkillDetail(skillId, timeoutMs = 15e3) {
 	const controller = new AbortController();
 	const timeout = setTimeout(() => controller.abort(), timeoutMs);
 	try {
-		const url = GET_URL.replace("{skill_id}", skillId.split("/").map(encodeURIComponent).join("/"));
+		const url = GET_URL.replace("{skill_id}", skillId);
 		let response;
 		try {
 			response = await fetch(url, { signal: controller.signal });
@@ -4885,20 +5038,12 @@ function buildGetOutput(data) {
 	return lines;
 }
 async function runGet(args) {
-	const { source, skill, errors } = parseGetOptions(args);
+	const { skillId, errors } = parseGetOptions(args);
 	if (errors.length > 0) {
 		for (const error of errors) console.error(import_picocolors.default.red(error));
-		console.error("Usage: wittyhub get <source> --skill <skill>");
-		console.error("       wittyhub get <skill_id>");
+		console.error("Usage: wittyhub get <skill_id>");
 		return;
 	}
-	const { skillId, derived } = await resolveSkillId(source, skill || void 0);
-	if (!skillId) {
-		console.error(import_picocolors.default.red(`Unable to resolve skill id from source: ${source}`));
-		console.error("Usage: wittyhub get <source> --skill <skill>");
-		return;
-	}
-	if (derived) console.error(import_picocolors.default.yellow(`Could not locate skill in repo; trying derived id: ${skillId}`));
 	const result = await fetchSkillDetail(skillId);
 	track({
 		event: "get",
@@ -5405,6 +5550,26 @@ async function runList(args) {
 		console.log();
 	}
 }
+function extractSkillName(input) {
+	try {
+		const parsed = parseSource(input);
+		if (parsed.subpath) {
+			const segments = parsed.subpath.split("/");
+			const last = segments[segments.length - 1];
+			if (last) return last;
+		}
+		if (parsed.type !== "local" && parsed.url) {
+			const match = parsed.url.match(/\/([^/]+)\.git$/);
+			if (match?.[1]) return match[1];
+		}
+	} catch {}
+	if (input.includes("/")) {
+		const segments = input.replace(/\.git$/, "").split("/");
+		const last = segments[segments.length - 1];
+		if (last) return last;
+	}
+	return input;
+}
 async function removeCommand(skillNames, options) {
 	const agentResult = await detectAgent();
 	if (agentResult.isAgent) {
@@ -5450,7 +5615,10 @@ async function removeCommand(skillNames, options) {
 	let selectedSkills = [];
 	if (options.all) selectedSkills = installedSkills;
 	else if (skillNames.length > 0) {
-		selectedSkills = installedSkills.filter((s) => skillNames.some((name) => name.toLowerCase() === s.toLowerCase()));
+		selectedSkills = installedSkills.filter((s) => skillNames.some((name) => {
+			if (name.toLowerCase() === s.toLowerCase()) return true;
+			return extractSkillName(name).toLowerCase() === s.toLowerCase();
+		}));
 		if (selectedSkills.length === 0) {
 			M.error(`No matching skills found for: ${skillNames.join(", ")}`);
 			return;
@@ -6822,7 +6990,7 @@ function showBanner() {
 	console.log(`  ${DIM}$${RESET} ${TEXT}npx wittyhub validate ${DIM}<path>${RESET}   ${DIM}Validate a local skill${RESET}`);
 	console.log(`  ${DIM}$${RESET} ${TEXT}npx wittyhub experimental_sync${RESET}    ${DIM}Sync skills from node_modules${RESET}`);
 	console.log();
-	console.log(`${DIM}try:${RESET} npx wittyhub add vercel-labs/agent-skills`);
+	console.log(`${DIM}try:${RESET} npx wittyhub add gitcode:openeuler/witty-diagnosis-agent`);
 	console.log();
 	console.log(`Discover more skills at ${TEXT}https://skillhub.openeuler.org/${RESET}`);
 	console.log();
@@ -6840,12 +7008,8 @@ ${BOLD}Manage Skills:${RESET}
   remove [skills]      Remove installed skills
   list, ls             List installed skills
   find [query]         Search for skills interactively
-  audit <source> --skill <skill>
-                       Show security audit result (risk level + risk signals)
-                       e.g. audit https://github.com/huggingface/transformers --skill add-or-fix-type-checking
-  get <source> --skill <skill>
-                       View skill details (author/category/version/description/tags)
-                       e.g. get https://github.com/huggingface/transformers --skill add-or-fix-type-checking
+  audit <skill_id>       Show security audit result (risk level + risk signals)
+  get <skill_id>         View skill details (author/category/version/description/tags)
   validate <path>     Validate a local skill for spec compliance (SKILL.md filename,
                        frontmatter, required fields name/description, etc.)
 
@@ -6875,6 +7039,7 @@ ${BOLD}Add Options:${RESET}
   --subagent <names>     Install to Eve subagents (use 'root' for the root agent)
   --all                  Shorthand for --skill '*' --agent '*' -y
   --full-depth           Search all subdirectories even when a root SKILL.md exists
+  -v, --version <ver>    Download a specific skill version from skill_versions table
 
 ${BOLD}Use Options:${RESET}
   -s, --skill <skill>    Specify the skill to use