pi-agents-switch 0.2.6 → 0.2.8

package/index.ts

@@ -881,27 +881,23 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 				}
 			}
 
-			// Replace <available_skills> block: strip whatever is there
-			// (other extensions may inject extra skills), then rebuild
-			// from our resolved skill set.
-			const skillsOpen = "\n<available_skills>";
-			const skillsIdx = content.indexOf(skillsOpen);
-			if (skillsIdx >= 0) {
-				const skillsEnd = content.indexOf("\n</available_skills>", skillsIdx);
-				if (skillsEnd >= 0) {
-					content =
-						content.substring(0, skillsIdx) +
-						content.substring(
-							skillsEnd + "\n</available_skills>".length,
-						);
+			// Replace <available_skills> block: only touch skills when the agent
+			// has explicit skill config (skillNames.length > 0).
+			// For agents without skill config, leave Pi's default skills intact.
+			if (currentResolved.skillNames.length > 0) {
+				const skillsOpen = "\n<available_skills>";
+				const skillsIdx = content.indexOf(skillsOpen);
+				if (skillsIdx >= 0) {
+					const skillsEnd = content.indexOf("\n</available_skills>", skillsIdx);
+					if (skillsEnd >= 0) {
+						content =
+							content.substring(0, skillsIdx) +
+							content.substring(skillsEnd + "\n</available_skills>".length);
+					}
 				}
-			}
 
-			// Rebuild clean skills block from our resolved config
-			if (currentResolved.skillNames.length > 0) {
-				const selectedSkills = pm.getSkillObjects(
-					currentResolved.skillNames,
-				);
+				// Rebuild clean skills block from our resolved config
+				const selectedSkills = pm.getSkillObjects(currentResolved.skillNames);
 				if (selectedSkills.length > 0) {
 					const skillsBlock = formatSkillsBlock(selectedSkills);
 					// Insert before "Current date:"
@@ -909,9 +905,7 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 					const idx = content.indexOf(currentDateMarker);
 					if (idx >= 0) {
 						content =
-							content.substring(0, idx) +
-							skillsBlock +
-							content.substring(idx);
+							content.substring(0, idx) + skillsBlock + content.substring(idx);
 					}
 				}
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-agents-switch",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "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

@@ -35,7 +35,7 @@ import {
 	statSync,
 	rmSync,
 } from "node:fs";
-import { join } from "node:path";
+import { join, basename } from "node:path";
 import { homedir } from "node:os";
 import { parseFrontmatter, serializeFrontmatter } from "./frontmatter";
 import type {
@@ -65,6 +65,9 @@ export class ProfileManager {
 	readonly configPath: string;
 	readonly piAgentDir: string;
 
+	/** Cached skill index keyed by name (rebuilt on cwd change) */
+	private skillCache: Map<string, { name: string; description: string; filePath: string }> | null = null;
+
 	constructor(private cwd?: string) {
 		const piRoot = join(homedir(), ".pi");
 		this.userAgentsDir = join(piRoot, "agents");
@@ -460,6 +463,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.
 	 */
+	/**
+	 * Look up full skill objects by name.
+	 * Scans Pi's standard skill locations recursively (flat + nested).
+	 */
 	getSkillObjects(
 		skillNames: string[],
 	): Array<{ name: string; description: string; filePath: string }> {
@@ -480,28 +487,111 @@ export class ProfileManager {
 	private findSkillOnDisk(
 		name: string,
 	): { name: string; description: string; filePath: string } | undefined {
-		const locations = [join(this.piAgentDir, "skills", name, "SKILL.md")];
+		if (!this.skillCache) {
+			this.rebuildSkillIndex();
+		}
+		return this.skillCache!.get(name);
+	}
 
-		if (this.cwd) {
-			locations.push(join(this.cwd, ".pi", "skills", name, "SKILL.md"));
+	/**
+	 * Rebuild the skill index by scanning all known skill directories.
+	 *
+	 * 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)
+	 */
+	rebuildSkillIndex(): void {
+		this.skillCache = new Map();
+
+		const scanDir = (dir: string, maxDepth: number): void => {
+			if (maxDepth <= 0) return;
+
+			// Check for SKILL.md in this directory
+			const skillMd = join(dir, "SKILL.md");
+			if (existsSync(skillMd)) {
+				try {
+					const content = readFileSync(skillMd, "utf8");
+					const { frontmatter } = parseFrontmatter(content);
+					const skillName = frontmatter.name ?? basename(dir);
+					// Last-write-wins: later scan locations override earlier ones
+					this.skillCache!.set(skillName, {
+						name: skillName,
+						description: frontmatter.description ?? "",
+						filePath: skillMd,
+					});
+				} catch {
+					// Skip unreadable files
+				}
+			}
+
+			// Recurse into subdirectories
+			try {
+				for (const entry of readdirSync(dir)) {
+					if (entry === "node_modules") continue; // skip nested node_modules
+					const sub = join(dir, entry);
+					try {
+						if (statSync(sub).isDirectory()) {
+							scanDir(sub, maxDepth - 1);
+						}
+					} catch {
+						// Skip unreadable entries
+					}
+				}
+			} catch {
+				// Skip unreadable directories
+			}
+		};
+
+		// 1. Global Pi skills (flat: skills/<name>/SKILL.md)
+		scanDir(join(this.piAgentDir, "skills"), 2);
+
+		// 2. Extension skills from npm packages (nested: node_modules/<ext>/skills/<name>/SKILL.md)
+		const npmDir = join(this.piAgentDir, "npm", "node_modules");
+		if (existsSync(npmDir)) {
+			for (const ext of readdirSync(npmDir)) {
+				const extSkills = join(npmDir, ext, "skills");
+				if (existsSync(extSkills)) {
+					try {
+						if (statSync(extSkills).isDirectory()) {
+							scanDir(extSkills, 3);
+						}
+					} catch {
+						// Skip
+					}
+				}
+			}
 		}
 
-		for (const loc of locations) {
-			if (!existsSync(loc)) continue;
+		// 3. Agent-specific skills (nested: agents/<agent>/skills/<name>/SKILL.md)
+		const agentsDir = join(homedir(), ".pi", "agents");
+		if (existsSync(agentsDir)) {
 			try {
-				const content = readFileSync(loc, "utf8");
-				const { frontmatter } = parseFrontmatter(content);
-				return {
-					name: frontmatter.name ?? name,
-					description: frontmatter.description ?? "",
-					filePath: loc,
-				};
+				for (const agent of readdirSync(agentsDir)) {
+					const agentSkills = join(agentsDir, agent, "skills");
+					if (existsSync(agentSkills)) {
+						try {
+							if (statSync(agentSkills).isDirectory()) {
+								scanDir(agentSkills, 3);
+							}
+						} catch {
+							// Skip
+						}
+					}
+				}
 			} catch {
-				// Skip unreadable files
+				// Skip unreadable agents dir
 			}
 		}
 
-		return undefined;
+		// 4. Project-level skills (flat)
+		if (this.cwd) {
+			const projSkillsDir = join(this.cwd, ".pi", "skills");
+			if (existsSync(projSkillsDir)) {
+				scanDir(projSkillsDir, 2);
+			}
+		}
 	}
 
 	// ─── Agent creation / deletion ───────────────────────