pi-agents-switch 0.3.0 → 0.3.1

package/index.ts

@@ -760,20 +760,35 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 		if (currentResolved && currentResolved.skillNames.length > 0) {
 			const loadedSkills = (event.systemPromptOptions as { skills?: any[] })
 				.skills;
-			let selectedSkills: Array<{
-				name: string;
-				description: string;
-				filePath: string;
-			}>;
-
-			if (loadedSkills && loadedSkills.length > 0) {
-				selectedSkills = loadedSkills.filter((s) =>
-					currentResolved!.skillNames.includes(s.name),
-				);
-			} else {
-				selectedSkills = pm.getSkillObjects(currentResolved.skillNames);
+			const skillMap = new Map<
+				string,
+				{ name: string; description: string; filePath: string }
+			>();
+
+			// Collect from Pi's loaded skills first (richest data)
+			if (loadedSkills) {
+				for (const s of loadedSkills) {
+					skillMap.set(s.name, {
+						name: s.name,
+						description: s.description ?? "",
+						filePath: s.filePath ?? "",
+					});
+				}
 			}
 
+			// Fill gaps from disk (agent-specific skills not in Pi's loaded list)
+			for (const name of currentResolved.skillNames) {
+				if (!skillMap.has(name)) {
+					const found = pm.getSkillObjects([name]);
+					if (found.length > 0) skillMap.set(found[0].name, found[0]);
+				}
+			}
+
+			// Filter to only resolved names, preserving order
+			const selectedSkills = currentResolved.skillNames
+				.map((name) => skillMap.get(name))
+				.filter((s): s is NonNullable<typeof s> => s != null);
+
 			if (selectedSkills.length > 0) {
 				const skillsBlock = formatSkillsBlock(selectedSkills);
 				const currentDateMarker = "\nCurrent date:";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-agents-switch",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Tab to switch primary agents in Pi — like OpenCode's agent switching. Each agent gets an isolated profile with its own AGENTS.md, extensions, skills, and settings.",
   "type": "module",
   "pi": {