pi-prompt-template-model-enhanced 0.11.0 → 0.11.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.11.2](https://github.com/Nabsku/pi-prompt-template-model-enhanced/compare/v0.11.1...v0.11.2) (2026-06-19)
+
+
+### Bug Fixes
+
+* publish after release-please releases ([7949c6c](https://github.com/Nabsku/pi-prompt-template-model-enhanced/commit/7949c6cb313f62f2dc8cc5ab707b90413e3095ac))
+
+## [0.11.1](https://github.com/Nabsku/pi-prompt-template-model-enhanced/compare/v0.11.0...v0.11.1) (2026-06-19)
+
+
+### Bug Fixes
+
+* allow skills in delegated prompts ([d7c0e0e](https://github.com/Nabsku/pi-prompt-template-model-enhanced/commit/d7c0e0e1c8a8e2b728aa2fa20c9e5037002b761e))
+
 ## [0.11.0](https://github.com/Nabsku/pi-prompt-template-model-enhanced/compare/v0.10.0...v0.11.0) (2026-06-19)
 
 
@@ -34,6 +48,7 @@
 - Added Release Please release automation and npm trusted publishing workflow.
 
 ### Fixed
+- Delegated prompt templates can now combine `subagent:`/runtime `--subagent` with `skill` or `skills`; resolved skill content is prepended to delegated task text instead of rejecting the template.
 - Kept dry-run output out of LLM/session history by writing plain previews to stdout instead of custom session messages.
 - Aligned dry-run delegation metadata with runtime behavior for default agents, missing delegated `cwd`, loop prefixes, and parallel delegated task preambles.
 

package/README.md

@@ -106,7 +106,7 @@ Use `/print-prompt` or `/dry-run-prompt` to preview what a prompt template would
 /dry-run-prompt review --model=gpt-5.2 src/server.ts
 ```
 
-In non-TUI contexts these commands print a Markdown report to stdout. By default, full skill content is hidden; add `--show-skills` when you explicitly want the preview to include loaded skill bodies.
+In non-TUI contexts these commands print a Markdown report to stdout. By default, full skill content is hidden; add `--show-skills` when you explicitly want the preview to include loaded skill bodies. For delegated prompts, skill content is still reported in the report's skills section rather than inlined into the prompt body preview; at runtime the resolved skill block is prepended to the child task text before delegation.
 
 ```text
 /print-prompt review --show-skills src/server.ts
@@ -274,6 +274,8 @@ Resolution order:
 4. `~/.pi/agent/skills/<name>/SKILL.md` or `~/.pi/agent/skills/<name>.md`
 5. `~/.agents/skills/<name>/SKILL.md` or `~/.agents/skills/<name>.md`
 
+Here `<cwd>` is the Pi session/project cwd used to register and execute the prompt command. Delegated prompts may also set frontmatter `cwd:` or receive runtime `--cwd`, but those values choose where the child agent runs; they do not change which skill library is searched. This keeps direct prompts, runtime `--subagent`, `--fork`, dry-run, and validation on one predictable skill lookup path.
+
 ### Skill wildcards
 
 `skill` and `skills:` entries may use one constrained wildcard form: a non-empty prefix followed by a final `*`. This means `skill: golang-*` is valid too; it can inject more than one matching skill while preserving the same ordering and de-dupe rules.
@@ -298,7 +300,7 @@ Skill-to-skill references are not recursive in v1. Loaded skills are treated as
 
 Chain wrapper templates ignore `skill` and `skills`; put skill frontmatter on the step templates instead. When a chain runs a step, that step uses its own skill configuration.
 
-Delegated prompts cannot combine `subagent:` with `skill` or `skills` in v1. Such prompts are rejected at registration time. Runtime delegation overrides such as `--subagent` and `--fork` also reject prompts or chain steps that declare skills, so they do not silently run without requested skill context.
+Delegated prompts can combine `subagent:` with `skill` or `skills`. The resolved skill content is prepended to the delegated task before the prompt body, so the child agent receives the same resolved skill content instead of silently dropping it. Runtime `--subagent` uses the same behavior for direct prompts and chain steps; runtime `--fork` uses it for direct prompts, while chain steps use their own `inheritContext` frontmatter.
 
 Compare prompts (`bestOfN`) cannot combine with `skill` or `skills` in v1 because compare execution delegates worker/reviewer/final-applier tasks. Add required skill instructions to the compare prompt body instead.
 

package/index.ts

@@ -51,7 +51,6 @@ import { formatPromptValidationReport, validatePromptTemplates, type RegisteredP
 import {
 	DRY_RUN_CHAIN_UNSUPPORTED,
 	DRY_RUN_COMPARE_UNSUPPORTED,
-	DRY_RUN_DELEGATED_SKILLS_UNSUPPORTED,
 	DRY_RUN_DETERMINISTIC_UNSUPPORTED,
 	createPromptDryRun,
 	parseDryRunCommand,
@@ -234,11 +233,6 @@ export default function promptModelExtension(pi: ExtensionAPI) {
 			notify(ctx, skillResolution.error, "error");
 			return "aborted";
 		}
-		if (requestedSkills.length > 0 && shouldDelegatePrompt(prompt, override)) {
-			notify(ctx, "Prompts with skill or skills frontmatter cannot run as subagents in v1.", "error");
-			return "aborted";
-		}
-
 		let deterministicPreamble: string | undefined;
 		if (prompt.deterministic) {
 			try {
@@ -1245,12 +1239,6 @@ export default function promptModelExtension(pi: ExtensionAPI) {
 							taskPreamble = `[Previous chain steps]\n\n${chainStepSummaries.join("\n\n")}`;
 						}
 
-						if (stepTemplate.tasks.some((task) => getRequestedSkills(task.prompt).length > 0 && shouldDelegatePrompt(task.prompt, subagentOverride))) {
-							notify(ctx, "Prompts with skill or skills frontmatter cannot run as subagents in v1.", "error");
-							aborted = true;
-							break;
-						}
-
 						let delegated;
 						try {
 							delegated = await executeSubagentPromptStep({
@@ -1448,7 +1436,6 @@ export default function promptModelExtension(pi: ExtensionAPI) {
 		if (prompt.chain) return DRY_RUN_CHAIN_UNSUPPORTED;
 		if (prompt.workers !== undefined || prompt.reviewers !== undefined || prompt.finalApplier !== undefined) return DRY_RUN_COMPARE_UNSUPPORTED;
 		if (prompt.deterministic) return DRY_RUN_DETERMINISTIC_UNSUPPORTED;
-		if (getRequestedSkills(prompt).length > 0 && shouldDelegatePrompt(prompt)) return DRY_RUN_DELEGATED_SKILLS_UNSUPPORTED;
 		return undefined;
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-prompt-template-model-enhanced",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "type": "module",
   "description": "Prompt template model selector extension for pi coding agent",
   "author": "Nico Bailon",

package/prompt-dry-run.ts

@@ -19,8 +19,6 @@ export const DRY_RUN_CHAIN_UNSUPPORTED =
 export const DRY_RUN_COMPARE_UNSUPPORTED = "Dry-run for compare prompts is not supported in v1.";
 export const DRY_RUN_DETERMINISTIC_UNSUPPORTED =
 	"Dry-run for deterministic prompts is not supported in v1 because it would require running configured commands/scripts.";
-export const DRY_RUN_DELEGATED_SKILLS_UNSUPPORTED =
-	"Prompts with skill or skills frontmatter cannot run as subagents in v1.";
 
 export interface PromptDryRunSkillPreview {
 	skillName: string;
@@ -346,10 +344,6 @@ export async function createPromptDryRun(
 	}
 	if (effectivePrompt.inheritContext) runtime.inheritContext = true;
 
-	if (requestedSkills.length > 0 && delegated) {
-		return errorResult(prompt, DRY_RUN_DELEGATED_SKILLS_UNSUPPORTED, warnings, runtime);
-	}
-
 	const loopRotation = applyRepresentativeLoopRotation(effectivePrompt, runtime);
 	effectivePrompt = loopRotation.prompt;
 

package/prompt-loader.ts

@@ -1845,17 +1845,6 @@ function loadPromptsWithModelFromDir(
 					);
 					continue;
 				}
-				if (subagent !== undefined && (Object.hasOwn(frontmatter, "skill") || Object.hasOwn(frontmatter, "skills"))) {
-					diagnostics.push(
-						createDiagnostic(
-							"invalid-subagent-skills",
-							fullPath,
-							source,
-							`Skipping prompt template at ${fullPath}: frontmatter field "subagent" cannot be combined with "skill" or "skills" in v1.`,
-						),
-					);
-					continue;
-				}
 				const skillResult = chain ? { ok: true as const } : normalizePromptSkills(frontmatter, fullPath, source, diagnostics);
 				if (!skillResult.ok) continue;
 				const skill = skillResult.skill;

package/prompt-validation.ts

@@ -191,19 +191,7 @@ function validateParallelRuntimeSettings(cwd: string, result: PromptValidationRe
 		.map((step) => ({ step, target: prompts.get(step.name) }))
 		.filter((entry): entry is { step: ChainStep; target: LoadedPrompt } => entry.target !== undefined && !entry.target.chain);
 
-	const runtimeDelegatableTargets = targets.filter((entry) => uniqueSkillNames(entry.target.skills).length === 0);
-	for (const entry of targets) {
-		const skillNames = uniqueSkillNames(entry.target.skills);
-		if (skillNames.length === 0) continue;
-		result.diagnostics.push(
-			createValidationDiagnostic(
-				"parallel-skill-subagent-incompatible",
-				prompt.filePath,
-				prompt.source,
-				`Prompt template ${prompt.filePath} references parallel chain step template ${JSON.stringify(entry.step.name)}, but parallel() steps require delegated execution and skill frontmatter (${skillNames.join(", ")}) cannot run as a subagent in v1.`,
-			),
-		);
-	}
+	const runtimeDelegatableTargets = targets;
 	if (targets.length < 2) return;
 
 	if (runtimeDelegatableTargets.length >= 2) {

package/subagent-step.ts

@@ -7,6 +7,7 @@ import { Key, matchesKey } from "@earendil-works/pi-tui";
 import { preparePromptExecution } from "./prompt-execution.js";
 import type { PromptWithModel } from "./prompt-loader.js";
 import { notify } from "./notifications.js";
+import { buildSkillLoadedMessage, getRequestedSkills, resolvePromptSkills, type RuntimeSkillCommand } from "./prompt-skills.js";
 import {
 	DEFAULT_SUBAGENT_NAME,
 	appendDelegatedLiveOutput,
@@ -165,6 +166,7 @@ interface PreparedDelegatedTask {
 async function prepareDelegatedTask(
 	task: DelegatedParallelTaskInput,
 	ctx: ExtensionContext,
+	commands: RuntimeSkillCommand[],
 	currentModel: Model<any> | undefined,
 	override: SubagentOverride | undefined,
 	inheritedModel: Model<any> | undefined,
@@ -196,10 +198,19 @@ async function prepareDelegatedTask(
 		throw new Error(prepared.message);
 	}
 	if (prepared.warning) notify(ctx, prepared.warning, "warning");
+	const requestedSkills = getRequestedSkills(task.prompt);
+	const skillResolution = resolvePromptSkills(requestedSkills, ctx.cwd, commands);
+	if (skillResolution.kind === "error") {
+		throw new Error(skillResolution.error);
+	}
+	const skillPreamble = skillResolution.kind === "ready" ? buildSkillLoadedMessage(skillResolution.skills).content : undefined;
 	let taskText = prepared.content;
 	if (!task.prompt.inheritContext && taskPreamble) {
 		taskText = `${taskPreamble}\n\n---\n\n${prepared.content}`;
 	}
+	if (skillPreamble) {
+		taskText = `${skillPreamble}\n\n---\n\n${taskText}`;
+	}
 	if (task.taskPrefix) {
 		taskText = `${task.taskPrefix}\n\n${taskText}`;
 	}
@@ -538,6 +549,7 @@ async function requestDelegatedRun(
 
 export async function executeSubagentPromptStep(options: DelegatedPromptOptions): Promise<DelegatedPromptOutcome | undefined> {
 	const { pi, ctx, currentModel, override, signal, inheritedModel, taskPreamble, allowPartialFailures } = options;
+	const commands = typeof (pi as { getCommands?: () => RuntimeSkillCommand[] }).getCommands === "function" ? (pi as { getCommands: () => RuntimeSkillCommand[] }).getCommands() : [];
 	const runtime = await ensureSubagentRuntime(ctx.cwd);
 	const isParallelRequest = "parallel" in options;
 
@@ -548,7 +560,7 @@ export async function executeSubagentPromptStep(options: DelegatedPromptOptions)
 
 	const preparedTasks: PreparedDelegatedTask[] = [];
 	for (const task of tasks) {
-		const preparedTask = await prepareDelegatedTask(task, ctx, currentModel, override, inheritedModel, taskPreamble, runtime);
+		const preparedTask = await prepareDelegatedTask(task, ctx, commands, currentModel, override, inheritedModel, taskPreamble, runtime);
 		preparedTasks.push(preparedTask);
 	}