pi-agents-switch 0.3.0 → 0.3.2

package/README.md

@@ -12,6 +12,10 @@ pi install ~/project/agents-switch
 
 Then `/reload` in pi.
 
+> **Requires Pi ≥ v0.x** (tested with the version shipping `before_agent_start` + `before_provider_request` events).
+> If Pi's system prompt format changes, agent identity will be prepended instead of replacing the default role line —
+> check the Pi console for a `[agents-switch]` warning if this happens.
+
 ## Usage
 
 | Action | How |

package/index.ts

@@ -752,6 +752,12 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 					section +
 					newPrompt.substring(roleEnd);
 			} else {
+				// Pi version mismatch — role line changed. Fall back to prepend.
+				console.warn(
+					"[agents-switch] Default role line not found in system prompt. " +
+						"Pi may have changed its prompt format. " +
+						"Agent identity will be prepended instead of replacing the role line.",
+				);
 				newPrompt = section + "\n\n" + newPrompt;
 			}
 		}
@@ -760,20 +766,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.2",
   "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": {

package/profile-manager.ts

@@ -478,12 +478,10 @@ export class ProfileManager {
 	 * Look up full skill objects by name from Pi's standard skill directories.
 	 * Returns name, description, and filePath for each skill found.
 	 */
-	/** Get PI skill names (global + extension + project, excluding agent-scoped). */
+	/** Get all indexed skill names (global + extension + project). */
 	getPISkillNames(): string[] {
 		if (!this.skillCache) this.rebuildSkillIndex();
-		return [...this.skillCache!.entries()]
-			.filter(([, v]) => v.source !== "agent")
-			.map(([k]) => k);
+		return [...this.skillCache!.keys()];
 	}
 
 	/**
@@ -562,17 +560,76 @@ export class ProfileManager {
 		if (!this.skillCache) {
 			this.rebuildSkillIndex();
 		}
-		return this.skillCache!.get(name);
+		const cached = this.skillCache!.get(name);
+		if (cached) return cached;
+
+		// Fallback: agent-specific skills are not indexed globally.
+		// Check each agent's skills/ dir on demand.
+		return this.findAgentSkillOnDisk(name);
+	}
+
+	/**
+	 * Look up a single agent-specific skill by checking each agent's
+	 * skills/<name>/SKILL.md path directly.
+	 */
+	private findAgentSkillOnDisk(
+		name: string,
+	): { name: string; description: string; filePath: string } | undefined {
+		const read = (
+			filePath: string,
+		): { name: string; description: string; filePath: string } | undefined => {
+			if (!existsSync(filePath)) return undefined;
+			try {
+				const content = readFileSync(filePath, "utf8");
+				const { frontmatter } = parseFrontmatter(content);
+				return {
+					name: frontmatter.name ?? name,
+					description: frontmatter.description ?? "",
+					filePath,
+				};
+			} catch {
+				return undefined;
+			}
+		};
+
+		// User-level agents
+		const userDir = join(homedir(), ".pi", "agents");
+		if (existsSync(userDir)) {
+			try {
+				for (const agent of readdirSync(userDir)) {
+					const found = read(join(userDir, agent, "skills", name, "SKILL.md"));
+					if (found) return found;
+				}
+			} catch {}
+		}
+
+		// Project-level agents
+		if (this.cwd) {
+			const projDir = join(this.cwd, ".pi", "agents");
+			if (existsSync(projDir)) {
+				try {
+					for (const agent of readdirSync(projDir)) {
+						const found = read(
+							join(projDir, agent, "skills", name, "SKILL.md"),
+						);
+						if (found) return found;
+					}
+				} catch {}
+			}
+		}
+
+		return undefined;
 	}
 
 	/**
-	 * Rebuild the skill index by scanning all known skill directories.
+	 * Rebuild the skill index by scanning known skill directories.
+	 * Agent-specific skills are NOT indexed here — they are looked up
+	 * on demand via findSkillOnDisk → scanForAgentSkill().
 	 *
 	 * Locations scanned:
 	 *   1. ~/.pi/agent/skills/<name>/SKILL.md            (flat, user-installed)
 	 *   2. ~/.pi/agent/npm/node_modules/<ext>/skills/    (extension skills)
-	 *   3. ~/.pi/agents/<agent>/skills/                  (agent-specific skills)
-	 *   4. <cwd>/.pi/skills/                             (project skills, flat)
+	 *   3. <cwd>/.pi/skills/                             (project skills, flat)
 	 */
 	rebuildSkillIndex(): void {
 		this.skillCache = new Map();
@@ -580,7 +637,6 @@ export class ProfileManager {
 		const scanDir = (dir: string, maxDepth: number, source: string): void => {
 			if (maxDepth <= 0) return;
 
-			// Check for SKILL.md in this directory
 			const skillMd = join(dir, "SKILL.md");
 			if (existsSync(skillMd)) {
 				try {
@@ -610,7 +666,7 @@ export class ProfileManager {
 		// 1. Global Pi skills
 		scanDir(join(this.piAgentDir, "skills"), 2, "global");
 
-		// 2. Extension skills from npm packages (nested: node_modules/<ext>/skills/<name>/SKILL.md)
+		// 2. Extension skills from npm packages
 		const npmDir = join(this.piAgentDir, "npm", "node_modules");
 		if (existsSync(npmDir)) {
 			for (const ext of readdirSync(npmDir)) {
@@ -620,35 +676,12 @@ export class ProfileManager {
 						if (statSync(extSkills).isDirectory()) {
 							scanDir(extSkills, 3, "extension");
 						}
-					} catch {
-						// Skip
-					}
-				}
-			}
-		}
-
-		// 3. Agent-specific skills (nested: agents/<agent>/skills/<name>/SKILL.md)
-		const agentsDir = join(homedir(), ".pi", "agents");
-		if (existsSync(agentsDir)) {
-			try {
-				for (const agent of readdirSync(agentsDir)) {
-					const agentSkills = join(agentsDir, agent, "skills");
-					if (existsSync(agentSkills)) {
-						try {
-							if (statSync(agentSkills).isDirectory()) {
-								scanDir(agentSkills, 3, "agent");
-							}
-						} catch {
-							// Skip
-						}
-					}
+					} catch {}
 				}
-			} catch {
-				// Skip unreadable agents dir
 			}
 		}
 
-		// 4. Project-level skills (flat)
+		// 3. Project-level skills
 		if (this.cwd) {
 			const projSkillsDir = join(this.cwd, ".pi", "skills");
 			if (existsSync(projSkillsDir)) {