pi-agents-switch 0.2.3 → 0.2.5

package/README.md

@@ -53,7 +53,6 @@ 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)
-  ├── extensions/     ← agent-specific extensions (optional)
   ├── skills/         ← agent-specific skills (optional)
   └── prompts/        ← agent-specific prompt templates (optional)
   ```
@@ -80,14 +79,10 @@ excluded_tools:
   - edit
   - write
 
-# Extensions / skills (same inheritance pattern)
-extensions:
-  - my-custom-ext
-noextensions:
-  - annoying-ext
+# Skills (same inheritance pattern)
 skills:
   - my-skill
-noskills:
+excluded_skills:
   - noisy-skill
 ---
 
@@ -101,11 +96,11 @@ Your role and specific instructions go here.
 
 Each agent starts with PI's current config, then applies:
 
-1. **Remove** items listed in `excluded_tools` / `noextensions` / `noskills`
-2. **Add** items listed in `tools` / `extensions` / `skills`
+1. **Remove** items listed in `excluded_tools` / `excluded_skills`
+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 (`extensions/`, `skills/`, `prompts/`) are always included in addition to inherited items.
+Agent-specific folders (`skills/`, `prompts/`) are always included in addition to inherited items.
 
 ### Fallback Chain
 
@@ -113,7 +108,7 @@ When resolving an agent's config:
 
 1. **Agent-level**: `~/.pi/agents/<name>/AGENTS.md`
 2. **Project-level**: `<cwd>/.pi/agents/<name>/AGENTS.md` — overrides agent-level fields
-3. **PI defaults**: tools/extensions/skills from your running PI config
+3. **PI defaults**: tools/skills from your running PI config
 
 ## Creating agents
 
@@ -172,10 +167,8 @@ Agents are auto-discovered from the filesystem — no registration needed.
 | `topP` | number | Nucleus sampling threshold (0-1) |
 | `tools` | string[] | Tools to ADD after inheritance |
 | `excluded_tools` | string[] | Tools to REMOVE from PI's inherited set |
-| `extensions` | string[] | Extensions to ADD |
-| `noextensions` | string[] | Extensions to REMOVE |
 | `skills` | string[] | Skills to ADD |
-| `noskills` | string[] | Skills to REMOVE |
+| `excluded_skills` | string[] | Skills to REMOVE |
 
 The Markdown body (everything after the last `---`) is the **system prompt** injected before each agent turn.
 

package/frontmatter.ts

@@ -170,8 +170,7 @@ export function serializeFrontmatter(fm: AgentFrontmatter): string {
 
 	writeArray("tools", fm.tools);
 	writeArray("excluded_tools", fm.excluded_tools);
-	writeArray("extensions", fm.extensions);
-	writeArray("excluded_extensions", fm.excluded_extensions ?? fm.noextensions);
+
 	writeArray("skills", fm.skills);
 	writeArray("excluded_skills", fm.excluded_skills ?? fm.noskills);
 

package/index.ts

@@ -109,12 +109,6 @@ excluded_tools:                 # Tools to REMOVE from PI's default set
 tools:                          # Tools to ADD
   -what you want
 
-excluded_extensions:                   # Extensions to REMOVE
-  - annoying-ext
-
-extensions:                     # Extensions to ADD
-  - my-extension
-
 excluded_skills:                       # Skills to REMOVE
   - noisy-skill
 
@@ -132,14 +126,14 @@ Your behavior instructions...
 
 Every agent starts with what PI already has, then:
 
-1. **Remove** items in \`excluded_tools\` / \`excluded_extensions\` / \`excluded_skills\`
-2. **Add** items in \`tools\` / \`extensions\` / \`skills\`
+1. **Remove** items in \`excluded_tools\` / \`excluded_skills\`
+2. **Add** items in \`tools\` / \`skills\`
 3. - **Order matters.** If the same item appears in both an exclude field and an add field, the later declaration wins.
   - \`excluded_tools: [read]\` then \`tools: [read]\` → \`read\` is added.
   - \`tools: [read]\` then \`excluded_tools: [read]\` → \`read\` is removed.
   - \`*\` means "all" for that category.
 
-If you want to keep only a small set of tools/skills/extensions, exclude everything with \`*\` and add back what you need.
+If you want to keep only a small set of tools/skills, exclude everything with \`*\` and add back what you need.
 If you want to exclude just a few items, add \`*\` to the include list and use the exclude to remove the unwanted ones.
 
 ### Agent Directory Structure
@@ -147,7 +141,6 @@ If you want to exclude just a few items, add \`*\` to the include list and use t
 \`\`\`
 ~/.pi/agents/<name>/
 ├── AGENTS.md          ← YAML frontmatter + system prompt (THE ONLY REQUIRED FILE)
-├── extensions/        ← Agent-specific extensions (mkdir)
 ├── skills/            ← Agent-specific skills (mkdir)
 └── prompts/           ← Agent-specific prompt templates (mkdir)
 \`\`\`
@@ -166,7 +159,7 @@ Inventory what's available so you can make grounded recommendations:
 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, skills, or extensions the user doesn't have installed.
+**Never** recommend models, tools, or skills the user doesn't have installed.
 
 ### Phase 1 — Gather requirements (single \`ask_user_question\` call, 4-6 questions)
 
@@ -181,7 +174,7 @@ Cover every parameter the agent needs. Skip this phase only if the user's reques
 | 3 | **Model** | Provider + model (from Phase 0 catalog); \`thinkingLevel\`: off / minimal / low / medium / high / xhigh |
 | 4 | **Tools** | Which to add/remove? Start from a preset, let user customize |
 | 5 | **Skills** | Which to add (\`skills\`) or remove (\`excluded_skills\`)? Reference Phase 0 catalog |
-| 6 | **Extensions** | Which to add (\`extensions\`) or remove (\`excluded_extensions\`)? Reference Phase 0 catalog |
+
 
 **Tool presets** (offer as starting points):
 
@@ -192,7 +185,7 @@ Cover every parameter the agent needs. Skip this phase only if the user's reques
 | 🛠️ Full-access | (inherit all PI defaults) | — | Building, refactoring, full-stack work |
 | 📦 Minimal | \`[bash, read, write]\` | everything else | Shell scripting, simple file ops |
 
-If user picks a preset, still confirm skills/extensions/model choices.
+If user picks a preset, still confirm skills/model choices.
 
 ### Phase 2 — Build
 
@@ -204,7 +197,7 @@ If user picks a preset, still confirm skills/extensions/model choices.
 ### Phase 3 — Verify & deliver
 
 - Confirm file exists; spot-check YAML frontmatter
-- Report: display name, switch command (\`/switch <name>\`), provider/model, tool preset, skills/extensions delta
+- Report: display name, switch command (\`/switch <name>\`), provider/model, tool preset, skills delta
 - Offer: "Switch now with \`/switch <name>\` to test."
 `;
 
@@ -268,11 +261,48 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 	function getPIState(): PIState {
 		return {
 			tools: pi.getActiveTools(),
-			extensions: [],
 			skills: [],
 		};
 	}
 
+	// ─── Skill formatting helpers ────────────────────────
+
+	function escapeXml(str: string): string {
+		return str
+			.replace(/&/g, "&amp;")
+			.replace(/</g, "&lt;")
+			.replace(/>/g, "&gt;")
+			.replace(/"/g, "&quot;")
+			.replace(/'/g, "&apos;");
+	}
+
+	function formatSkillsBlock(
+		skills: Array<{
+			name: string;
+			description: string;
+			filePath: string;
+		}>,
+	): string {
+		const lines = [
+			"\n\nThe following skills provide specialized instructions for specific tasks.",
+			"Use the read tool to load a skill's file when the task matches its description.",
+			"When a skill file references a relative path, resolve it against the skill directory (parent of SKILL.md / dirname of the path) and use that absolute path in tool commands.",
+			"",
+			"<available_skills>",
+		];
+		for (const skill of skills) {
+			lines.push("  <skill>");
+			lines.push(`    <name>${escapeXml(skill.name)}</name>`);
+			lines.push(
+				`    <description>${escapeXml(skill.description)}</description>`,
+			);
+			lines.push(`    <location>${escapeXml(skill.filePath)}</location>`);
+			lines.push("  </skill>");
+		}
+		lines.push("</available_skills>");
+		return lines.join("\n");
+	}
+
 	// ─── State snapshot / restore ───────────────────────
 
 	function snapshotPIState(): void {
@@ -699,35 +729,86 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 	pi.on("before_agent_start", async (event, ctx) => {
 		initPM(ctx.cwd);
 		loadCurrentAgent(pm.loadConfig());
-		// Tools/model/thinking are applied at session_start and switch time,
-		// so here we only handle text injection into the already-correct prompt.
 		updateStatus(ctx);
+
+		if (currentAgent === PI_AGENT_NAME) return;
+
 		const section = getAgentSystemPromptSection();
-		if (!section) return;
-
-		// Replace the default role line with the agent's identity banner.
-		// Everything else (tools, guidelines, skills, etc.) stays intact.
-		const roleStart = event.systemPrompt.indexOf(DEFAULT_ROLE_LINE);
-		if (roleStart >= 0) {
-			const roleEnd = roleStart + DEFAULT_ROLE_LINE.length;
-			const newPrompt =
-				event.systemPrompt.substring(0, roleStart) +
-				section +
-				event.systemPrompt.substring(roleEnd);
-			return { systemPrompt: newPrompt };
+		let newPrompt = event.systemPrompt;
+
+		// Strip Pi documentation section for non-PI agents
+		const piDocsMarker =
+			"Pi documentation (read only when the user asks about pi itself";
+		const piDocsStart = newPrompt.indexOf(piDocsMarker);
+		if (piDocsStart >= 0) {
+			const currentDateMarker = "\nCurrent date:";
+			const currentDateStart = newPrompt.indexOf(
+				currentDateMarker,
+				piDocsStart,
+			);
+			if (currentDateStart >= 0) {
+				newPrompt =
+					newPrompt.substring(0, piDocsStart) +
+					newPrompt.substring(currentDateStart);
+			}
+		}
+
+		// Replace or prepend agent identity
+		if (section) {
+			const roleStart = newPrompt.indexOf(DEFAULT_ROLE_LINE);
+			if (roleStart >= 0) {
+				const roleEnd = roleStart + DEFAULT_ROLE_LINE.length;
+				newPrompt =
+					newPrompt.substring(0, roleStart) +
+					section +
+					newPrompt.substring(roleEnd);
+			} else {
+				newPrompt = section + "\n\n" + newPrompt;
+			}
+		}
+
+		// Append skills section if agent has resolved skills
+		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);
+			}
+
+			if (selectedSkills.length > 0) {
+				const skillsBlock = formatSkillsBlock(selectedSkills);
+				const currentDateMarker = "\nCurrent date:";
+				const idx = newPrompt.indexOf(currentDateMarker);
+				if (idx >= 0) {
+					newPrompt =
+						newPrompt.substring(0, idx) +
+						skillsBlock +
+						newPrompt.substring(idx);
+				}
+			}
 		}
 
-		// Fallback: if the role line wasn't found (e.g. custom SYSTEM.md),
-		// prepend the agent section at the top instead of appending.
-		return { systemPrompt: section + "\n\n" + event.systemPrompt };
+		return { systemPrompt: newPrompt };
 	});
 
-	// ─── before_provider_request ────────────────────────
+	// ─── before_provider_request: enforce tool set + sanitize ─
 
 	pi.on("before_provider_request", (event) => {
-		if (!currentResolved) return;
+		if (!currentResolved || currentAgent === PI_AGENT_NAME) return;
 		const payload = event.payload as Record<string, unknown>;
 		let changed = false;
+
+		// Temperature / topP
 		if (currentResolved.temperature !== undefined) {
 			payload.temperature = currentResolved.temperature;
 			changed = true;
@@ -736,6 +817,111 @@ export default function agentsSwitch(pi: ExtensionAPI) {
 			payload.top_p = currentResolved.topP;
 			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
+		const allowedTools = new Set(currentResolved.tools);
+		const rawTools = payload.tools as
+			| Array<{ function?: { name?: string } }>
+			| undefined;
+		if (rawTools && rawTools.length > 0) {
+			const before = rawTools.length;
+			payload.tools = rawTools.filter((t) =>
+				allowedTools.has(t?.function?.name ?? ""),
+			);
+			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);
+					}
+				}
+			}
+
+			// Strip the <available_skills> block (other extensions might add extra skills)
+			// Our before_agent_start handler manages this — any extras are contamination.
+			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,
+						);
+				}
+			}
+
+			// 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;
 	});
 

package/package.json

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

@@ -56,8 +56,6 @@ const MAX_NAME_LENGTH = 32;
 export interface PIState {
 	/** Active tool names in PI */
 	tools: string[];
-	/** Active extension names in PI */
-	extensions: string[];
 	/** Active skill names in PI */
 	skills: string[];
 }
@@ -341,7 +339,7 @@ export class ProfileManager {
 		agentPath?: string,
 		projectPath?: string,
 	): ResolvedAgentConfig {
-		const pi = piState ?? { tools: [], extensions: [], skills: [] };
+		const pi = piState ?? { tools: [], skills: [] };
 
 		// Apply inheritance: start with PI's → respect last-write-wins
 		const tools = this.resolveList(
@@ -353,25 +351,6 @@ export class ProfileManager {
 			keyOrder,
 		);
 
-		// Extensions: prefer excluded_extensions, fall back to deprecated noextensions
-		const extExclude = fm.excluded_extensions ?? fm.noextensions;
-		const extExcludeKey =
-			fm.excluded_extensions !== undefined
-				? "excluded_extensions"
-				: fm.noextensions !== undefined
-					? "noextensions"
-					: undefined;
-		const extensionPaths = extExcludeKey
-			? this.resolveList(
-					pi.extensions,
-					extExclude,
-					fm.extensions,
-					"extensions",
-					extExcludeKey,
-					keyOrder,
-				)
-			: [...pi.extensions, ...(fm.extensions ?? [])];
-
 		// Skills: prefer excluded_skills, fall back to deprecated noskills
 		const skillExclude = fm.excluded_skills ?? fm.noskills;
 		const skillExcludeKey =
@@ -391,22 +370,6 @@ export class ProfileManager {
 				)
 			: [...pi.skills, ...(fm.skills ?? [])];
 
-		// Add agent-specific folders
-		const agentExtensions: string[] = [];
-		const agentSkills: string[] = [];
-
-		const effectiveAgentDir = projectPath ?? agentPath;
-		if (effectiveAgentDir) {
-			const extDir = join(effectiveAgentDir, "extensions");
-			if (existsSync(extDir)) {
-				agentExtensions.push(extDir);
-			}
-			const skillDir = join(effectiveAgentDir, "skills");
-			if (existsSync(skillDir)) {
-				agentSkills.push(skillDir);
-			}
-		}
-
 		const sourcePath = projectPath ?? agentPath ?? "PI (default)";
 
 		const modelStr =
@@ -422,8 +385,7 @@ export class ProfileManager {
 			topP: fm.topP,
 			systemPrompt: "", // filled in later by caller
 			tools,
-			extensionPaths: [...extensionPaths, ...agentExtensions],
-			skillPaths: [...skillPaths, ...agentSkills],
+			skillNames: skillPaths,
 			sourcePath,
 			exists: true,
 		};
@@ -494,6 +456,54 @@ export class ProfileManager {
 		return result;
 	}
 
+	/**
+	 * Look up full skill objects by name from Pi's standard skill directories.
+	 * Returns name, description, and filePath for each skill found.
+	 */
+	getSkillObjects(
+		skillNames: string[],
+	): Array<{ name: string; description: string; filePath: string }> {
+		const result: Array<{
+			name: string;
+			description: string;
+			filePath: string;
+		}> = [];
+
+		for (const name of skillNames) {
+			const skill = this.findSkillOnDisk(name);
+			if (skill) result.push(skill);
+		}
+
+		return result;
+	}
+
+	private findSkillOnDisk(
+		name: string,
+	): { name: string; description: string; filePath: string } | undefined {
+		const locations = [join(this.piAgentDir, "skills", name, "SKILL.md")];
+
+		if (this.cwd) {
+			locations.push(join(this.cwd, ".pi", "skills", name, "SKILL.md"));
+		}
+
+		for (const loc of locations) {
+			if (!existsSync(loc)) continue;
+			try {
+				const content = readFileSync(loc, "utf8");
+				const { frontmatter } = parseFrontmatter(content);
+				return {
+					name: frontmatter.name ?? name,
+					description: frontmatter.description ?? "",
+					filePath: loc,
+				};
+			} catch {
+				// Skip unreadable files
+			}
+		}
+
+		return undefined;
+	}
+
 	// ─── Agent creation / deletion ───────────────────────
 
 	validateName(name: string): void {

package/types.ts

@@ -46,17 +46,6 @@ export interface AgentFrontmatter {
 	 */
 	excluded_tools?: string[];
 
-	// ── Extension lists ──
-	/** Extensions to ADD. */
-	extensions?: string[];
-	/**
-	 * Extensions to REMOVE (from PI's inherited set). Supports `"*"` wildcard.
-	 * Preferred over deprecated `noextensions`.
-	 */
-	excluded_extensions?: string[];
-	/** @deprecated Use `excluded_extensions` instead. Still recognized for backward compat. */
-	noextensions?: string[];
-
 	// ── Skill lists ──
 	/** Skills to ADD. */
 	skills?: string[];
@@ -107,10 +96,8 @@ export interface ResolvedAgentConfig {
 	systemPrompt: string;
 	/** Resolved tools for this agent */
 	tools: string[];
-	/** Resolved extensions for this agent (from agent-specific folder) */
-	extensionPaths: string[];
-	/** Resolved skills for this agent (from agent-specific folder) */
-	skillPaths: string[];
+	/** Resolved skill names for this agent */
+	skillNames: string[];
 	/** Source of this agent (path to AGENTS.md used) */
 	sourcePath: string;
 	/** Whether this agent exists on disk */