@safeskill/cli 0.1.8 → 0.2.0

package/dist/cli.mjs

@@ -12,6 +12,22 @@ import { access, cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, realpat
 import { gunzipSync } from "zlib";
 import { createHash } from "crypto";
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
+const packageJsonPath = join(dirname(fileURLToPath(import.meta.url)), "..", "package.json");
+let version$2;
+try {
+	version$2 = JSON.parse(readFileSync(packageJsonPath, "utf-8")).version || "0.0.0";
+} catch {
+	version$2 = "0.0.0";
+}
+function getUserAgent() {
+	return `safeskill-cli/${version$2}`;
+}
+function getHeaders(additionalHeaders = {}) {
+	return {
+		"User-Agent": getUserAgent(),
+		...additionalHeaders
+	};
+}
 function getOwnerRepo(parsed) {
 	if (parsed.type === "local") return null;
 	const sshMatch = parsed.url.match(/^git@[^:]+:(.+)$/);
@@ -39,7 +55,7 @@ function parseOwnerRepo(ownerRepo) {
 }
 async function isRepoPrivate(owner, repo) {
 	try {
-		const res = await fetch(`https://api.github.com/repos/${owner}/${repo}`);
+		const res = await fetch(`https://api.github.com/repos/${owner}/${repo}`, { headers: getHeaders() });
 		if (!res.ok) return null;
 		return (await res.json()).private === true;
 	} catch {
@@ -404,7 +420,10 @@ function withTimeout(timeoutMs) {
 }
 async function fetchText(url, timeoutMs) {
 	try {
-		const response = await fetch(url, { signal: withTimeout(timeoutMs) });
+		const response = await fetch(url, {
+			signal: withTimeout(timeoutMs),
+			headers: getHeaders()
+		});
 		if (!response.ok) return null;
 		return (await response.text()).trim();
 	} catch {
@@ -460,7 +479,10 @@ async function ensureRegionAvailable(region, hubBaseUrl) {
 	const availabilityPromise = (async () => {
 		const statusUrl = new URL("/api/v1/status", hubBaseUrl).toString();
 		try {
-			if ((await fetch(statusUrl, { signal: withTimeout(STATUS_TIMEOUT_MS) })).ok) return;
+			if ((await fetch(statusUrl, {
+				signal: withTimeout(STATUS_TIMEOUT_MS),
+				headers: getHeaders()
+			})).ok) return;
 		} catch {}
 		const alternateRegion = region === "cn" ? "global" : "cn";
 		REGION_DOMAINS[alternateRegion];
@@ -670,13 +692,12 @@ async function extractDownloadedArtifact(destination, fileName, bytes) {
 }
 async function searchSkillsCatalog(query, limit = 10) {
 	try {
-		const hubBaseUrl = await getSafeSkillHubBaseUrl();
-		const searchBaseUrl = await getSafeSkillSearchUrlWithHub(hubBaseUrl);
+		const searchBaseUrl = await getSafeSkillSearchUrlWithHub(await getSafeSkillHubBaseUrl());
 		const searchUrl = new URL(searchBaseUrl);
 		searchUrl.searchParams.set("query", query);
 		searchUrl.searchParams.set("page", "1");
 		searchUrl.searchParams.set("page_size", String(limit));
-		const response = await fetch(searchUrl.toString());
+		const response = await fetch(searchUrl.toString(), { headers: getHeaders() });
 		if (!response.ok) return [];
 		const payload = await response.json();
 		const data = "data" in payload ? payload.data : null;
@@ -684,11 +705,15 @@ async function searchSkillsCatalog(query, limit = 10) {
 		return data.items.map((item) => ({
 			name: item.name,
 			label: item.display_name || item.name,
-			description: item.description,
+			description: item.summary || item.description,
 			slug: `${item.namespace}/${item.name}`,
 			source: buildHubSource(item.namespace, item.name, item.latest_version),
-			installs: 0,
-			detailUrl: `${buildApiUrl(hubBaseUrl, `/skills/${item.namespace}/${item.name}`)}`
+			installs: item.stats?.total_installs ?? 0,
+			totalStars: item.stats?.total_stars ?? 0,
+			trustScore: item.trust_score,
+			updatedAt: item.updated_at,
+			sha256: item.latest_sha256,
+			detailUrl: item.latest_sha256 ? `https://safeskill.cn/report/${item.latest_sha256}` : void 0
 		}));
 	} catch {
 		return [];
@@ -698,7 +723,7 @@ async function resolveHubSkill(source, agent) {
 	const baseUrl = await getSafeSkillHubBaseUrl();
 	const response = await fetch(buildApiUrl(baseUrl, "/resolve"), {
 		method: "POST",
-		headers: { "content-type": "application/json" },
+		headers: getHeaders({ "content-type": "application/json" }),
 		body: JSON.stringify({
 			source,
 			...agent ? { agent } : {}
@@ -714,13 +739,19 @@ async function downloadHubSource(source, agent) {
 	if (!downloadUrl) throw new Error("hub resolve did not return a downloadable artifact");
 	let response;
 	try {
-		response = await fetch(downloadUrl, { redirect: "follow" });
+		response = await fetch(downloadUrl, {
+			redirect: "follow",
+			headers: getHeaders()
+		});
 		if (!response.ok && response.status === 502 && resolved.artifact_digest) {
 			console.warn(`Primary download URL failed with 502, trying fallback...`);
 			const fallbackUrl = buildFallbackDownloadUrl(resolved.artifact_digest);
 			if (fallbackUrl && fallbackUrl !== downloadUrl) {
 				console.warn(`Trying fallback URL: ${fallbackUrl}`);
-				const fallbackResponse = await fetch(fallbackUrl, { redirect: "follow" });
+				const fallbackResponse = await fetch(fallbackUrl, {
+					redirect: "follow",
+					headers: getHeaders()
+				});
 				if (fallbackResponse.ok) response = fallbackResponse;
 				else throw new Error(`hub artifact download failed: ${response.status} (primary) and ${fallbackResponse.status} (fallback)`);
 			} else throw new Error(`hub artifact download failed: ${response.status}`);
@@ -750,7 +781,7 @@ async function checkHubUpdates(items) {
 	const baseUrl = await getSafeSkillHubBaseUrl();
 	const response = await fetch(buildApiUrl(baseUrl, "/check-update"), {
 		method: "POST",
-		headers: { "content-type": "application/json" },
+		headers: getHeaders({ "content-type": "application/json" }),
 		body: JSON.stringify({ items })
 	});
 	if (!response.ok) throw new Error(`hub check-update failed: ${response.status}`);
@@ -1919,7 +1950,7 @@ var WellKnownProvider = class {
 				});
 			}
 			for (const { indexUrl, baseUrl: resolvedBase, wellKnownPath } of urlsToTry) try {
-				const response = await fetch(indexUrl);
+				const response = await fetch(indexUrl, { headers: getHeaders() });
 				if (!response.ok) continue;
 				const index = await response.json();
 				if (!index.skills || !Array.isArray(index.skills)) continue;
@@ -1980,7 +2011,7 @@ var WellKnownProvider = class {
 			const resolvedPath = wellKnownPath ?? this.WELL_KNOWN_PATHS[0];
 			const skillBaseUrl = `${baseUrl.replace(/\/$/, "")}/${resolvedPath}/${entry.name}`;
 			const skillMdUrl = `${skillBaseUrl}/SKILL.md`;
-			const response = await fetch(skillMdUrl);
+			const response = await fetch(skillMdUrl, { headers: getHeaders() });
 			if (!response.ok) return null;
 			const content = await response.text();
 			const { data } = (0, import_gray_matter.default)(content);
@@ -1990,7 +2021,7 @@ var WellKnownProvider = class {
 			const filePromises = entry.files.filter((f) => f.toLowerCase() !== "skill.md").map(async (filePath) => {
 				try {
 					const fileUrl = `${skillBaseUrl}/${filePath}`;
-					const fileResponse = await fetch(fileUrl);
+					const fileResponse = await fetch(fileUrl, { headers: getHeaders() });
 					if (fileResponse.ok) return {
 						path: filePath,
 						content: await fileResponse.text()
@@ -2101,10 +2132,7 @@ async function fetchSkillFolderHash(ownerRepo, skillPath, token) {
 	if (folderPath.endsWith("/")) folderPath = folderPath.slice(0, -1);
 	for (const branch of ["main", "master"]) try {
 		const url = `https://api.github.com/repos/${ownerRepo}/git/trees/${branch}?recursive=1`;
-		const headers = {
-			Accept: "application/vnd.github.v3+json",
-			"User-Agent": "skills-cli"
-		};
+		const headers = getHeaders({ Accept: "application/vnd.github.v3+json" });
 		if (token) headers["Authorization"] = `Bearer ${token}`;
 		const response = await fetch(url, { headers });
 		if (!response.ok) continue;
@@ -2231,7 +2259,7 @@ function createEmptyLocalLock() {
 		skills: {}
 	};
 }
-var version$1 = "0.1.8";
+var version$1 = "0.2.0";
 const isCancelled$1 = (value) => typeof value === "symbol";
 async function isSourcePrivate(source) {
 	const ownerRepo = parseOwnerRepo(source);
@@ -3267,11 +3295,34 @@ const BOLD$2 = "\x1B[1m";
 const DIM$2 = "\x1B[38;5;102m";
 const TEXT$1 = "\x1B[38;5;145m";
 const CYAN$1 = "\x1B[36m";
-function formatInstalls(count) {
-	if (!count || count <= 0) return "";
-	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"}`;
+const GREEN = "\x1B[32m";
+const YELLOW$1 = "\x1B[33m";
+const RED = "\x1B[31m";
+function formatCount(count) {
+	if (count >= 1e6) return `${(count / 1e6).toFixed(1).replace(/\.0$/, "")}M`;
+	if (count >= 1e3) return `${(count / 1e3).toFixed(1).replace(/\.0$/, "")}K`;
+	return `${count}`;
+}
+function formatTrustScore(score) {
+	if (score === void 0 || score === null) return "";
+	return `${score >= 80 ? GREEN : score >= 60 ? YELLOW$1 : RED}TrustScore:${score}${RESET$2}`;
+}
+function formatRelativeDate(ts) {
+	if (!ts) return "";
+	const diff = Math.floor(Date.now() / 1e3) - ts;
+	if (diff < 0) return "";
+	const days = Math.floor(diff / 86400);
+	if (days < 1) return "today";
+	if (days < 30) return `${days}d ago`;
+	const months = Math.floor(days / 30);
+	if (months < 12) return `${months}mo ago`;
+	return `${Math.floor(months / 12)}y ago`;
+}
+function formatStatsBadges(installs, stars) {
+	const parts = [];
+	if (installs > 0) parts.push(`${CYAN$1}↓ ${formatCount(installs)}${RESET$2}`);
+	if (stars > 0) parts.push(`${YELLOW$1}★ ${formatCount(stars)}${RESET$2}`);
+	return parts.join("  ");
 }
 async function searchSkillsAPI(query) {
 	return searchSkillsCatalog(query, 10);
@@ -3311,10 +3362,10 @@ async function runSearchPrompt(initialQuery = "") {
 				const displayName = skill.label || skill.name;
 				const name = isSelected ? `${BOLD$2}${displayName}${RESET$2}` : `${TEXT$1}${displayName}${RESET$2}`;
 				const source = skill.source ? ` ${DIM$2}${skill.source}${RESET$2}` : "";
-				const installs = formatInstalls(skill.installs);
-				const installsBadge = installs ? ` ${CYAN$1}${installs}${RESET$2}` : "";
+				const statsBadge = formatStatsBadges(skill.installs, skill.totalStars);
+				const trustBadge = skill.trustScore !== void 0 ? ` ${skill.trustScore >= 80 ? GREEN : skill.trustScore >= 60 ? YELLOW$1 : RED}TrustScore:${skill.trustScore}${RESET$2}` : "";
 				const loadingIndicator = loading && i === 0 ? ` ${DIM$2}...${RESET$2}` : "";
-				lines.push(`  ${arrow} ${name}${source}${installsBadge}${loadingIndicator}`);
+				lines.push(`  ${arrow}${trustBadge}  ${name}${source}${statsBadge ? `  ${statsBadge}` : ""}${loadingIndicator}`);
 			}
 		}
 		lines.push("");
@@ -3432,12 +3483,18 @@ ${DIM$2}  2) npx safeskill add <owner/repo@skill>${RESET$2}`;
 		console.log();
 		for (const skill of results.slice(0, 6)) {
 			const pkg = skill.source || skill.slug;
-			const installs = formatInstalls(skill.installs);
-			const displayName = skill.label || skill.name;
 			const installRef = pkg.startsWith("safeskill://") ? pkg : `${pkg}@${skill.name}`;
-			console.log(`${TEXT$1}${installRef}${RESET$2}${installs ? ` ${CYAN$1}${installs}${RESET$2}` : ""}`);
-			if (skill.description) console.log(`${DIM$2}  ${skill.description}${RESET$2}`);
-			else if (displayName !== skill.name) console.log(`${DIM$2}  ${displayName}${RESET$2}`);
+			console.log(`${TEXT$1}${installRef}${RESET$2}`);
+			const statsBadge = formatStatsBadges(skill.installs, skill.totalStars);
+			const badges = [
+				formatTrustScore(skill.trustScore),
+				statsBadge,
+				skill.updatedAt ? `${DIM$2}${formatRelativeDate(skill.updatedAt)}${RESET$2}` : ""
+			].filter(Boolean).join(`  `);
+			if (badges) console.log(`  ${badges}`);
+			const displayName = skill.label || skill.name;
+			const desc = skill.description || (displayName !== skill.name ? displayName : "");
+			if (desc) console.log(`${DIM$2}  ${desc}${RESET$2}`);
 			if (skill.detailUrl) console.log(`${DIM$2}└ ${skill.detailUrl}${RESET$2}`);
 			console.log();
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safeskill/cli",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "SafeSkill CLI, for safe your skills",
   "type": "module",
   "bin": {
@@ -13,6 +13,18 @@
     "CHANGELOG.md",
     "ThirdPartyNoticeText.txt"
   ],
+  "scripts": {
+    "build": "node scripts/generate-licenses.js && obuild",
+    "generate-licenses": "node scripts/generate-licenses.js",
+    "dev": "node src/cli.ts",
+    "exec:test": "node scripts/execute-tests.ts",
+    "prepublishOnly": "npm run build",
+    "format": "prettier --write \"src/**/*.ts\" \"scripts/**/*.ts\"",
+    "format:check": "prettier --check \"src/**/*.ts\" \"scripts/**/*.ts\"",
+    "test": "vitest",
+    "type-check": "tsc --noEmit",
+    "publish:snapshot": "npm version prerelease --preid=snapshot --no-git-tag-version && npm publish --tag snapshot"
+  },
   "lint-staged": {
     "src/**/*.ts": "prettier --write",
     "scripts/**/*.ts": "prettier --write",
@@ -95,21 +107,11 @@
   "engines": {
     "node": ">=18"
   },
+  "packageManager": "pnpm@10.17.1",
   "dependencies": {
     "@types/yauzl": "^2.10.3",
     "jschardet": "^3.1.4",
     "node-stream-zip": "^1.15.0",
     "yauzl": "^3.3.0"
-  },
-  "scripts": {
-    "build": "node scripts/generate-licenses.js && obuild",
-    "generate-licenses": "node scripts/generate-licenses.js",
-    "dev": "node src/cli.ts",
-    "exec:test": "node scripts/execute-tests.ts",
-    "format": "prettier --write \"src/**/*.ts\" \"scripts/**/*.ts\"",
-    "format:check": "prettier --check \"src/**/*.ts\" \"scripts/**/*.ts\"",
-    "test": "vitest",
-    "type-check": "tsc --noEmit",
-    "publish:snapshot": "npm version prerelease --preid=snapshot --no-git-tag-version && npm publish --tag snapshot"
   }
-}
+}