ali-skills 0.0.16 → 0.0.18

package/node_modules/@ali/cli-skills/dist/cli.mjs

@@ -224,20 +224,21 @@ function isWellKnownUrl(input) {
 		return false;
 	}
 }
-function getDisplaySource(sourceUrl) {
+function getDisplaySource(sourceUrl, options = {}) {
+	const format = options.format ?? "compact";
 	if (sourceUrl.startsWith("/") || sourceUrl.startsWith(".") || sourceUrl.startsWith("~")) return sourceUrl;
 	const sshMatch = sourceUrl.match(/^git@([^:]+):(.+)$/);
 	if (sshMatch) {
 		const [, host, path] = sshMatch;
 		if (!host || !path) return sourceUrl;
 		const cleanPath = path.replace(/\.git$/, "");
-		if (host === "code.alibaba-inc.com" || host === "gitlab.alibaba-inc.com") return cleanPath;
+		if (format === "compact" && (host === "code.alibaba-inc.com" || host === "gitlab.alibaba-inc.com")) return cleanPath;
 		return `https://${host}/${cleanPath}`;
 	}
 	if (sourceUrl.startsWith("http://") || sourceUrl.startsWith("https://")) try {
 		const url = new URL(sourceUrl);
 		const cleanPath = url.pathname.replace(/\.git$/, "").replace(/^\//, "");
-		if (url.hostname === "code.alibaba-inc.com" || url.hostname === "gitlab.alibaba-inc.com") return cleanPath;
+		if (format === "compact" && (url.hostname === "code.alibaba-inc.com" || url.hostname === "gitlab.alibaba-inc.com")) return cleanPath;
 		return `https://${url.hostname}/${cleanPath}`;
 	} catch {
 		return sourceUrl.replace(/^https?:\/\/[^@]+@/, "https://");
@@ -408,6 +409,9 @@ async function searchMultiselect(options) {
 	});
 }
 const CLONE_TIMEOUT_MS = 6e4;
+function redactSensitiveText$1(text) {
+	return text.replace(/(https?:\/\/)([^/\s:@]+)(?::([^@/\s]*))?@/gi, "$1").replace(/([?&](?:private_token|access_token|token|api_key|access_key|secret|password)=)[^&\s]+/gi, "$1***");
+}
 function getGitUserConfig() {
 	try {
 		const name = execSync("git config user.name", {
@@ -475,11 +479,13 @@ async function cloneRepo(url, ref) {
 			force: true
 		}).catch(() => {});
 		const errorMessage = error instanceof Error ? error.message : String(error);
+		const safeUrl = getDisplaySource(url);
+		const safeErrorMessage = redactSensitiveText$1(errorMessage);
 		const isTimeout = errorMessage.includes("block timeout") || errorMessage.includes("timed out");
 		const isAuthError = errorMessage.includes("Authentication failed") || errorMessage.includes("could not read Username") || errorMessage.includes("Permission denied") || errorMessage.includes("Repository not found") || errorMessage.includes("HTTP Basic: Access denied") || errorMessage.includes("could not be found or you don") || errorMessage.toLowerCase().includes("you don't have permission") || /repository .+ not found/i.test(errorMessage);
-		if (isTimeout) throw new GitCloneError("Clone timed out after 60s. This often happens with private repos that require authentication.\n  Ensure you have access and your SSH keys or credentials are configured:\n  - For SSH: ssh-add -l (to check loaded keys)\n  - For HTTPS: gh auth status (if using GitHub CLI)", url, true, false);
-		if (isAuthError) throw new GitCloneError(`Authentication failed for ${url}.\n  - For private repos, ensure you have access\n  - For SSH: Check your keys with 'ssh -T git@github.com'\n  - For HTTPS: Run 'gh auth login' or configure git credentials`, url, false, true);
-		throw new GitCloneError(`Failed to clone ${url}: ${errorMessage}`, url, false, false);
+		if (isTimeout) throw new GitCloneError("Clone timed out after 60s. This often happens with private repos that require authentication.\n  Ensure you have access and your SSH keys or credentials are configured:\n  - For SSH: ssh-add -l (to check loaded keys)\n  - For HTTPS: gh auth status (if using GitHub CLI)", safeUrl, true, false);
+		if (isAuthError) throw new GitCloneError(`Authentication failed for ${safeUrl}.\n  - For private repos, ensure you have access\n  - For SSH: Check your keys with 'ssh -T git@github.com'\n  - For HTTPS: Run 'gh auth login' or configure git credentials`, safeUrl, false, true);
+		throw new GitCloneError(`Failed to clone ${safeUrl}: ${safeErrorMessage}`, safeUrl, false, false);
 	}
 }
 async function listRemoteBranches(url) {
@@ -1994,8 +2000,12 @@ async function fetchSkillFolderHash(ownerRepo, skillPath, token) {
 	if (folderPath.endsWith("/SKILL.md")) folderPath = folderPath.slice(0, -9);
 	else if (folderPath.endsWith("SKILL.md")) folderPath = folderPath.slice(0, -8);
 	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`;
+	for (const ref of [
+		"HEAD",
+		"master",
+		"main"
+	]) try {
+		const url = `https://api.github.com/repos/${ownerRepo}/git/trees/${ref}?recursive=1`;
 		const headers = {
 			Accept: "application/vnd.github.v3+json",
 			"User-Agent": "skills-cli"
@@ -2013,10 +2023,14 @@ async function fetchSkillFolderHash(ownerRepo, skillPath, token) {
 	return null;
 }
 async function fetchAliInternalCommitHash(source, skillPath = "", token) {
-	const branches = ["main", "master"];
+	const refs = [
+		"HEAD",
+		"master",
+		"main"
+	];
 	const privateToken = token || process.env.GITLAB_PRIVATE_TOKEN || process.env.CODE_ALIBABA_TOKEN || GITLAB_ACCOUNT.token;
-	for (const branch of branches) try {
-		let url = `https://code.alibaba-inc.com/api/v4/projects/${encodeURIComponent(source)}/repository/commits?ref_name=${branch}&per_page=1`;
+	for (const ref of refs) try {
+		let url = `https://code.alibaba-inc.com/api/v4/projects/${encodeURIComponent(source)}/repository/commits?ref_name=${ref}&per_page=1`;
 		if (skillPath) url += `&path=${encodeURIComponent(skillPath)}`;
 		const headers = {
 			Accept: "application/json",
@@ -2025,8 +2039,8 @@ async function fetchAliInternalCommitHash(source, skillPath = "", token) {
 		};
 		const response = await fetch(url, { headers });
 		if (!response.ok) continue;
-		const data = await response.json();
-		if (data && data.length > 0) return data[0].id;
+		const latestCommit = (await response.json())[0];
+		if (latestCommit?.id) return latestCommit.id;
 	} catch {
 		continue;
 	}
@@ -2191,8 +2205,11 @@ function logSkillParseFailures(failures) {
 		if (f.hint) M.message(import_picocolors.default.yellow(`  提示: ${f.hint}`));
 	}
 }
-var version$1 = "2.0.16";
+var version$1 = "2.0.18";
 const isCancelled$1 = (value) => typeof value === "symbol";
+function redactSensitiveText(text) {
+	return text.replace(/(https?:\/\/)([^/\s:@]+)(?::([^@/\s]*))?@/gi, "$1").replace(/([?&](?:private_token|access_token|token|api_key|access_key|secret|password)=)[^&\s]+/gi, "$1***");
+}
 async function isSourcePrivate(source) {
 	const ownerRepo = parseOwnerRepo(source);
 	if (!ownerRepo) return false;
@@ -2711,7 +2728,8 @@ async function runAdd(args, options = {}) {
 				}
 			} catch {}
 		}
-		spinner.stop(`Source: ${parsed.type === "local" ? parsed.localPath : parsed.url}${parsed.ref ? ` @ ${import_picocolors.default.yellow(parsed.ref)}` : ""}${parsed.subpath ? ` (${parsed.subpath})` : ""}${parsed.skillFilter ? ` ${import_picocolors.default.dim("@")}${import_picocolors.default.cyan(parsed.skillFilter)}` : ""}`);
+		const displaySource = parsed.type === "local" ? parsed.localPath : getDisplaySource(parsed.url, { format: "absolute" });
+		spinner.stop(`Source: ${displaySource}${parsed.ref ? ` @ ${import_picocolors.default.yellow(parsed.ref)}` : ""}${parsed.subpath ? ` (${parsed.subpath})` : ""}${parsed.skillFilter ? ` ${import_picocolors.default.dim("@")}${import_picocolors.default.cyan(parsed.skillFilter)}` : ""}`);
 		if (parsed.type === "well-known") {
 			await handleWellKnownSkills(source, parsed.url, options, spinner);
 			return;
@@ -3300,8 +3318,8 @@ async function runAdd(args, options = {}) {
 	} catch (error) {
 		if (error instanceof GitCloneError) {
 			M.error(import_picocolors.default.red("Failed to clone repository"));
-			for (const line of error.message.split("\n")) M.message(import_picocolors.default.dim(line));
-		} else M.error(error instanceof Error ? error.message : "Unknown error occurred");
+			for (const line of error.message.split("\n")) M.message(import_picocolors.default.dim(redactSensitiveText(line)));
+		} else M.error(redactSensitiveText(error instanceof Error ? error.message : "Unknown error occurred"));
 		showInstallTip();
 		Se(import_picocolors.default.red("Installation failed"));
 		process.exit(1);
@@ -6214,10 +6232,20 @@ async function main() {
 }
 main().then(async () => {
 	if (getPendingTelemetryCount() > 0) {
+		const syncStartAt = Date.now();
+		const longSyncThresholdMs = 800;
+		let didShowStartMessage = false;
+		const startMessageTimer = setTimeout(() => {
+			didShowStartMessage = true;
+			console.log();
+			console.log(`${DIM}Syncing telemetry data...${RESET}`);
+		}, longSyncThresholdMs);
+		await flushTelemetry();
+		clearTimeout(startMessageTimer);
 		console.log();
-		console.log(`${DIM}Syncing installation data...${RESET}`);
-	}
-	await flushTelemetry();
+		if (didShowStartMessage || Date.now() - syncStartAt >= longSyncThresholdMs) console.log(`${DIM}Telemetry data sync complete${RESET}`);
+		else console.log(`${DIM}Telemetry data synced${RESET}`);
+	} else await flushTelemetry();
 	process.exit(0);
 }).catch(async (error) => {
 	console.error(error);

package/node_modules/@ali/cli-skills/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ali/cli-skills",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ali-skills",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@ali/cli-skills": "^2.0.16"
+    "@ali/cli-skills": "^2.0.18"
   },
   "bundleDependencies": [
     "@ali/cli-skills"