bfi-cli 0.1.20 → 0.1.24

package/dist/cli.mjs

@@ -28,6 +28,7 @@ import { determineAgent } from "@vercel/detect-agent";
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
 const GIT_HOST = process.env.BFI_GIT_HOST || "git.yyrd.com";
 const GIT_URL = `https://${GIT_HOST}`;
+const GIT_SOURCE_TYPE = GIT_HOST === "github.com" ? "github" : "gitlab";
 function getOwnerRepo(parsed) {
 	if (parsed.type === "local") return null;
 	const sshMatch = parsed.url.match(/^git@[^:]+:(.+)$/);
@@ -212,7 +213,7 @@ function parseSource(input) {
 	if (atSkillMatch && !input.includes(":") && !input.startsWith(".") && !input.startsWith("/")) {
 		const [, owner, repo, skillFilter] = atSkillMatch;
 		return {
-			type: "github",
+			type: GIT_SOURCE_TYPE,
 			url: `${GIT_URL}/${owner}/${repo}.git`,
 			...fragmentRef ? { ref: fragmentRef } : {},
 			skillFilter: fragmentSkillFilter || skillFilter
@@ -222,7 +223,7 @@ function parseSource(input) {
 	if (shorthandMatch && !input.includes(":") && !input.startsWith(".") && !input.startsWith("/")) {
 		const [, owner, repo, subpath] = shorthandMatch;
 		return {
-			type: "github",
+			type: GIT_SOURCE_TYPE,
 			url: `${GIT_URL}/${owner}/${repo}.git`,
 			...fragmentRef ? { ref: fragmentRef } : {},
 			subpath: subpath ? sanitizeSubpath(subpath) : subpath,
@@ -4003,15 +4004,20 @@ function splitAgentsByType(agentTypes) {
 		symlinked
 	};
 }
-function buildAgentSummaryLines(targetAgents, installMode) {
+function buildAgentSummaryLines(targetAgents, installMode, selectedAgents) {
 	const lines = [];
 	const { universal, symlinked } = splitAgentsByType(targetAgents);
+	const selectedSet = new Set(selectedAgents || targetAgents);
 	if (installMode === "symlink") {
-		if (universal.length > 0) lines.push(`  ${import_picocolors.default.green("共享目录：")} ${formatList$1(universal)}`);
-		if (symlinked.length > 0) lines.push(`  ${import_picocolors.default.dim("符号链接 →")} ${formatList$1(symlinked)}`);
+		const selectedUniversal = universal.filter((a) => selectedSet.has(a));
+		const selectedSymlink = symlinked.filter((a) => selectedSet.has(a));
+		if (selectedUniversal.length > 0) lines.push(`  ${import_picocolors.default.green("共享目录：")} ${formatList$1(selectedUniversal)}`);
+		if (selectedSymlink.length > 0) lines.push(`  ${import_picocolors.default.dim("符号链接 →")} ${formatList$1(selectedSymlink)}`);
+		const otherUniversal = universal.filter((a) => !selectedSet.has(a));
+		if (otherUniversal.length > 0) lines.push(`  ${import_picocolors.default.dim(`（另外 ${otherUniversal.length} 个使用共享目录的 Agent 也会自动获得此技能）`)}`);
 	} else {
-		const allNames = targetAgents.map((a) => agents[a].displayName);
-		lines.push(`  ${import_picocolors.default.dim("copy →")} ${formatList$1(allNames)}`);
+		const allNames = targetAgents.filter((a) => selectedSet.has(a)).map((a) => agents[a].displayName);
+		lines.push(`  ${import_picocolors.default.dim("复制 →")} ${formatList$1(allNames)}`);
 	}
 	return lines;
 }
@@ -4037,7 +4043,7 @@ function buildTargetSummaryLines(targets, installMode) {
 	const subagentNames = targets.filter((t) => t.subagent).map(targetDisplayName);
 	const { universal, symlinked } = splitAgentsByType(rootAgents);
 	if (installMode === "symlink") {
-		if (universal.length > 0) lines.push(`  ${import_picocolors.default.green("共享目录：")} ${formatList$1(universal)}`);
+		if (universal.length > 0) lines.push(`  ${import_picocolors.default.green("共享目录：")} ${formatList$1(universal, 3)}`);
 		if (symlinked.length > 0) lines.push(`  ${import_picocolors.default.dim("符号链接 →")} ${formatList$1(symlinked)}`);
 		if (subagentNames.length > 0) lines.push(`  ${import_picocolors.default.dim("copy →")} ${formatList$1(subagentNames)}`);
 	} else {
@@ -4096,22 +4102,36 @@ async function promptForAgents(message, choices) {
 }
 async function selectAgentsInteractive(options) {
 	const supportsGlobalFilter = (a) => !options.global || agents[a].globalSkillsDir;
+	let installedAgents = [];
+	try {
+		installedAgents = await detectInstalledAgents();
+	} catch {}
+	const hasDetected = installedAgents.length > 0;
+	const installedSet = new Set(installedAgents);
 	const universalAgents = getUniversalAgents().filter(supportsGlobalFilter);
 	const visibleUniversalAgents = getVisibleUniversalAgents().filter(supportsGlobalFilter);
 	const otherAgents = getNonUniversalAgents().filter((agent) => agent !== "eve" && supportsGlobalFilter(agent));
+	const showAll = hasDetected ? false : true;
+	const filteredUniversal = showAll ? visibleUniversalAgents : visibleUniversalAgents.filter((a) => installedSet.has(a));
 	const universalSection = {
-		title: "共享目录 (.agents/skills)",
-		items: visibleUniversalAgents.map((a) => ({
+		title: `共享目录 (.agents/skills) — ${showAll ? "全部" : `已检测到 ${filteredUniversal.length} 个`}`,
+		items: filteredUniversal.map((a) => ({
 			value: a,
 			label: agents[a].displayName
 		})),
-		hiddenCount: universalAgents.length - visibleUniversalAgents.length
+		hiddenCount: showAll ? universalAgents.length - visibleUniversalAgents.length : 0
 	};
-	const otherChoices = otherAgents.map((a) => ({
+	const filteredOther = showAll ? otherAgents : otherAgents.filter((a) => installedSet.has(a));
+	const otherChoices = filteredOther.map((a) => ({
 		value: a,
 		label: agents[a].displayName,
 		hint: options.global ? agents[a].globalSkillsDir : agents[a].skillsDir
 	}));
+	if (!showAll && otherAgents.length > filteredOther.length) otherChoices.push({
+		value: "__show_all__",
+		label: `显示全部 ${otherAgents.length + universalAgents.length} 个 Agent...`,
+		hint: "包括未检测到的"
+	});
 	let lastSelected;
 	try {
 		lastSelected = await getLastSelectedAgents();
@@ -4122,9 +4142,23 @@ async function selectAgentsInteractive(options) {
 		initialSelected: lastSelected ? lastSelected.filter((a) => otherAgents.includes(a) && !universalAgents.includes(a)) : [],
 		lockedSection: universalSection
 	});
-	if (!isCancelled(selected)) try {
-		await saveSelectedAgents(selected);
-	} catch {}
+	if (!isCancelled(selected)) {
+		const selection = selected;
+		if (selection.includes("__show_all__")) {
+			const allSelected = [
+				...selection.filter((s) => s !== "__show_all__"),
+				...otherAgents.filter((a) => !installedSet.has(a)),
+				...universalAgents.filter((a) => !installedSet.has(a))
+			];
+			try {
+				await saveSelectedAgents(allSelected);
+			} catch {}
+			return [...new Set(allSelected)];
+		}
+		try {
+			await saveSelectedAgents(selection);
+		} catch {}
+	}
 	return selected;
 }
 async function handleWellKnownSkills(source, url, options, spinner) {
@@ -4401,6 +4435,18 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 	outro(import_picocolors.default.green("完成！") + import_picocolors.default.dim("  使用前请审阅技能；技能以 Agent 的全部权限运行。"));
 	await promptForFindSkills(options, targetAgents);
 }
+async function cloneWithGitHubFallback(url, ref, spinner) {
+	try {
+		spinner.start("正在克隆仓库...");
+		return await cloneRepo(url, ref);
+	} catch (error) {
+		if (error instanceof GitCloneError && !url.includes("github.com")) {
+			spinner.message(`GitLab 未找到，降级到 GitHub: ${url.replace(/https:\/\/[^/]+\//, "https://github.com/")}`);
+			return await cloneRepo(url.replace(/https:\/\/[^/]+\//, "https://github.com/"), ref);
+		}
+		throw error;
+	}
+}
 async function installFromSkillHub(parsed, options, spinner) {
 	const config = resolveConfig();
 	const api = new SkillHubAPI(config.registry, config.token);
@@ -4625,8 +4671,7 @@ async function runAdd(args, options = {}) {
 				skills = blobResult.skills;
 				spinner$2.stop(`Found ${import_picocolors.default.green(skills.length)} skill${skills.length > 1 ? "s" : ""}`);
 			} else {
-				spinner$2.start("正在克隆仓库...");
-				tempDir = await cloneRepo(parsed.url, parsed.ref);
+				tempDir = await cloneWithGitHubFallback(parsed.url, parsed.ref, spinner$2);
 				spinner$2.stop("仓库克隆完成");
 				spinner$2.start("正在发现技能...");
 				skills = await discoverSkills(tempDir, parsed.subpath, {
@@ -4635,8 +4680,7 @@ async function runAdd(args, options = {}) {
 				});
 			}
 		} else {
-			spinner$2.start("正在克隆仓库...");
-			tempDir = await cloneRepo(parsed.url, parsed.ref);
+			tempDir = await cloneWithGitHubFallback(parsed.url, parsed.ref, spinner$2);
 			spinner$2.stop("仓库克隆完成");
 			spinner$2.start("正在发现技能...");
 			skills = await discoverSkills(tempDir, parsed.subpath, {
@@ -6923,9 +6967,10 @@ async function searchMarketplace(query) {
 		for (const skill of skills.slice(0, 12)) {
 			const installs = formatInstalls(skill.installs);
 			console.log(`  ${BOLD$5}${skill.name}${RESET$8}`);
-			if (skill.source) console.log(`  ${DIM$8}source: ${skill.source}${RESET$8}`);
+			if (skill.source) console.log(`  ${DIM$8}来源：${skill.source}${RESET$8}`);
 			if (installs) console.log(`  ${CYAN}${installs}${RESET$8}`);
 			console.log(`  ${TEXT$7}https://skills.sh/${skill.id}${RESET$8}`);
+			if (skill.source) console.log(`  ${DIM$8}安装：${TEXT$7}BFI_GIT_HOST=github.com bfi skills add ${skill.source}${RESET$8}`);
 			console.log();
 		}
 	} catch {

package/package.json

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