ali-skills 0.0.11 → 0.0.12

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

@@ -166,6 +166,14 @@ function parseSource(input) {
 		type: "internal",
 		url: input.replace(/\bgitlab\.alibaba-inc\.com\b/g, "code.alibaba-inc.com")
 	};
+	const internalSshMatch = input.match(/^git@(?:code|gitlab)\.alibaba-inc\.com:(.+?)(?:\.git)?$/);
+	if (internalSshMatch) {
+		const repoPath = internalSshMatch[1];
+		if (repoPath.includes("/")) return {
+			type: "internal",
+			url: `git@code.alibaba-inc.com:${repoPath}.git`
+		};
+	}
 	if (isWellKnownUrl(input)) return {
 		type: "well-known",
 		url: input
@@ -365,6 +373,37 @@ async function searchMultiselect(options) {
 	});
 }
 const CLONE_TIMEOUT_MS = 6e4;
+function getGitUserConfig() {
+	try {
+		const name = execSync("git config user.name", {
+			encoding: "utf-8",
+			stdio: [
+				"pipe",
+				"pipe",
+				"ignore"
+			]
+		}).trim();
+		const email = execSync("git config user.email", {
+			encoding: "utf-8",
+			stdio: [
+				"pipe",
+				"pipe",
+				"ignore"
+			]
+		}).trim();
+		if (!name || !email) return null;
+		const emailMatch = email.match(/^([a-z0-9._-]+)@/i);
+		return {
+			username: (name || (emailMatch ? emailMatch[1] : "")) ?? "",
+			email
+		};
+	} catch {
+		return null;
+	}
+}
+function getCurrentUser() {
+	return getGitUserConfig();
+}
 var GitCloneError = class extends Error {
 	url;
 	isTimeout;
@@ -677,12 +716,24 @@ async function parseSkillMd(skillMdPath, options) {
 		});
 		return null;
 	}
+	const extractAuthorInfo = (data) => {
+		const authorObj = data.author && typeof data.author === "object" && !Array.isArray(data.author) ? data.author : {};
+		return {
+			authorName: typeof authorObj.nickname === "string" && authorObj.nickname || typeof authorObj.name === "string" && authorObj.name || void 0,
+			authorEmpId: typeof authorObj.empId === "string" && authorObj.empId || void 0,
+			authorAvatar: typeof authorObj.avatar === "string" && authorObj.avatar || void 0
+		};
+	};
+	const { authorName, authorEmpId, authorAvatar } = extractAuthorInfo(data);
 	return {
 		name: data.name,
 		description: data.description,
 		path: dirname(skillMdPath),
 		rawContent: content,
-		metadata: data.metadata
+		metadata: data.metadata,
+		authorName,
+		authorEmpId,
+		authorAvatar
 	};
 }
 async function findSkillDirs(dir, depth = 0, maxDepth = 5) {
@@ -2032,7 +2083,7 @@ function logSkillParseFailures(failures) {
 		if (f.hint) M.message(import_picocolors.default.yellow(`  提示: ${f.hint}`));
 	}
 }
-var version$1 = "2.0.10";
+var version$1 = "2.0.11";
 const isCancelled$1 = (value) => typeof value === "symbol";
 async function isSourcePrivate(source) {
 	const ownerRepo = parseOwnerRepo(source);
@@ -2405,16 +2456,20 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 		skillFiles[skill.installName] = skill.sourceUrl;
 		if (skill.description) skillDescriptions[skill.installName] = skill.description;
 	}
-	if (await isSourcePrivate(sourceIdentifier) !== true) track({
-		event: "install",
-		source: sourceIdentifier,
-		skills: selectedSkills.map((s) => s.installName).join(","),
-		agents: targetAgents.join(","),
-		...installGlobally && { global: "1" },
-		skillFiles: JSON.stringify(skillFiles),
-		sourceType: "well-known",
-		descriptions: JSON.stringify(skillDescriptions)
-	});
+	if (await isSourcePrivate(sourceIdentifier) !== true) {
+		const currentUser = getCurrentUser();
+		track({
+			event: "install",
+			source: sourceIdentifier,
+			skills: selectedSkills.map((s) => s.installName).join(","),
+			agents: targetAgents.join(","),
+			...installGlobally && { global: "1" },
+			skillFiles: JSON.stringify(skillFiles),
+			sourceType: "well-known",
+			descriptions: JSON.stringify(skillDescriptions),
+			...currentUser && { user: JSON.stringify(currentUser) }
+		});
+	}
 	if (successful.length > 0 && installGlobally) {
 		const successfulSkillNames = new Set(successful.map((r) => r.skill));
 		for (const skill of selectedSkills) if (successfulSkillNames.has(skill.installName)) try {
@@ -2523,6 +2578,13 @@ async function runAdd(args, options = {}) {
 		const spinner = Y();
 		spinner.start("Parsing source...");
 		const parsed = parseSource(resolvedSource);
+		if (parsed.type === "internal" && parsed.url.startsWith("git@")) {
+			const sshMatch = parsed.url.match(/^git@code\.alibaba-inc\.com:(.+)$/);
+			if (sshMatch) {
+				const repoPath = sshMatch[1].replace(/\.git$/, "");
+				parsed.url = `https://${GITLAB_ACCOUNT.user}:${GITLAB_ACCOUNT.token}@code.alibaba-inc.com/${repoPath}.git`;
+			}
+		}
 		if (options.branch) {
 			parsed.ref = options.branch;
 			parsed.subpath = void 0;
@@ -2927,6 +2989,7 @@ async function runAdd(args, options = {}) {
 		const failed = results.filter((r) => !r.success);
 		const skillFiles = {};
 		const skillDescriptions = {};
+		const skillMdAuthors = {};
 		for (const skill of selectedSkills) {
 			let relativePath;
 			if (tempDir && skill.path === tempDir) relativePath = "SKILL.md";
@@ -2934,29 +2997,59 @@ async function runAdd(args, options = {}) {
 			else continue;
 			skillFiles[skill.name] = relativePath;
 			if (skill.description) skillDescriptions[skill.name] = skill.description;
+			if (skill.authorName || skill.authorEmpId || skill.authorAvatar) skillMdAuthors[skill.name] = {
+				name: skill.authorName,
+				empId: skill.authorEmpId,
+				avatar: skill.authorAvatar
+			};
 		}
 		const normalizedSource = getOwnerRepo(parsed);
 		const effectiveSourceType = parsed.type;
 		const lockSource = parsed.url.startsWith("git@") ? parsed.url : normalizedSource;
-		let skillAuthor;
+		const trackableSkillNames = selectedSkills.filter((s) => isValidSkillName(s.name)).map((s) => s.name);
+		const skillMdLastCommitAuthors = {};
 		if (parsed.type === "internal" && normalizedSource) {
 			const gitlabToken = GITLAB_ACCOUNT.token;
 			if (gitlabToken) {
 				const project = await getGitLabProject(normalizedSource, gitlabToken);
-				if (project) {
-					const firstSkillPath = Object.values(skillFiles)[0];
-					if (firstSkillPath) {
-						const author = await getSkillLastCommitAuthor(project.id, firstSkillPath, gitlabToken);
-						if (author) skillAuthor = author;
+				if (project) for (const skillName of trackableSkillNames) {
+					const skillFilePath = skillFiles[skillName];
+					if (skillFilePath) {
+						const author = await getSkillLastCommitAuthor(project.id, skillFilePath, gitlabToken);
+						if (author) {
+							const formattedName = author.username ? `${author.name}/${author.username}` : author.name;
+							skillMdLastCommitAuthors[skillName] = {
+								employeeId: author.employeeId,
+								email: author.email,
+								name: formattedName
+							};
+						}
 					}
 				}
 			}
 		}
-		const trackableSkillNames = selectedSkills.filter((s) => isValidSkillName(s.name)).map((s) => s.name);
 		if (normalizedSource && trackableSkillNames.length > 0) {
 			const ownerRepo = parseOwnerRepo(normalizedSource);
 			if (ownerRepo) {
-				if (await isRepoPrivate(ownerRepo.owner, ownerRepo.repo) === false) track({
+				if (await isRepoPrivate(ownerRepo.owner, ownerRepo.repo) === false) {
+					const currentUser = getCurrentUser();
+					track({
+						event: "install",
+						source: normalizedSource,
+						skills: trackableSkillNames.join(","),
+						agents: targetAgents.join(","),
+						...installGlobally && { global: "1" },
+						skillFiles: JSON.stringify(skillFiles),
+						sourceType: effectiveSourceType,
+						skillMdLastCommitAuthors: JSON.stringify(skillMdLastCommitAuthors),
+						skillMdConfigAuthors: JSON.stringify(skillMdAuthors),
+						descriptions: JSON.stringify(skillDescriptions),
+						...currentUser && { user: JSON.stringify(currentUser) }
+					});
+				}
+			} else {
+				const currentUser = getCurrentUser();
+				track({
 					event: "install",
 					source: normalizedSource,
 					skills: trackableSkillNames.join(","),
@@ -2964,20 +3057,12 @@ async function runAdd(args, options = {}) {
 					...installGlobally && { global: "1" },
 					skillFiles: JSON.stringify(skillFiles),
 					sourceType: effectiveSourceType,
-					author: JSON.stringify(skillAuthor),
-					descriptions: JSON.stringify(skillDescriptions)
+					skillMdLastCommitAuthors: JSON.stringify(skillMdLastCommitAuthors),
+					skillMdConfigAuthors: JSON.stringify(skillMdAuthors),
+					descriptions: JSON.stringify(skillDescriptions),
+					...currentUser && { user: JSON.stringify(currentUser) }
 				});
-			} else track({
-				event: "install",
-				source: normalizedSource,
-				skills: trackableSkillNames.join(","),
-				agents: targetAgents.join(","),
-				...installGlobally && { global: "1" },
-				skillFiles: JSON.stringify(skillFiles),
-				sourceType: effectiveSourceType,
-				author: JSON.stringify(skillAuthor),
-				descriptions: JSON.stringify(skillDescriptions)
-			});
+			}
 		}
 		if (successful.length > 0 && installGlobally && normalizedSource) {
 			const successfulSkillNames = new Set(successful.map((r) => r.skill));
@@ -4026,13 +4111,19 @@ function detectRepoInfo() {
 		}).trim();
 		if (!remoteUrl) return null;
 		if (remoteUrl.includes("code.alibaba-inc.com") || remoteUrl.includes("gitlab.alibaba-inc.com")) {
-			const match = remoteUrl.match(/(?:code|gitlab)\.alibaba-inc\.com[/:]([^/]+)\/([^/.]+)/);
-			if (match) return {
-				sourceType: "internal",
-				owner: match[1],
-				repo: match[2],
-				remoteUrl
-			};
+			const match = remoteUrl.match(/(?:code|gitlab)\.alibaba-inc\.com[\/:](.+?)(?:\.git)?$/);
+			if (match) {
+				const pathParts = match[1].split("/");
+				if (pathParts.length >= 2) {
+					const repo = pathParts.pop();
+					return {
+						sourceType: "internal",
+						owner: pathParts.join("/"),
+						repo,
+						remoteUrl
+					};
+				}
+			}
 		}
 		if (remoteUrl.includes("github.com")) {
 			const match = remoteUrl.match(/github\.com[/:]([^/]+)\/([^/.]+)/);
@@ -4233,12 +4324,18 @@ async function runPublish(args, options = {}) {
 				const registerResult = await registerSkill({
 					source,
 					sourceType: repoInfo.sourceType,
-					skills: successful.map((r) => ({
-						name: r.skill,
-						zipUrl: r.zipUrl,
-						zipHash: r.hash,
-						description: selectedSkills.find((s) => getSkillDisplayName(s) === r.skill)?.description ?? ""
-					}))
+					skills: successful.map((r) => {
+						const skill = selectedSkills.find((s) => getSkillDisplayName(s) === r.skill);
+						return {
+							name: r.skill,
+							zipUrl: r.zipUrl,
+							zipHash: r.hash,
+							description: skill?.description ?? "",
+							authorName: skill?.authorName,
+							authorEmpId: skill?.authorEmpId,
+							authorAvatar: skill?.authorAvatar
+						};
+					})
 				});
 				if (registerResult.success) spinner.stop("Skills registered");
 				else spinner.stop(import_picocolors.default.yellow(`Registration warning: ${registerResult.error}`));

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

@@ -1,6 +1,6 @@
 {
   "name": "@ali/cli-skills",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "The open agent skills ecosystem",
   "type": "module",
   "bin": {
@@ -25,7 +25,7 @@
     "test": "vitest",
     "type-check": "tsc --noEmit",
     "publish:snapshot": "tnpm version prerelease --preid=snapshot --no-git-tag-version && tnpm publish --tag snapshot",
-    "publish:latest:patch": "tnpm version patch && tnpm publish && git push --follow-tags"
+    "publish:latest:patch": "tnpm version patch && tnpm publish && git push --follow-tags --no-verify"
   },
   "lint-staged": {
     "src/**/*.ts": "prettier --write",

package/package.json

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