@zaganjade/pi-multi-skill 1.3.1 → 1.3.4

package/README.md

@@ -199,19 +199,45 @@ Skills are found from **all** of these sources (merged, deduplicated by name):
 
 This means bundles like `@debug` and `@cc-feature` work even when Superpowers skills live in the Claude plugin cache rather than `~/.claude/skills`.
 
-### Claude Code-style message wrapper
+### Pi-native skill display
 
-Combined output uses a structured wrapper (similar to Cursor `manually_attached_skills`):
+Pi collapses user messages only when the **entire** message matches its native skill envelope:
 
 ```xml
-<manually_attached_skills count="3">
-  …priority rules…
-  <skill name="…" mode="meta">…</skill>
-  <embedded_command>/workflow-status</embedded_command>
-  <user_query>Your instructions here</user_query>
-</manually_attached_skills>
+<skill name="skill-a, skill-b" location="pi-multi-skill">
+  <manually_attached_skills count="2" bundles="@debug">
+    …priority rules…
+    <skill name="skill-a" location="/path/to/SKILL.md">…</skill-block>
+    <skill name="skill-b" location="/path/to/SKILL.md">…</skill-block>
+    <user_query>Your instructions here</user_query>
+  </manually_attached_skills>
+</skill>
+
+Your instructions here
 ```
 
+- **1 skill, no extras** → single native block → `[skill] skill-name`
+- **2+ skills** (or bundles/instructions) → outer native block hides all inner content → `[skill] a, b, c` (Ctrl+O to expand)
+- The user's free-text instructions are appended AFTER `</skill>` as Pi's
+  `userMessage` tail, so they render as a normal visible message below the
+  collapsed header: `[skill] a, b (ctrl+o to expand)` + `your instructions`.
+- Inner `<manually_attached_skills bundles="…">` is preserved for **pi-usage** bundle attribution
+
+> **Why inner blocks close with `</skill-block>` and instructions live outside the envelope?**
+> Two constraints shaped this. First, Pi's display parser matches the outer
+> envelope with a non-greedy regex and cannot tell a nested `</skill>` apart
+> from the envelope's own closing tag — with nested `</skill>`, any trailing
+> section caused the parser to split at the last inner `</skill>` and **leak**
+> `<user_query>…`, `</manually_attached_skills>`, and the outer `</skill>` into
+> the rendered user message as raw tags. Inner blocks therefore open with
+> `<skill name="…">` (kept so **pi-usage** still attributes each skill via
+> `/<skill\s+name="([^"]+)"/g`) but close with the non-colliding `</skill-block>`,
+> which neither parser's regex can match. Second, so the user's typed
+> instructions stay visible (not hidden inside the collapsed block) while the
+> skill *content* collapses, instructions are placed after `</skill>\n\n` as
+> plain text — exactly Pi's native `userMessage` tail. Covered by
+> `node --test test/parse-leak.test.mjs`.
+
 ### Session hints
 
 After each user turn, the extension may suggest a relevant bundle (non-blocking `info` notification):

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zaganjade/pi-multi-skill",
-	"version": "1.3.1",
+	"version": "1.3.4",
 	"description": "Chain multiple skills via /skills — bundles (JSON/YAML), load modes, BMAD --auto, /skills-last, /skills-setup, conflict resolution, parallel dispatch, activation stats, bundle attribution for pi-usage.",
 	"type": "module",
 	"keywords": [
@@ -21,6 +21,9 @@
 		"url": "https://github.com/ZaganJade/pi-extension/issues"
 	},
 	"main": "./src/index.ts",
+	"scripts": {
+		"test": "node --test test/"
+	},
 	"files": [
 		"src/",
 		"README.md",

package/skill-bundles.example.json

@@ -1,17 +1,17 @@
-{
-	"bundles": {
-		"my-stack": {
-			"description": "Only skills installed on this machine — no BMAD required",
-			"skills": ["frontend-design", "create-rule"],
-			"order": "explicit",
-			"default_mode": "meta"
-		},
-		"my-team-planning": {
-			"description": "Custom team planning workflow (requires BMAD)",
-			"skills": ["bmad-master", "analyst", "pm"],
-			"order": "process-first",
-			"default_mode": "meta",
-			"requires": "BMAD Method"
-		}
-	}
-}
+{
+	"bundles": {
+		"my-stack": {
+			"description": "Only skills installed on this machine — no BMAD required",
+			"skills": ["frontend-design", "create-rule"],
+			"order": "explicit",
+			"default_mode": "meta"
+		},
+		"my-team-planning": {
+			"description": "Custom team planning workflow (requires BMAD)",
+			"skills": ["bmad-master", "analyst", "pm"],
+			"order": "process-first",
+			"default_mode": "meta",
+			"requires": "BMAD Method"
+		}
+	}
+}

package/src/bmad-auto.ts

@@ -1,99 +1,99 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-
-const PHASE_SKILLS: Record<string, string[]> = {
-	analysis: ["bmad-master", "analyst"],
-	planning: ["bmad-master", "analyst", "pm"],
-	solutioning: ["bmad-master", "architect", "ux-designer"],
-	implementation: ["bmad-master", "developer", "scrum-master"],
-};
-
-function readText(path: string): string | null {
-	try {
-		return readFileSync(path, "utf-8");
-	} catch {
-		return null;
-	}
-}
-
-function workflowStatus(content: string, key: string): string | null {
-	const patterns = [
-		new RegExp(`${key}:\\s*\\n[\\s\\S]*?status:\\s*([\\w-]+)`, "i"),
-		new RegExp(`${key}:[\\s\\S]*?status:\\s*([\\w\\s-]+)`, "i"),
-	];
-	for (const re of patterns) {
-		const match = content.match(re);
-		if (match) return match[1].trim().toLowerCase().replace(/\s+/g, "-");
-	}
-	return null;
-}
-
-function isIncomplete(status: string | null): boolean {
-	if (!status) return true;
-	return /not-started|not_started|pending|required|in-progress|in_progress|started/.test(
-		status,
-	);
-}
-
-function detectPhase(content: string): keyof typeof PHASE_SKILLS {
-	const checks: Array<[string, keyof typeof PHASE_SKILLS]> = [
-		["product-brief", "analysis"],
-		["brainstorm", "analysis"],
-		["research", "analysis"],
-		["prd", "planning"],
-		["tech-spec", "planning"],
-		["tech_spec", "planning"],
-		["architecture", "solutioning"],
-		["ux-design", "solutioning"],
-		["sprint-planning", "implementation"],
-		["dev-story", "implementation"],
-		["create-story", "implementation"],
-	];
-
-	for (const [key, phase] of checks) {
-		if (isIncomplete(workflowStatus(content, key))) return phase;
-	}
-
-	if (/implementation|phase:\s*4/i.test(content)) return "implementation";
-	if (/solutioning|phase:\s*3/i.test(content)) return "solutioning";
-	if (/planning|phase:\s*2/i.test(content)) return "planning";
-	return "analysis";
-}
-
-function projectLevel(cwd: string): number {
-	const configPath = join(cwd, "bmad", "config.yaml");
-	const content = readText(configPath);
-	if (!content) return 1;
-	const match = content.match(/project_level:\s*(\d)/i);
-	return match ? Number.parseInt(match[1], 10) : 1;
-}
-
-export function resolveBmadAutoSkills(cwd: string): string[] {
-	const statusPath = join(cwd, "docs", "bmm-workflow-status.yaml");
-	const content = readText(statusPath);
-
-	if (!content) {
-		const level = projectLevel(cwd);
-		if (level <= 1) return ["bmad-master", "pm"];
-		return ["bmad-master", "analyst"];
-	}
-
-	const phase = detectPhase(content);
-	const skills = [...(PHASE_SKILLS[phase] ?? ["bmad-master"])];
-
-	const level = projectLevel(cwd);
-	if (level <= 1 && phase === "planning" && !skills.includes("pm")) {
-		skills.push("pm");
-	}
-
-	return [...new Set(skills)];
-}
-
-export function bmadAutoHint(cwd: string): string | null {
-	const statusPath = join(cwd, "docs", "bmm-workflow-status.yaml");
-	if (!existsSync(statusPath)) {
-		return "BMAD status not found — loaded bmad-master with planning defaults";
-	}
-	const phase = detectPhase(readText(statusPath) ?? "");
-	return `BMAD --auto detected phase: ${phase}`;
-}
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+const PHASE_SKILLS: Record<string, string[]> = {
+	analysis: ["bmad-master", "analyst"],
+	planning: ["bmad-master", "analyst", "pm"],
+	solutioning: ["bmad-master", "architect", "ux-designer"],
+	implementation: ["bmad-master", "developer", "scrum-master"],
+};
+
+function readText(path: string): string | null {
+	try {
+		return readFileSync(path, "utf-8");
+	} catch {
+		return null;
+	}
+}
+
+function workflowStatus(content: string, key: string): string | null {
+	const patterns = [
+		new RegExp(`${key}:\\s*\\n[\\s\\S]*?status:\\s*([\\w-]+)`, "i"),
+		new RegExp(`${key}:[\\s\\S]*?status:\\s*([\\w\\s-]+)`, "i"),
+	];
+	for (const re of patterns) {
+		const match = content.match(re);
+		if (match) return match[1].trim().toLowerCase().replace(/\s+/g, "-");
+	}
+	return null;
+}
+
+function isIncomplete(status: string | null): boolean {
+	if (!status) return true;
+	return /not-started|not_started|pending|required|in-progress|in_progress|started/.test(
+		status,
+	);
+}
+
+function detectPhase(content: string): keyof typeof PHASE_SKILLS {
+	const checks: Array<[string, keyof typeof PHASE_SKILLS]> = [
+		["product-brief", "analysis"],
+		["brainstorm", "analysis"],
+		["research", "analysis"],
+		["prd", "planning"],
+		["tech-spec", "planning"],
+		["tech_spec", "planning"],
+		["architecture", "solutioning"],
+		["ux-design", "solutioning"],
+		["sprint-planning", "implementation"],
+		["dev-story", "implementation"],
+		["create-story", "implementation"],
+	];
+
+	for (const [key, phase] of checks) {
+		if (isIncomplete(workflowStatus(content, key))) return phase;
+	}
+
+	if (/implementation|phase:\s*4/i.test(content)) return "implementation";
+	if (/solutioning|phase:\s*3/i.test(content)) return "solutioning";
+	if (/planning|phase:\s*2/i.test(content)) return "planning";
+	return "analysis";
+}
+
+function projectLevel(cwd: string): number {
+	const configPath = join(cwd, "bmad", "config.yaml");
+	const content = readText(configPath);
+	if (!content) return 1;
+	const match = content.match(/project_level:\s*(\d)/i);
+	return match ? Number.parseInt(match[1], 10) : 1;
+}
+
+export function resolveBmadAutoSkills(cwd: string): string[] {
+	const statusPath = join(cwd, "docs", "bmm-workflow-status.yaml");
+	const content = readText(statusPath);
+
+	if (!content) {
+		const level = projectLevel(cwd);
+		if (level <= 1) return ["bmad-master", "pm"];
+		return ["bmad-master", "analyst"];
+	}
+
+	const phase = detectPhase(content);
+	const skills = [...(PHASE_SKILLS[phase] ?? ["bmad-master"])];
+
+	const level = projectLevel(cwd);
+	if (level <= 1 && phase === "planning" && !skills.includes("pm")) {
+		skills.push("pm");
+	}
+
+	return [...new Set(skills)];
+}
+
+export function bmadAutoHint(cwd: string): string | null {
+	const statusPath = join(cwd, "docs", "bmm-workflow-status.yaml");
+	if (!existsSync(statusPath)) {
+		return "BMAD status not found — loaded bmad-master with planning defaults";
+	}
+	const phase = detectPhase(readText(statusPath) ?? "");
+	return `BMAD --auto detected phase: ${phase}`;
+}