bfi-cli 0.1.44 → 0.1.55

package/dist/_chunks/agents2.mjs

@@ -4,6 +4,13 @@ import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
 const CACHE_FILE = path.join(os.homedir(), ".bfi", "agents-cache.json");
+function makeDetectInstalled(globalSkillsDir) {
+	return async () => {
+		if (!globalSkillsDir) return false;
+		const resolved = globalSkillsDir.startsWith("~/") ? path.join(os.homedir(), globalSkillsDir.slice(2)) : globalSkillsDir;
+		return fs.existsSync(resolved);
+	};
+}
 function loadCache() {
 	try {
 		if (fs.existsSync(CACHE_FILE)) {
@@ -27,21 +34,25 @@ function saveCache(agents, maxUpdatedAt) {
 	} catch {}
 }
 function mapToAgentConfig(a) {
+	const gsd = a.globalSkillsDir || void 0;
 	return {
 		name: a.name,
 		displayName: a.displayName || a.name,
 		skillsDir: a.skillsDir,
-		globalSkillsDir: a.globalSkillsDir || void 0,
-		detectInstalled: async () => false
+		globalSkillsDir: gsd,
+		sortOrder: typeof a.sortOrder === "number" ? a.sortOrder : 0,
+		detectInstalled: makeDetectInstalled(gsd)
 	};
 }
 function mapCustomEntry(name, entry) {
+	const gsd = entry.globalSkillsDir || void 0;
 	return {
 		name,
 		displayName: entry.displayName || name,
 		skillsDir: entry.skillsDir,
-		globalSkillsDir: entry.globalSkillsDir,
-		detectInstalled: async () => false
+		globalSkillsDir: gsd,
+		sortOrder: 0,
+		detectInstalled: makeDetectInstalled(gsd)
 	};
 }
 function parseLastModifiedHeader(headers) {
@@ -74,7 +85,15 @@ async function resolveAgents(api) {
 			if (cache) remoteAgents = cache.agents.map(mapToAgentConfig);
 		}
 		if (shouldSaveCache && remoteAgents) saveCache(remoteAgents, newMaxUpdatedAt);
-		if (remoteAgents) for (const agent of remoteAgents) merged.set(agent.name, agent);
+		if (remoteAgents) for (const agent of remoteAgents) {
+			const existing = merged.get(agent.name);
+			if (existing) merged.set(agent.name, {
+				...agent,
+				showInUniversalList: existing.showInUniversalList,
+				showInUniversalPrompt: existing.showInUniversalPrompt
+			});
+			else merged.set(agent.name, agent);
+		}
 	}
 	const config = loadGlobalConfig();
 	if (config?.customAgents) for (const [name, entry] of Object.entries(config.customAgents)) merged.set(name, mapCustomEntry(name, entry));

package/dist/cli.mjs

@@ -352,11 +352,15 @@ async function searchMultiselect(options) {
 			lines.push(`${icon}  ${import_picocolors.default.bold(message)}`);
 			if (state === "active") {
 				if (lockedSection && lockedSection.items.length > 0) {
+					const maxVisible = lockedSection.maxVisibleItems;
+					const visibleLocked = maxVisible && maxVisible < lockedSection.items.length ? lockedSection.items.slice(0, maxVisible) : lockedSection.items;
+					const lockedRemaining = lockedSection.items.length - visibleLocked.length;
 					lines.push(`${S_BAR}`);
 					const lockedTitle = `${import_picocolors.default.bold(lockedSection.title)} ${import_picocolors.default.dim("── always included")}`;
 					lines.push(`${S_BAR}  ${S_BAR_H}${S_BAR_H} ${lockedTitle} ${S_BAR_H.repeat(12)}`);
-					for (const item of lockedSection.items) lines.push(`${S_BAR}    ${S_BULLET} ${import_picocolors.default.bold(item.label)}`);
-					if (lockedSection.hiddenCount && lockedSection.hiddenCount > 0) lines.push(`${S_BAR}    ${import_picocolors.default.dim(`...and ${lockedSection.hiddenCount} more`)}`);
+					for (const item of visibleLocked) lines.push(`${S_BAR}    ${S_BULLET} ${import_picocolors.default.bold(item.label)}`);
+					if (lockedRemaining > 0) lines.push(`${S_BAR}    ${import_picocolors.default.dim(`...and ${lockedRemaining} more`)}`);
+					else if (lockedSection.hiddenCount && lockedSection.hiddenCount > 0) lines.push(`${S_BAR}    ${import_picocolors.default.dim(`...and ${lockedSection.hiddenCount} more`)}`);
 					lines.push(`${S_BAR}`);
 					lines.push(`${S_BAR}  ${S_BAR_H}${S_BAR_H} ${import_picocolors.default.bold("Additional agents")} ${S_BAR_H.repeat(29)}`);
 				}
@@ -2997,59 +3001,46 @@ async function selectAgentsInteractive(options) {
 	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 sortByPriority = (a, b) => {
+		const orderA = agents[a]?.sortOrder ?? 0;
+		const orderB = agents[b]?.sortOrder ?? 0;
+		if (orderA !== orderB) return orderA - orderB;
+		return (agents[a]?.displayName || a).localeCompare(agents[b]?.displayName || b);
+	};
+	universalAgents.sort(sortByPriority);
+	visibleUniversalAgents.sort(sortByPriority);
+	otherAgents.sort(sortByPriority);
 	const universalSection = {
-		title: `共享目录 (.agents/skills) — ${showAll ? "全部" : `已检测到 ${filteredUniversal.length} 个`}`,
-		items: filteredUniversal.map((a) => ({
+		title: `共享目录 (.agents/skills)${installedAgents.length > 0 ? ` — 已检测到 ${visibleUniversalAgents.filter((a) => installedSet.has(a)).length} 个` : ""}`,
+		items: visibleUniversalAgents.map((a) => ({
 			value: a,
 			label: agents[a].displayName
 		})),
-		hiddenCount: showAll ? universalAgents.length - visibleUniversalAgents.length : 0
+		hiddenCount: universalAgents.length - visibleUniversalAgents.length,
+		maxVisibleItems: 5
 	};
-	const filteredOther = showAll ? otherAgents : otherAgents.filter((a) => installedSet.has(a));
-	const otherChoices = filteredOther.map((a) => ({
+	const otherChoices = otherAgents.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;
+	let lastSelected = [];
 	try {
-		lastSelected = await getLastSelectedAgents();
+		lastSelected = await getLastSelectedAgents() || [];
 	} catch {}
 	const selected = await searchMultiselect({
 		message: "请选择要安装到的 Agent：",
 		items: otherChoices,
-		initialSelected: lastSelected ? lastSelected.filter((a) => otherAgents.includes(a) && !universalAgents.includes(a)) : [],
+		initialSelected: [.../* @__PURE__ */ new Set([...installedAgents, ...lastSelected])].filter((a) => otherAgents.includes(a) && !universalAgents.includes(a)),
 		lockedSection: universalSection
 	});
-	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 {}
-	}
+	if (!isCancelled(selected)) try {
+		await saveSelectedAgents(selected);
+	} catch {}
 	return selected;
 }
 async function handleWellKnownSkills(source, url, options, spinner) {

package/package.json

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