bfi-cli 0.1.25 → 0.1.29

package/dist/cli.mjs

@@ -136,7 +136,30 @@ function parseSource(input) {
 	const alias = SOURCE_ALIASES[input];
 	if (alias) input = alias;
 	const githubPrefixMatch = input.match(/^github:(.+)$/);
-	if (githubPrefixMatch) return parseSource(appendFragmentRef(githubPrefixMatch[1], fragmentRef, fragmentSkillFilter));
+	if (githubPrefixMatch) {
+		const rest = githubPrefixMatch[1];
+		const atSkill = rest.match(/^([^/]+)\/([^/@]+)@(.+)$/);
+		if (atSkill && !rest.includes(":")) {
+			const [, owner, repo, skillFilter] = atSkill;
+			return {
+				type: "github",
+				url: `https://github.com/${owner}/${repo}.git`,
+				...fragmentRef ? { ref: fragmentRef } : {},
+				skillFilter: fragmentSkillFilter || skillFilter
+			};
+		}
+		const shorthand = rest.match(/^([^/]+)\/([^/]+)(?:\/(.+?))?\/?$/);
+		if (shorthand && !rest.includes(":") && !rest.startsWith(".")) {
+			const [, owner, repo, subpath] = shorthand;
+			return {
+				type: "github",
+				url: `https://github.com/${owner}/${repo}.git`,
+				...fragmentRef ? { ref: fragmentRef } : {},
+				subpath: subpath ? sanitizeSubpath(subpath) : subpath,
+				...fragmentSkillFilter ? { skillFilter: fragmentSkillFilter } : {}
+			};
+		}
+	}
 	const gitlabPrefixMatch = input.match(/^gitlab:(.+)$/);
 	if (gitlabPrefixMatch) return parseSource(appendFragmentRef(`https://gitlab.com/${gitlabPrefixMatch[1]}`, fragmentRef, fragmentSkillFilter));
 	const githubTreeWithPathMatch = input.match(/github\.com\/([^/]+)\/([^/]+)\/tree\/([^/]+)\/(.+)/);
@@ -4448,6 +4471,7 @@ async function cloneWithGitHubFallback(url, ref, spinner) {
 	}
 }
 async function installFromSkillHub(parsed, options, spinner) {
+	let tempDir = null;
 	const config = resolveConfig();
 	const api = new SkillHubAPI(config.registry, config.token);
 	const rawRef = parsed.url.startsWith("skillhub:") ? parsed.url.slice(9) : parsed.url;
@@ -4469,6 +4493,15 @@ async function installFromSkillHub(parsed, options, spinner) {
 			return (b.score || 0) - (a.score || 0);
 		}).slice(0, 20);
 		if (hits.length === 0) {
+			spinner.stop("SkillHub 未找到，尝试作为 Git 仓库...");
+			const gitSource = parseSource(rawRef);
+			if (gitSource.type === "git" || gitSource.type === "github" || gitSource.type === "gitlab") {
+				tempDir = await cloneWithGitHubFallback(gitSource.url, gitSource.ref, spinner);
+				return {
+					skills: await discoverSkills(tempDir, gitSource.subpath, { includeInternal: true }),
+					tempDir
+				};
+			}
 			spinner.stop(import_picocolors.default.red("无结果"));
 			outro(import_picocolors.default.red(`No skills found on SkillHub for "${rawRef}".`));
 			process.exit(1);
@@ -4513,7 +4546,7 @@ async function installFromSkillHub(parsed, options, spinner) {
 	}
 	const meta = metadata;
 	spinner.stop(`Skill: ${import_picocolors.default.cyan(`@${namespace}/${slug}`)}${meta.description ? ` — ${import_picocolors.default.dim(meta.description)}` : ""}`);
-	const tempDir = join(tmpdir(), `.bfi-skillhub-${canonicalSlug.replace(/[/:@]/g, "-")}-${Date.now()}`);
+	tempDir = join(tmpdir(), `.bfi-skillhub-${canonicalSlug.replace(/[/:@]/g, "-")}-${Date.now()}`);
 	mkdirSync(tempDir, { recursive: true });
 	const zipPath = join(tempDir, "skill.zip");
 	spinner.start("正在下载技能...");
@@ -6219,7 +6252,7 @@ async function updateGlobalSkills(options = {}) {
 			console.log(`  ${DIM$9}✗ Cannot update ${safeName}: lock file is missing sourceUrl for this generic Git source${RESET$9}`);
 			continue;
 		}
-		const cliEntry = join(__dirname$1, "..", "bin", "cli.mjs");
+		const cliEntry = join(__dirname$1, "..", "bin", "bfi.mjs");
 		if (!existsSync(cliEntry)) {
 			failCount++;
 			console.log(`  ${DIM$9}✗ Failed to update ${safeName}: CLI entrypoint not found at ${cliEntry}${RESET$9}`);
@@ -6303,7 +6336,7 @@ async function updateProjectSkills(options = {}) {
 		bySource.set(source, existing);
 	}
 	const localLock = await readLocalLock();
-	const cliEntry = join(__dirname$1, "..", "bin", "cli.mjs");
+	const cliEntry = join(__dirname$1, "..", "bin", "bfi.mjs");
 	if (!existsSync(cliEntry)) {
 		console.log(`${DIM$9}✗ CLI 入口未找到 ${cliEntry}${RESET$9}`);
 		return {
@@ -6878,29 +6911,31 @@ const MARKETPLACE_API = process.env.SKILLS_API_URL || "https://skills.sh";
 async function runSearch(args, globalOpts) {
 	const query = parseSearchQuery(args);
 	const namespace = args.includes("--namespace") ? getOptionValue$2(args, "--namespace") : void 0;
+	const json = args.includes("--json");
 	if (!query) {
-		console.log("用法：bfi search <query> [--namespace <ns>] [--marketplace]");
+		console.log("用法：bfi search <query> [--namespace <ns>] [--marketplace] [--json]");
 		console.log();
 		console.log("选项：");
 		console.log("  --namespace <ns>   按 SkillHub 命名空间筛选");
 		console.log("  --marketplace      仅搜索 skills.sh 市场");
 		console.log("  --all              同时搜索 SkillHub 和市场");
+		console.log("  --json             以 JSON 格式输出结果");
 		return;
 	}
 	const useMarketplace = args.includes("--marketplace");
 	const searchAll = args.includes("--all");
 	if (useMarketplace) {
-		await searchMarketplace(query);
+		await searchMarketplace(query, json);
 		return;
 	}
 	if (searchAll) {
 		console.log(`${BOLD$5}=== SkillHub 注册表 ===${RESET$8}\n`);
-		await searchSkillHub(query, namespace, globalOpts);
+		await searchSkillHub(query, namespace, globalOpts, json);
 		console.log(`\n${BOLD$5}=== skills.sh 市场 ===${RESET$8}\n`);
-		await searchMarketplace(query);
+		await searchMarketplace(query, json);
 		return;
 	}
-	await searchSkillHub(query, namespace, globalOpts);
+	await searchSkillHub(query, namespace, globalOpts, json);
 }
 function parseSearchQuery(args) {
 	const parts = [];
@@ -6915,7 +6950,7 @@ function parseSearchQuery(args) {
 	}
 	return parts.join(" ");
 }
-async function searchSkillHub(query, namespace, globalOpts) {
+async function searchSkillHub(query, namespace, globalOpts, json = false) {
 	const { registry, token } = resolveConfig(globalOpts);
 	const api = new SkillHubAPI(registry, token);
 	try {
@@ -6926,7 +6961,30 @@ async function searchSkillHub(query, namespace, globalOpts) {
 		});
 		const skills = result.results || result.data || [];
 		if (skills.length === 0) {
-			console.log(`${DIM$8}SkillHub 上未找到 "${query}" 的技能${RESET$8}`);
+			if (json) console.log(JSON.stringify({
+				source: "skillhub",
+				count: 0,
+				results: []
+			}, null, 2));
+			else console.log(`${DIM$8}SkillHub 上未找到 "${query}" 的技能${RESET$8}`);
+			return;
+		}
+		if (json) {
+			const results = skills.map((skill) => {
+				const canonicalSlug = skill.slug || "";
+				const displaySlug = canonicalSlug.indexOf("--") > 0 ? canonicalSlug : `global--${canonicalSlug}`;
+				return {
+					name: skill.displayName || skill.name || skill.slug,
+					slug: displaySlug,
+					description: skill.summary || skill.description || "",
+					version: skill.version || null
+				};
+			});
+			console.log(JSON.stringify({
+				source: "skillhub",
+				count: results.length,
+				results
+			}, null, 2));
 			return;
 		}
 		console.log(`SkillHub 上找到 ${skills.length} 个技能：\n`);
@@ -6946,7 +7004,7 @@ async function searchSkillHub(query, namespace, globalOpts) {
 		console.error(`${DIM$8}SkillHub 搜索失败：${error.message}${RESET$8}`);
 	}
 }
-async function searchMarketplace(query) {
+async function searchMarketplace(query, json = false) {
 	try {
 		const params = new URLSearchParams({
 			q: query,
@@ -6955,12 +7013,37 @@ async function searchMarketplace(query) {
 		const url = `${MARKETPLACE_API}/api/search?${params.toString()}`;
 		const res = await fetch(url);
 		if (!res.ok) {
-			console.log(`${DIM$8}skills.sh 市场无结果${RESET$8}`);
+			if (json) console.log(JSON.stringify({
+				source: "marketplace",
+				count: 0,
+				results: []
+			}, null, 2));
+			else console.log(`${DIM$8}skills.sh 市场无结果${RESET$8}`);
 			return;
 		}
 		const skills = (await res.json()).skills || [];
 		if (skills.length === 0) {
-			console.log(`${DIM$8}skills.sh 上未找到 "${query}" 的技能${RESET$8}`);
+			if (json) console.log(JSON.stringify({
+				source: "marketplace",
+				count: 0,
+				results: []
+			}, null, 2));
+			else console.log(`${DIM$8}skills.sh 上未找到 "${query}" 的技能${RESET$8}`);
+			return;
+		}
+		if (json) {
+			const results = skills.slice(0, 12).map((skill) => ({
+				name: skill.name,
+				source: skill.source || null,
+				installs: skill.installs || 0,
+				url: `https://skills.sh/${skill.id}`,
+				installCommand: skill.source ? `bfi skills add github:${skill.source}` : null
+			}));
+			console.log(JSON.stringify({
+				source: "marketplace",
+				count: results.length,
+				results
+			}, null, 2));
 			return;
 		}
 		console.log(`skills.sh 上找到 ${skills.length} 个技能：\n`);
@@ -6999,19 +7082,21 @@ const YELLOW$2 = "\x1B[33m";
 const RED$2 = "\x1B[31m";
 const GREEN$4 = "\x1B[32m";
 async function runInfo(args, globalOpts) {
-	const slug = args[0];
-	if (!slug) {
-		console.log("用法：bfi info <skill-slug>");
-		console.log("示例：bfi info global/my-skill");
+	const ref = args[0];
+	if (!ref) {
+		console.log("用法：bfi info <skill-ref>");
+		console.log("示例：bfi info @global/my-skill");
 		process.exit(1);
 	}
 	const { registry, token } = resolveConfig(globalOpts);
 	const api = new SkillHubAPI(registry, token);
+	const { namespace, slug } = parseSkillRef(ref, "global");
+	const canonical = toCanonicalSlug(namespace, slug);
 	try {
-		const result = await api.getSkill(slug);
+		const result = await api.getSkill(canonical);
 		const skill = result.data || result.skill || result;
 		if (!skill || !skill.slug) {
-			console.log(`${DIM$7}未找到技能：${slug}${RESET$7}`);
+			console.log(`${DIM$7}未找到技能：${ref}${RESET$7}`);
 			process.exit(1);
 		}
 		console.log();
@@ -7072,7 +7157,7 @@ async function runInfo(args, globalOpts) {
 		}
 		console.log();
 	} catch (error) {
-		if (error.status === 404) console.error(`未找到技能：${slug}`);
+		if (error.status === 404) console.error(`未找到技能：${ref}`);
 		else console.error(`获取技能信息失败：${error.message}`);
 		process.exit(1);
 	}
@@ -7683,11 +7768,11 @@ async function runPackage(args, globalOpts) {
 function printPackageHelp() {
 	console.log();
 	console.log(`${BOLD$1}包命令：${RESET$3}`);
-	console.log(`  ${DIM$3}bfi package list${RESET$3}                列出包`);
-	console.log(`  ${DIM$3}bfi package info <ref>${RESET$3}          查看包详情`);
-	console.log(`  ${DIM$3}bfi package create <slug>${RESET$3}       创建新包`);
-	console.log(`  ${DIM$3}bfi package add <pkg> <skills>${RESET$3}   添加技能到包`);
-	console.log(`  ${DIM$3}bfi package remove <pkg> <skills>${RESET$3} 从包移除技能`);
+	console.log(`  ${DIM$3}bfi skills package list${RESET$3}                  列出包`);
+	console.log(`  ${DIM$3}bfi skills package info <ref>${RESET$3}           查看包详情`);
+	console.log(`  ${DIM$3}bfi skills package create <slug>${RESET$3}        创建新包`);
+	console.log(`  ${DIM$3}bfi skills package add <pkg> [skills]${RESET$3}   添加技能到包（默认全部）`);
+	console.log(`  ${DIM$3}bfi skills package remove <pkg> [skills]${RESET$3} 从包移除技能（默认全部）`);
 	console.log();
 	console.log(`${BOLD$1}选项：${RESET$3}`);
 	console.log(`  --namespace <ns>     目标命名空间`);
@@ -7697,11 +7782,11 @@ function printPackageHelp() {
 	console.log(`  --json               以 JSON 输出`);
 	console.log();
 	console.log(`${BOLD$1}示例：${RESET$3}`);
-	console.log(`  ${DIM$3}$ ${RESET$3}bfi package list --namespace myteam`);
-	console.log(`  ${DIM$3}$ ${RESET$3}bfi package info @myteam/my-package`);
-	console.log(`  ${DIM$3}$ ${RESET$3}bfi package create my-utils --namespace myteam`);
-	console.log(`  ${DIM$3}$ ${RESET$3}bfi package add @myteam/my-package @myteam/skill-a @myteam/skill-b`);
-	console.log(`  ${DIM$3}$ ${RESET$3}bfi package remove @myteam/my-package @myteam/skill-a`);
+	console.log(`  ${DIM$3}$ ${RESET$3}bfi skills package list --namespace myteam`);
+	console.log(`  ${DIM$3}$ ${RESET$3}bfi skills package info @myteam/my-package`);
+	console.log(`  ${DIM$3}$ ${RESET$3}bfi skills package create my-utils --namespace myteam`);
+	console.log(`  ${DIM$3}$ ${RESET$3}bfi skills package add @myteam/my-package @myteam/skill-a @myteam/skill-b`);
+	console.log(`  ${DIM$3}$ ${RESET$3}bfi skills package remove @myteam/my-package @myteam/skill-a`);
 	console.log();
 }
 async function handleList(args, api, globalOpts) {
@@ -7711,11 +7796,15 @@ async function handleList(args, api, globalOpts) {
 		const result = await api.listPackages(namespace);
 		const packages = result.packages || result.data || [];
 		if (json) {
-			console.log(JSON.stringify({ packages }, null, 2));
+			console.log(JSON.stringify({
+				namespace,
+				packages
+			}, null, 2));
 			return;
 		}
 		if (packages.length === 0) {
-			console.log(`No packages found in namespace "${namespace}".`);
+			console.log(`命名空间 "${namespace}" 中没有包。`);
+			console.log(`使用 --namespace <ns> 查看其他命名空间，或 bfi whoami 查看你的命名空间列表。`);
 			return;
 		}
 		console.log();
@@ -7739,11 +7828,11 @@ async function handleList(args, api, globalOpts) {
 async function handleInfo(args, api, globalOpts) {
 	const pkgRef = args[0];
 	if (!pkgRef) {
-		console.error("Usage: bfi package info <package-ref>");
+		console.error("Usage: bfi skills package info <package-ref>");
 		console.log();
 		console.log("Examples:");
-		console.log("  bfi package info @myteam/my-package");
-		console.log("  bfi package info myteam--my-package");
+		console.log("  bfi skills package info @myteam/my-package");
+		console.log("  bfi skills package info myteam--my-package");
 		process.exit(1);
 	}
 	const json = args.includes("--json");
@@ -7777,7 +7866,7 @@ async function handleInfo(args, api, globalOpts) {
 async function handleCreate(args, api, globalOpts) {
 	const slug = args[0];
 	if (!slug) {
-		console.error("用法：bfi package create <slug> [options]");
+		console.error("用法：bfi skills package create <slug> [options]");
 		process.exit(1);
 	}
 	const namespace = getOptionValue(args, "--namespace") || globalOpts.namespace || "global";
@@ -7805,12 +7894,33 @@ async function handleCreate(args, api, globalOpts) {
 async function handleAdd(args, api, globalOpts) {
 	const pkgRef = args[0];
 	const skillRefs = args.slice(1);
-	if (!pkgRef || skillRefs.length === 0) {
-		console.error("用法：bfi package add <package-ref> <skill-ref...>");
+	if (!pkgRef) {
+		console.error("用法：bfi skills package add <package-ref> [skill-ref...]");
+		console.error("  不指定技能时，添加当前命名空间的所有技能到包");
 		process.exit(1);
 	}
 	const { namespace, slug } = parseSkillRef(pkgRef, globalOpts.namespace);
-	const skills = skillRefs.map((ref) => {
+	let skills;
+	if (skillRefs.length === 0) try {
+		skills = ((await api.searchSkills("", {
+			namespace,
+			limit: 1e3
+		})).results || []).map((r) => {
+			const { namespace: ns, slug: s } = parseSkillRef(r.slug, namespace);
+			return {
+				namespace: ns,
+				slug: s
+			};
+		});
+		if (skills.length === 0) {
+			console.error(`命名空间 "${namespace}" 中没有技能。`);
+			process.exit(1);
+		}
+	} catch (error) {
+		console.error(`获取技能列表失败：${error.message}`);
+		process.exit(1);
+	}
+	else skills = skillRefs.map((ref) => {
 		const { namespace: skillNs, slug: skillSlug } = parseSkillRef(ref, namespace);
 		return {
 			namespace: skillNs,
@@ -7829,12 +7939,28 @@ async function handleAdd(args, api, globalOpts) {
 async function handleRemove(args, api, globalOpts) {
 	const pkgRef = args[0];
 	const skillRefs = args.slice(1);
-	if (!pkgRef || skillRefs.length === 0) {
-		console.error("用法：bfi package remove <package-ref> <skill-ref...>");
+	if (!pkgRef) {
+		console.error("用法：bfi skills package remove <package-ref> [skill-ref...]");
+		console.error("  不指定技能时，移除包中所有技能");
 		process.exit(1);
 	}
 	const { namespace, slug } = parseSkillRef(pkgRef, globalOpts.namespace);
-	const skills = skillRefs.map((ref) => {
+	let skills;
+	if (skillRefs.length === 0) try {
+		const existingSkills = (await api.getPackage(namespace, slug)).skills || [];
+		if (existingSkills.length === 0) {
+			console.log("包中没有技能。");
+			return;
+		}
+		skills = existingSkills.map((s) => ({
+			namespace: s.namespace || namespace,
+			slug: s.slug
+		}));
+	} catch (error) {
+		console.error(`获取包信息失败：${error.message}`);
+		process.exit(1);
+	}
+	else skills = skillRefs.map((ref) => {
 		const { namespace: skillNs, slug: skillSlug } = parseSkillRef(ref, namespace);
 		return {
 			namespace: skillNs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bfi-cli",
-  "version": "0.1.25",
+  "version": "0.1.29",
   "description": "用友大业财BFI统一命令行工具，支持技能，技能包，元数据，UI元数据等",
   "type": "module",
   "bin": {