pi-agents-switch 0.2.7 → 0.3.0

package/README.md

@@ -53,7 +53,7 @@ The Builder will design the agent, write the AGENTS.md, and set everything up.
   ```
   ~/.pi/agents/<name>/
   ├── AGENTS.md       ← YAML frontmatter + system prompt (all-in-one)
-  ├── skills/         ← agent-specific skills (optional)
+  ├── skills/         ← agent-specific skills (auto-loaded)
   └── prompts/        ← agent-specific prompt templates (optional)
   ```
 
@@ -100,7 +100,7 @@ Each agent starts with PI's current config, then applies:
 2. **Add** items listed in `tools` / `skills`
 3. If an item appears in **both** `tools` and `excluded_tools`, `tools` wins (explicit include beats exclude)
 
-Agent-specific folders (`skills/`, `prompts/`) are always included in addition to inherited items.
+Agent-specific skills (`skills/` directory) are auto-discovered and always included.
 
 ### Fallback Chain
 
@@ -150,7 +150,7 @@ Agents are auto-discovered from the filesystem — no registration needed.
 {
   "version": 1,
   "hotkey": "f9",
-  "active": "PI"
+  "default": "PI"
 }
 ```
 

package/frontmatter.ts

@@ -172,7 +172,7 @@ export function serializeFrontmatter(fm: AgentFrontmatter): string {
 	writeArray("excluded_tools", fm.excluded_tools);
 
 	writeArray("skills", fm.skills);
-	writeArray("excluded_skills", fm.excluded_skills ?? fm.noskills);
+	writeArray("excluded_skills", fm.excluded_skills);
 
 	lines.push("---");
 	lines.push(""); // blank line before body

package/index.ts

@@ -157,9 +157,7 @@ Inventory what's available so you can make grounded recommendations:
 2. **Existing agents**: \`ls ~/.pi/agents/\` (and project \`.pi/agents/\` if applicable) → avoid name collisions
 3. **Tools currently available**: list names from your system context tool definitions
 4. **Skills currently available**: check \`<available_skills>\` block in your context, or \`ls ~/.pi/agent/skills/\` and \`ls ~/.agents/skills/\`
-5. **Extensions installed**: \`ls ~/.pi/agent/npm/node_modules/\` for pi-* packages
-
-**Never** recommend models, tools, or skills the user doesn't have installed.
+\n**Never** recommend models, tools, or skills the user doesn't have installed.
 
 ### Phase 1 — Gather requirements (single \`ask_user_question\` call, 4-6 questions)
 
@@ -225,6 +223,7 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 	let currentAgent: string = PI_AGENT_NAME;
 	let currentResolved: ResolvedAgentConfig | undefined;
 	let piSnapshot: PIStateSnapshot | undefined;
+	let sessionInitialized = false;
 
 	// ─── Helpers ────────────────────────────────────────
 
@@ -261,7 +260,7 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 	function getPIState(): PIState {
 		return {
 			tools: pi.getActiveTools(),
-			skills: [],
+			skills: pm.getPISkillNames(),
 		};
 	}
 
@@ -397,22 +396,16 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 	// ─── Agent cycling / switching ──────────────────────
 
 	async function cycleAgent(ctx?: any): Promise<void> {
-		const config = pm.loadConfig();
 		const names = [PI_AGENT_NAME, ...pm.getAgentNames()];
 		const idx = names.indexOf(currentAgent);
 		const next = names[(idx + 1) % names.length];
-		config.active = next === PI_AGENT_NAME ? PI_AGENT_NAME : next;
-		pm.saveConfig(config);
 		currentAgent = next;
 		await applyAgentSettings(ctx);
 		updateStatus(ctx);
 	}
 
 	async function switchToAgent(name: string, ctx?: any): Promise<void> {
-		const config = pm.loadConfig();
 		if (name === PI_AGENT_NAME) {
-			config.active = PI_AGENT_NAME;
-			pm.saveConfig(config);
 			currentAgent = PI_AGENT_NAME;
 			await applyAgentSettings(ctx);
 			updateStatus(ctx);
@@ -425,8 +418,6 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 			);
 			return;
 		}
-		config.active = name;
-		pm.saveConfig(config);
 		currentAgent = name;
 		await applyAgentSettings(ctx);
 		updateStatus(ctx);
@@ -702,7 +693,6 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 			}
 		}
 		if (count > 0) {
-			loadCurrentAgent(pm.loadConfig());
 			ctx.ui.notify(`Initialized ${count} default agent(s)`, "info");
 		} else {
 			ctx.ui.notify("Default agents already initialized", "info");
@@ -728,7 +718,6 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 
 	pi.on("before_agent_start", async (event, ctx) => {
 		initPM(ctx.cwd);
-		loadCurrentAgent(pm.loadConfig());
 		updateStatus(ctx);
 
 		if (currentAgent === PI_AGENT_NAME) return;
@@ -808,7 +797,6 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 		const payload = event.payload as Record<string, unknown>;
 		let changed = false;
 
-		// Temperature / topP
 		if (currentResolved.temperature !== undefined) {
 			payload.temperature = currentResolved.temperature;
 			changed = true;
@@ -818,12 +806,8 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 			changed = true;
 		}
 
-		// ---- Sanitization: prevent other extensions from contaminating ----
-		// Other extensions (e.g. pi-lens) may override our tools and prompt
-		// in before_agent_start (last-runner-wins). We re-apply our config
-		// here as the final defence before the API call.
-
-		// 1. Filter tools — only allow resolved tools
+		// Filter tools at the API level — last defence against other
+		// extensions (e.g. pi-lens) overriding our tool set.
 		const allowedTools = new Set(currentResolved.tools);
 		const rawTools = payload.tools as
 			| Array<{ function?: { name?: string } }>
@@ -836,113 +820,6 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 			if ((payload.tools as Array<any>).length !== before) changed = true;
 		}
 
-		// 2. Clean system message — replace contaminated sections
-		const messages = payload.messages as
-			| Array<{ role: string; content: string }>
-			| undefined;
-		if (messages && messages.length > 0 && messages[0]?.role === "system") {
-			let content: string = messages[0].content;
-			const originalLen = content.length;
-
-			// Strip the "Available tools:" block (other extensions may inject their own)
-			// Format: "Available tools:\n- name: desc\n..."
-			// We replace it with our clean version.
-			const toolsMarker = "\nAvailable tools:";
-			const toolsIdx = content.indexOf(toolsMarker);
-			if (toolsIdx >= 0) {
-				// Find where the tools block ends (next section or empty line before next section)
-				const nextSection = content.indexOf(
-					"\nIn addition to the tools above",
-					toolsIdx,
-				);
-				if (nextSection >= 0) {
-					// Build clean tools list
-					if (currentResolved.tools.length === 0) {
-						content =
-							content.substring(0, toolsIdx) +
-							"\nAvailable tools:\n(none)\n" +
-							content.substring(nextSection);
-					} else {
-						// Rebuild clean tools from tool snippets if available
-						const snippets = pi.getAllTools();
-						const cleanLines = currentResolved.tools
-							.map((name) => {
-								const tool = snippets.find((t) => t.name === name);
-								return tool
-									? `- ${tool.name}: ${tool.description ?? ""}`
-									: `- ${name}`;
-							})
-							.join("\n");
-						content =
-							content.substring(0, toolsIdx) +
-							`\nAvailable tools:\n${cleanLines}\n` +
-							content.substring(nextSection);
-					}
-				}
-			}
-
-			// 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
-				const selectedSkills = pm.getSkillObjects(
-					currentResolved.skillNames,
-				);
-				if (selectedSkills.length > 0) {
-					const skillsBlock = formatSkillsBlock(selectedSkills);
-					// Insert before "Current date:"
-					const currentDateMarker = "\nCurrent date:";
-					const idx = content.indexOf(currentDateMarker);
-					if (idx >= 0) {
-						content =
-							content.substring(0, idx) +
-							skillsBlock +
-							content.substring(idx);
-					}
-				}
-			}
-
-			// Strip "Pi documentation" block (pi-lens may re-add after our handler strips it)
-			const piDocsMarker =
-				"Pi documentation (read only when the user asks about pi itself";
-			const piDocsStart = content.indexOf(piDocsMarker);
-			if (piDocsStart >= 0) {
-				const currentDateMarker = "\nCurrent date:";
-				const currentDateStart = content.indexOf(
-					currentDateMarker,
-					piDocsStart,
-				);
-				if (currentDateStart >= 0) {
-					content =
-						content.substring(0, piDocsStart) +
-						content.substring(currentDateStart);
-				}
-			}
-
-			if (content.length !== originalLen) {
-				messages[0].content = content;
-				changed = true;
-			}
-		}
-
-		// Return payload only if we changed something (otherwise Pi uses default)
 		if (changed) return payload;
 	});
 
@@ -950,8 +827,15 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 
 	pi.on("session_start", async (_event, ctx) => {
 		initPM(ctx.cwd);
-		const config = pm.loadConfig();
-		loadCurrentAgent(config);
+
+		// Only restore from config on the very first session_start
+		// within this process. After that, use in-memory state.
+		if (!sessionInitialized) {
+			const config = pm.loadConfig();
+			if (config.default) loadCurrentAgent(config);
+			sessionInitialized = true;
+		}
+
 		// Apply agent settings immediately so tools/model/thinking
 		// are set before the first prompt builds the system prompt.
 		await applyAgentSettings(ctx);

package/package.json

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

@@ -8,7 +8,6 @@
  * Profile dir layout:
  *   ~/.pi/agents/<name>/          ← user-level agent
  *   ├── AGENTS.md                 ← YAML frontmatter + system prompt
- *   ├── extensions/               ← agent-specific extensions
  *   ├── skills/                   ← agent-specific skills
  *   └── prompts/                  ← agent-specific prompt templates
  *
@@ -21,7 +20,7 @@
  *   3. PI defaults (from running pi environment)
  *
  * Last-write-wins: when the same item appears in both tools and
- * excluded_tools (or extensions/excluded_extensions, skills/excluded_skills),
+ * excluded_tools (or skills/excluded_skills),
  * whichever YAML key was declared LAST in the file wins.
  * `"*"` in any exclude list removes everything except items explicitly added.
  */
@@ -35,7 +34,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 +64,12 @@ 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; source: string }
+	> | null = null;
+
 	constructor(private cwd?: string) {
 		const piRoot = join(homedir(), ".pi");
 		this.userAgentsDir = join(piRoot, "agents");
@@ -90,9 +95,14 @@ export class ProfileManager {
 
 		try {
 			const raw = readFileSync(this.configPath, "utf8");
-			const cfg = JSON.parse(raw) as AgentsConfig;
+			const cfg = JSON.parse(raw) as AgentsConfig & { active?: string };
 			if (cfg.version !== 1) throw new Error("Unsupported config version");
-			return cfg;
+			// Migrate from deprecated `active` to `default`
+			if (cfg.active !== undefined && cfg.default === undefined) {
+				cfg.default = cfg.active;
+				this.saveConfig(cfg as AgentsConfig);
+			}
+			return cfg as AgentsConfig;
 		} catch (err) {
 			const corruptPath = this.configPath + ".corrupted." + Date.now();
 			try {
@@ -156,7 +166,6 @@ export class ProfileManager {
 				if (existing) {
 					existing.path = path;
 					existing.hasAgentsMd = existsSync(join(path, "AGENTS.md"));
-					existing.hasExtensions = existsSync(join(path, "extensions"));
 					existing.hasSkills = existsSync(join(path, "skills"));
 					existing.source = "project";
 				} else {
@@ -177,7 +186,6 @@ export class ProfileManager {
 			name,
 			path,
 			hasAgentsMd: existsSync(join(path, "AGENTS.md")),
-			hasExtensions: existsSync(join(path, "extensions")),
 			hasSkills: existsSync(join(path, "skills")),
 			source,
 		};
@@ -351,24 +359,34 @@ export class ProfileManager {
 			keyOrder,
 		);
 
-		// Skills: prefer excluded_skills, fall back to deprecated noskills
-		const skillExclude = fm.excluded_skills ?? fm.noskills;
-		const skillExcludeKey =
+		// Skills: resolve PI's base, then auto-append agent's own skills
+		const agentSkillNames = this.getAgentSkillNames(
+			name,
+			agentPath,
+			projectPath,
+		);
+		const resolvedSkills =
 			fm.excluded_skills !== undefined
-				? "excluded_skills"
-				: fm.noskills !== undefined
-					? "noskills"
-					: undefined;
-		const skillPaths = skillExcludeKey
-			? this.resolveList(
-					pi.skills,
-					skillExclude,
-					fm.skills,
-					"skills",
-					skillExcludeKey,
-					keyOrder,
-				)
-			: [...pi.skills, ...(fm.skills ?? [])];
+				? this.resolveList(
+						pi.skills,
+						fm.excluded_skills,
+						fm.skills,
+						"skills",
+						"excluded_skills",
+						keyOrder,
+					)
+				: [...pi.skills, ...(fm.skills ?? [])];
+
+		// Agent skills are always available, unless explicitly excluded by name
+		const excludedSet = new Set(fm.excluded_skills ?? []);
+		const resolvedSet = new Set(resolvedSkills);
+		for (const skill of agentSkillNames) {
+			if (!excludedSet.has(skill) && !resolvedSet.has(skill)) {
+				resolvedSkills.push(skill);
+			}
+		}
+
+		const skillPaths = resolvedSkills;
 
 		const sourcePath = projectPath ?? agentPath ?? "PI (default)";
 
@@ -460,6 +478,67 @@ 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). */
+	getPISkillNames(): string[] {
+		if (!this.skillCache) this.rebuildSkillIndex();
+		return [...this.skillCache!.entries()]
+			.filter(([, v]) => v.source !== "agent")
+			.map(([k]) => k);
+	}
+
+	/**
+	 * Discover skill names from an agent's own skills/ directory.
+	 * Scans both user-level (~/.pi/agents/<name>/skills/) and
+	 * project-level (<cwd>/.pi/agents/<name>/skills/) locations.
+	 */
+	getAgentSkillNames(
+		name: string,
+		agentPath?: string,
+		projectPath?: string,
+	): string[] {
+		const names = new Set<string>();
+
+		const scanDir = (dir: string): boolean => {
+			if (!existsSync(dir)) return false;
+			try {
+				for (const entry of readdirSync(dir)) {
+					const full = join(dir, entry);
+					try {
+						if (
+							statSync(full).isDirectory() &&
+							existsSync(join(full, "SKILL.md"))
+						) {
+							names.add(entry);
+						}
+					} catch {
+						// skip
+					}
+				}
+				return true;
+			} catch {
+				return false;
+			}
+		};
+
+		// User-level agent skills
+		const userSkillsDir = join(this.agentPath(name), "skills");
+		scanDir(userSkillsDir);
+
+		// Project-level agent skills (if known)
+		if (projectPath) {
+			scanDir(join(projectPath, "skills"));
+		} else if (agentPath && agentPath !== this.agentPath(name)) {
+			// agentPath might already be the project path
+			scanDir(join(agentPath, "skills"));
+		}
+
+		return [...names];
+	}
+
+	/**
+	 * 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 +559,102 @@ 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, source: string): 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);
+					this.skillCache!.set(skillName, {
+						name: skillName,
+						description: frontmatter.description ?? "",
+						filePath: skillMd,
+						source,
+					});
+				} catch {}
+			}
+
+			try {
+				for (const entry of readdirSync(dir)) {
+					if (entry === "node_modules") continue;
+					const sub = join(dir, entry);
+					try {
+						if (statSync(sub).isDirectory()) scanDir(sub, maxDepth - 1, source);
+					} catch {}
+				}
+			} catch {}
+		};
+
+		// 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)
+		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, "extension");
+						}
+					} 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, "agent");
+							}
+						} 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, "project");
+			}
+		}
 	}
 
 	// ─── Agent creation / deletion ───────────────────────
@@ -531,7 +684,6 @@ export class ProfileManager {
 		// Build directory structure
 		try {
 			mkdirSync(path, { recursive: true });
-			mkdirSync(join(path, "extensions"));
 			mkdirSync(join(path, "skills"));
 			mkdirSync(join(path, "prompts"));
 		} catch (err) {
@@ -579,8 +731,8 @@ Edit this file to customize your behavior.
 		rmSync(path, { recursive: true, force: true });
 
 		const config = this.loadConfig();
-		if (config.active === name) {
-			delete config.active;
+		if (config.default === name) {
+			delete config.default;
 		}
 		this.saveConfig(config);
 	}
@@ -592,8 +744,8 @@ Edit this file to customize your behavior.
 	 * Falls back to "PI" if nothing is set or the configured agent no longer exists.
 	 */
 	getActive(config: AgentsConfig): string {
-		if (config.active && this.exists(config.active)) {
-			return config.active;
+		if (config.default && this.exists(config.default)) {
+			return config.default;
 		}
 		return "PI";
 	}

package/types.ts

@@ -51,11 +51,8 @@ export interface AgentFrontmatter {
 	skills?: string[];
 	/**
 	 * Skills to REMOVE (from PI's inherited set). Supports `"*"` wildcard.
-	 * Preferred over deprecated `noskills`.
 	 */
 	excluded_skills?: string[];
-	/** @deprecated Use `excluded_skills` instead. Still recognized for backward compat. */
-	noskills?: string[];
 }
 
 // ─── Frontmatter parse result ──────────────────────────────
@@ -116,7 +113,7 @@ export interface AgentsConfig {
 	/** Key string like "f9" or "ctrl+shift+a" */
 	hotkey?: KeyId;
 	/** Which agent is currently active ("PI" or a custom agent name) */
-	active?: string;
+	default?: string;
 }
 
 // ─── Disk Profile ──────────────────────────────────────────
@@ -129,8 +126,6 @@ export interface AgentDiskProfile {
 	path: string;
 	/** Has an AGENTS.md file */
 	hasAgentsMd: boolean;
-	/** Has an extensions/ subdirectory */
-	hasExtensions: boolean;
 	/** Has a skills/ subdirectory */
 	hasSkills: boolean;
 	/** Agent source scope */