@zaganjade/pi-multi-skill 1.3.0 → 1.3.2

package/src/bundles.ts

@@ -1,138 +1,138 @@
-import { existsSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import type { SkillBundle } from "./types.ts";
-import { parseYamlBundles } from "./yaml-bundles.ts";
-
-export const DEFAULT_BUNDLES: Record<string, SkillBundle> = {
-	"bmad-planning": {
-		description: "BMAD Phase 1-2 — analysis & planning",
-		skills: ["bmad-master", "analyst", "pm"],
-		order: "process-first",
-		default_mode: "meta",
-		requires: "BMAD Method",
-		install:
-			"git clone BMAD-METHOD to ~/.claude/skills/bmad, add path in pi settings \"skills\"",
-	},
-	"bmad-solutioning": {
-		description: "BMAD Phase 3 — architecture & design",
-		skills: ["bmad-master", "architect", "ux-designer"],
-		order: "process-first",
-		default_mode: "meta",
-		requires: "BMAD Method",
-		install:
-			"git clone BMAD-METHOD to ~/.claude/skills/bmad, add path in pi settings \"skills\"",
-	},
-	"bmad-build": {
-		description: "BMAD Phase 4 — story implementation",
-		skills: ["bmad-master", "developer", "scrum-master"],
-		order: "process-first",
-		default_mode: "lazy",
-		requires: "BMAD Method",
-		install:
-			"git clone BMAD-METHOD to ~/.claude/skills/bmad, add path in pi settings \"skills\"",
-	},
-	"cc-feature": {
-		description: "Claude Code-style feature workflow",
-		skills: [
-			"using-superpowers",
-			"brainstorming",
-			"writing-plans",
-			"test-driven-development",
-			"requesting-code-review",
-		],
-		order: "process-first",
-		default_mode: "lazy",
-		requires: "Superpowers",
-		install:
-			"Install Claude Code Superpowers plugin, or copy skills to ~/.pi/agent/skills",
-	},
-	debug: {
-		description: "Systematic bug investigation",
-		skills: ["systematic-debugging", "test-driven-development"],
-		order: "process-first",
-		default_mode: "full",
-		requires: "Superpowers",
-		install:
-			"Install Claude Code Superpowers plugin, or copy skills to ~/.pi/agent/skills",
-	},
-};
-
-function getAgentDir(): string {
-	return join(homedir(), ".pi", "agent");
-}
-
-function mergeBundleFile(
-	target: Map<string, SkillBundle>,
-	path: string,
-): void {
-	try {
-		const raw = readFileSync(path, "utf-8");
-		const parsed =
-			path.endsWith(".yaml") || path.endsWith(".yml")
-				? { bundles: parseYamlBundles(raw) }
-				: (JSON.parse(raw) as { bundles?: Record<string, SkillBundle> });
-		if (!parsed.bundles) return;
-		for (const [name, bundle] of Object.entries(parsed.bundles)) {
-			if (Array.isArray(bundle.skills) && bundle.skills.length > 0) {
-				target.set(name, bundle);
-			}
-		}
-	} catch {
-		// Skip invalid bundle files
-	}
-}
-
-export function loadBundles(cwd: string): Map<string, SkillBundle> {
-	const bundles = new Map<string, SkillBundle>();
-	for (const [name, bundle] of Object.entries(DEFAULT_BUNDLES)) {
-		bundles.set(name, bundle);
-	}
-
-	const paths = [
-		join(getAgentDir(), "skill-bundles.json"),
-		join(getAgentDir(), "skill-bundles.yaml"),
-		join(getAgentDir(), "skill-bundles.yml"),
-		join(cwd, ".pi", "skill-bundles.json"),
-		join(cwd, ".pi", "skill-bundles.yaml"),
-		join(cwd, ".pi", "skill-bundles.yml"),
-	];
-	for (const path of paths) {
-		if (existsSync(path)) mergeBundleFile(bundles, path);
-	}
-
-	return bundles;
-}
-
-export function expandSkillNames(
-	names: string[],
-	bundles: Map<string, SkillBundle>,
-): { skills: string[]; modeHint?: SkillBundle["default_mode"] } {
-	const expanded: string[] = [];
-	let modeHint: SkillBundle["default_mode"] | undefined;
-
-	for (const name of names) {
-		const bundleName = name.startsWith("@") ? name.slice(1) : name;
-		const bundle = bundles.get(bundleName);
-		if (name.startsWith("@") && bundle) {
-			expanded.push(...bundle.skills);
-			modeHint = modeHint ?? bundle.default_mode;
-		} else {
-			expanded.push(name);
-		}
-	}
-
-	return { skills: [...new Set(expanded)], modeHint };
-}
-
-export function bundleOrderHint(
-	names: string[],
-	bundles: Map<string, SkillBundle>,
-): SkillBundle["order"] | undefined {
-	for (const name of names) {
-		if (!name.startsWith("@")) continue;
-		const bundle = bundles.get(name.slice(1));
-		if (bundle?.order) return bundle.order;
-	}
-	return undefined;
-}
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import type { SkillBundle } from "./types.ts";
+import { parseYamlBundles } from "./yaml-bundles.ts";
+
+export const DEFAULT_BUNDLES: Record<string, SkillBundle> = {
+	"bmad-planning": {
+		description: "BMAD Phase 1-2 — analysis & planning",
+		skills: ["bmad-master", "analyst", "pm"],
+		order: "process-first",
+		default_mode: "meta",
+		requires: "BMAD Method",
+		install:
+			"git clone BMAD-METHOD to ~/.claude/skills/bmad, add path in pi settings \"skills\"",
+	},
+	"bmad-solutioning": {
+		description: "BMAD Phase 3 — architecture & design",
+		skills: ["bmad-master", "architect", "ux-designer"],
+		order: "process-first",
+		default_mode: "meta",
+		requires: "BMAD Method",
+		install:
+			"git clone BMAD-METHOD to ~/.claude/skills/bmad, add path in pi settings \"skills\"",
+	},
+	"bmad-build": {
+		description: "BMAD Phase 4 — story implementation",
+		skills: ["bmad-master", "developer", "scrum-master"],
+		order: "process-first",
+		default_mode: "lazy",
+		requires: "BMAD Method",
+		install:
+			"git clone BMAD-METHOD to ~/.claude/skills/bmad, add path in pi settings \"skills\"",
+	},
+	"cc-feature": {
+		description: "Claude Code-style feature workflow",
+		skills: [
+			"using-superpowers",
+			"brainstorming",
+			"writing-plans",
+			"test-driven-development",
+			"requesting-code-review",
+		],
+		order: "process-first",
+		default_mode: "lazy",
+		requires: "Superpowers",
+		install:
+			"Install Claude Code Superpowers plugin, or copy skills to ~/.pi/agent/skills",
+	},
+	debug: {
+		description: "Systematic bug investigation",
+		skills: ["systematic-debugging", "test-driven-development"],
+		order: "process-first",
+		default_mode: "full",
+		requires: "Superpowers",
+		install:
+			"Install Claude Code Superpowers plugin, or copy skills to ~/.pi/agent/skills",
+	},
+};
+
+function getAgentDir(): string {
+	return join(homedir(), ".pi", "agent");
+}
+
+function mergeBundleFile(
+	target: Map<string, SkillBundle>,
+	path: string,
+): void {
+	try {
+		const raw = readFileSync(path, "utf-8");
+		const parsed =
+			path.endsWith(".yaml") || path.endsWith(".yml")
+				? { bundles: parseYamlBundles(raw) }
+				: (JSON.parse(raw) as { bundles?: Record<string, SkillBundle> });
+		if (!parsed.bundles) return;
+		for (const [name, bundle] of Object.entries(parsed.bundles)) {
+			if (Array.isArray(bundle.skills) && bundle.skills.length > 0) {
+				target.set(name, bundle);
+			}
+		}
+	} catch {
+		// Skip invalid bundle files
+	}
+}
+
+export function loadBundles(cwd: string): Map<string, SkillBundle> {
+	const bundles = new Map<string, SkillBundle>();
+	for (const [name, bundle] of Object.entries(DEFAULT_BUNDLES)) {
+		bundles.set(name, bundle);
+	}
+
+	const paths = [
+		join(getAgentDir(), "skill-bundles.json"),
+		join(getAgentDir(), "skill-bundles.yaml"),
+		join(getAgentDir(), "skill-bundles.yml"),
+		join(cwd, ".pi", "skill-bundles.json"),
+		join(cwd, ".pi", "skill-bundles.yaml"),
+		join(cwd, ".pi", "skill-bundles.yml"),
+	];
+	for (const path of paths) {
+		if (existsSync(path)) mergeBundleFile(bundles, path);
+	}
+
+	return bundles;
+}
+
+export function expandSkillNames(
+	names: string[],
+	bundles: Map<string, SkillBundle>,
+): { skills: string[]; modeHint?: SkillBundle["default_mode"] } {
+	const expanded: string[] = [];
+	let modeHint: SkillBundle["default_mode"] | undefined;
+
+	for (const name of names) {
+		const bundleName = name.startsWith("@") ? name.slice(1) : name;
+		const bundle = bundles.get(bundleName);
+		if (name.startsWith("@") && bundle) {
+			expanded.push(...bundle.skills);
+			modeHint = modeHint ?? bundle.default_mode;
+		} else {
+			expanded.push(name);
+		}
+	}
+
+	return { skills: [...new Set(expanded)], modeHint };
+}
+
+export function bundleOrderHint(
+	names: string[],
+	bundles: Map<string, SkillBundle>,
+): SkillBundle["order"] | undefined {
+	for (const name of names) {
+		if (!name.startsWith("@")) continue;
+		const bundle = bundles.get(name.slice(1));
+		if (bundle?.order) return bundle.order;
+	}
+	return undefined;
+}

package/src/discover.ts

@@ -1,161 +1,161 @@
-import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import {
-	getAgentDir,
-	loadSkills,
-	loadSkillsFromDir,
-	type ExtensionAPI,
-} from "@earendil-works/pi-coding-agent";
-import { truncateDescription } from "./metadata.ts";
-import type { SkillInfo } from "./types.ts";
-
-function readSettingsSkillPaths(): string[] {
-	try {
-		const raw = readFileSync(join(getAgentDir(), "settings.json"), "utf-8");
-		const parsed = JSON.parse(raw) as { skills?: string[] };
-		return Array.isArray(parsed.skills) ? parsed.skills : [];
-	} catch {
-		return [];
-	}
-}
-
-function fromPiCommands(pi: ExtensionAPI): Map<string, SkillInfo> {
-	const map = new Map<string, SkillInfo>();
-	for (const cmd of pi.getCommands()) {
-		if (cmd.source !== "skill") continue;
-		const name = cmd.name.startsWith("skill:")
-			? cmd.name.slice(6)
-			: cmd.name;
-		map.set(name, {
-			name,
-			description: truncateDescription(cmd.description || ""),
-			filePath: cmd.sourceInfo.path,
-			baseDir: cmd.sourceInfo.baseDir || dirname(cmd.sourceInfo.path),
-		});
-	}
-	return map;
-}
-
-/** Claude Code plugin cache — superpowers and other plugin skills not in pi settings. */
-function discoverClaudePluginSkills(): SkillInfo[] {
-	const cacheRoot = join(homedir(), ".claude", "plugins", "cache");
-	if (!existsSync(cacheRoot)) return [];
-
-	const byName = new Map<string, SkillInfo>();
-	try {
-		for (const pluginEntry of readdirSync(cacheRoot, { withFileTypes: true })) {
-			if (!pluginEntry.isDirectory()) continue;
-			const pluginRoot = join(cacheRoot, pluginEntry.name);
-			for (const versionEntry of readdirSync(pluginRoot, {
-				withFileTypes: true,
-			})) {
-				if (!versionEntry.isDirectory()) continue;
-				const skillsDir = join(pluginRoot, versionEntry.name, "skills");
-				if (!existsSync(skillsDir)) continue;
-				const result = loadSkillsFromDir({
-					dir: skillsDir,
-					source: "claude-plugin",
-				});
-				for (const skill of result.skills) {
-					byName.set(skill.name, {
-						name: skill.name,
-						description: truncateDescription(skill.description || ""),
-						filePath: skill.filePath,
-						baseDir: skill.baseDir,
-					});
-				}
-			}
-		}
-	} catch {
-		// Non-fatal
-	}
-	return [...byName.values()];
-}
-
-function discoverCursorSkills(): SkillInfo[] {
-	const dir = join(homedir(), ".cursor", "skills-cursor");
-	if (!existsSync(dir)) return [];
-	try {
-		return loadSkillsFromDir({ dir, source: "cursor" }).skills.map((skill) => ({
-			name: skill.name,
-			description: truncateDescription(skill.description || ""),
-			filePath: skill.filePath,
-			baseDir: skill.baseDir,
-		}));
-	} catch {
-		return [];
-	}
-}
-
-/**
- * Discover skills from every source pi and Claude Code use:
- * getCommands(), settings skill paths, defaults, plugin cache, cursor skills.
- */
-export function discoverAllSkills(
-	pi: ExtensionAPI,
-	cwd: string,
-): SkillInfo[] {
-	const map = fromPiCommands(pi);
-
-	const loaded = loadSkills({
-		cwd,
-		agentDir: getAgentDir(),
-		skillPaths: readSettingsSkillPaths(),
-		includeDefaults: true,
-	});
-	for (const skill of loaded.skills) {
-		if (!map.has(skill.name)) {
-			map.set(skill.name, {
-				name: skill.name,
-				description: truncateDescription(skill.description || ""),
-				filePath: skill.filePath,
-				baseDir: skill.baseDir,
-			});
-		}
-	}
-
-	for (const skill of [
-		...discoverClaudePluginSkills(),
-		...discoverCursorSkills(),
-	]) {
-		if (!map.has(skill.name)) map.set(skill.name, skill);
-	}
-
-	return [...map.values()].sort((a, b) => a.name.localeCompare(b.name));
-}
-
-/** Resolve a skill by name when it was requested but missing from the primary index. */
-export function resolveSkillByName(
-	name: string,
-	known: Map<string, SkillInfo>,
-): SkillInfo | undefined {
-	if (known.has(name)) return known.get(name);
-
-	for (const skill of discoverClaudePluginSkills()) {
-		if (skill.name === name) return skill;
-	}
-	for (const skill of discoverCursorSkills()) {
-		if (skill.name === name) return skill;
-	}
-
-	const dirs = [
-		join(getAgentDir(), "skills"),
-		join(cwd, ".pi", "skills"),
-	];
-	for (const dir of dirs) {
-		for (const candidate of [
-			join(dir, name, "SKILL.md"),
-			join(dir, `${name}.md`),
-		]) {
-			if (!existsSync(candidate)) continue;
-			return {
-				name,
-				description: "",
-				filePath: candidate,
-				baseDir: dirname(candidate),
-			};
-		}
-	}
-	return undefined;
-}
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import {
+	getAgentDir,
+	loadSkills,
+	loadSkillsFromDir,
+	type ExtensionAPI,
+} from "@earendil-works/pi-coding-agent";
+import { truncateDescription } from "./metadata.ts";
+import type { SkillInfo } from "./types.ts";
+
+function readSettingsSkillPaths(): string[] {
+	try {
+		const raw = readFileSync(join(getAgentDir(), "settings.json"), "utf-8");
+		const parsed = JSON.parse(raw) as { skills?: string[] };
+		return Array.isArray(parsed.skills) ? parsed.skills : [];
+	} catch {
+		return [];
+	}
+}
+
+function fromPiCommands(pi: ExtensionAPI): Map<string, SkillInfo> {
+	const map = new Map<string, SkillInfo>();
+	for (const cmd of pi.getCommands()) {
+		if (cmd.source !== "skill") continue;
+		const name = cmd.name.startsWith("skill:")
+			? cmd.name.slice(6)
+			: cmd.name;
+		map.set(name, {
+			name,
+			description: truncateDescription(cmd.description || ""),
+			filePath: cmd.sourceInfo.path,
+			baseDir: cmd.sourceInfo.baseDir || dirname(cmd.sourceInfo.path),
+		});
+	}
+	return map;
+}
+
+/** Claude Code plugin cache — superpowers and other plugin skills not in pi settings. */
+function discoverClaudePluginSkills(): SkillInfo[] {
+	const cacheRoot = join(homedir(), ".claude", "plugins", "cache");
+	if (!existsSync(cacheRoot)) return [];
+
+	const byName = new Map<string, SkillInfo>();
+	try {
+		for (const pluginEntry of readdirSync(cacheRoot, { withFileTypes: true })) {
+			if (!pluginEntry.isDirectory()) continue;
+			const pluginRoot = join(cacheRoot, pluginEntry.name);
+			for (const versionEntry of readdirSync(pluginRoot, {
+				withFileTypes: true,
+			})) {
+				if (!versionEntry.isDirectory()) continue;
+				const skillsDir = join(pluginRoot, versionEntry.name, "skills");
+				if (!existsSync(skillsDir)) continue;
+				const result = loadSkillsFromDir({
+					dir: skillsDir,
+					source: "claude-plugin",
+				});
+				for (const skill of result.skills) {
+					byName.set(skill.name, {
+						name: skill.name,
+						description: truncateDescription(skill.description || ""),
+						filePath: skill.filePath,
+						baseDir: skill.baseDir,
+					});
+				}
+			}
+		}
+	} catch {
+		// Non-fatal
+	}
+	return [...byName.values()];
+}
+
+function discoverCursorSkills(): SkillInfo[] {
+	const dir = join(homedir(), ".cursor", "skills-cursor");
+	if (!existsSync(dir)) return [];
+	try {
+		return loadSkillsFromDir({ dir, source: "cursor" }).skills.map((skill) => ({
+			name: skill.name,
+			description: truncateDescription(skill.description || ""),
+			filePath: skill.filePath,
+			baseDir: skill.baseDir,
+		}));
+	} catch {
+		return [];
+	}
+}
+
+/**
+ * Discover skills from every source pi and Claude Code use:
+ * getCommands(), settings skill paths, defaults, plugin cache, cursor skills.
+ */
+export function discoverAllSkills(
+	pi: ExtensionAPI,
+	cwd: string,
+): SkillInfo[] {
+	const map = fromPiCommands(pi);
+
+	const loaded = loadSkills({
+		cwd,
+		agentDir: getAgentDir(),
+		skillPaths: readSettingsSkillPaths(),
+		includeDefaults: true,
+	});
+	for (const skill of loaded.skills) {
+		if (!map.has(skill.name)) {
+			map.set(skill.name, {
+				name: skill.name,
+				description: truncateDescription(skill.description || ""),
+				filePath: skill.filePath,
+				baseDir: skill.baseDir,
+			});
+		}
+	}
+
+	for (const skill of [
+		...discoverClaudePluginSkills(),
+		...discoverCursorSkills(),
+	]) {
+		if (!map.has(skill.name)) map.set(skill.name, skill);
+	}
+
+	return [...map.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+
+/** Resolve a skill by name when it was requested but missing from the primary index. */
+export function resolveSkillByName(
+	name: string,
+	known: Map<string, SkillInfo>,
+): SkillInfo | undefined {
+	if (known.has(name)) return known.get(name);
+
+	for (const skill of discoverClaudePluginSkills()) {
+		if (skill.name === name) return skill;
+	}
+	for (const skill of discoverCursorSkills()) {
+		if (skill.name === name) return skill;
+	}
+
+	const dirs = [
+		join(getAgentDir(), "skills"),
+		join(cwd, ".pi", "skills"),
+	];
+	for (const dir of dirs) {
+		for (const candidate of [
+			join(dir, name, "SKILL.md"),
+			join(dir, `${name}.md`),
+		]) {
+			if (!existsSync(candidate)) continue;
+			return {
+				name,
+				description: "",
+				filePath: candidate,
+				baseDir: dirname(candidate),
+			};
+		}
+	}
+	return undefined;
+}

package/src/index.ts

@@ -18,7 +18,7 @@ import {
 } from "./bundle-status.ts";
 import { bmadAutoHint, resolveBmadAutoSkills } from "./bmad-auto.ts";
 import { buildBmadStatusBlock, shouldInjectBmadStatus } from "./bmad-status.ts";
-import { buildCombinedMessage, resolveAndReadLegacySkill } from "./build.ts";
+import { buildCombinedMessage } from "./build.ts";
 import { getSkillsArgumentCompletions } from "./completions.ts";
 import { resolveSkillConflicts } from "./conflicts.ts";
 import { discoverAllSkills, resolveSkillByName } from "./discover.ts";
@@ -347,22 +347,18 @@ export default function (pi: ExtensionAPI) {
 			skillNames,
 			available,
 		);
-		const blocks = selected
-			.map((s) => resolveAndReadLegacySkill(s.name, s.filePath, ctx.cwd))
-			.filter((b): b is string => b !== null);
-
-		if (blocks.length === 0) return { action: "continue" };
-
-		const wrapped = [
-			`<manually_attached_skills count="${blocks.length}">`,
-			...blocks,
-			args ? `\n<user_query>\n${args}\n</user_query>` : "",
-			"</manually_attached_skills>",
-		]
-			.filter(Boolean)
-			.join("\n\n");
-
-		return { action: "transform", text: wrapped };
+
+		if (selected.length === 0) return { action: "continue" };
+
+		const { message } = buildCombinedMessage(selected, ctx.cwd, {
+			mode: "full",
+			parallel: false,
+			instructions: args || undefined,
+		});
+
+		if (!message.includes("<skill ")) return { action: "continue" };
+
+		return { action: "transform", text: message };
 	});
 }