@oh-my-pi/pi-coding-agent 16.2.13 → 16.3.0

package/src/extensibility/skills.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
-import { getProjectDir } from "@oh-my-pi/pi-utils";
+import { getProjectDir, prompt } from "@oh-my-pi/pi-utils";
 import {
 	isValidManagedSkillName,
 	MANAGED_SKILLS_PROVIDER_ID,
@@ -11,6 +11,8 @@ import type { SourceMeta } from "../capability/types";
 import type { SkillsSettings } from "../config/settings";
 import { type Skill as CapabilitySkill, loadCapability } from "../discovery";
 import { compareSkillOrder, scanSkillsFromDir } from "../discovery/helpers";
+import autoloadTemplate from "../prompts/skills/autoload.md" with { type: "text" };
+import userInvocationTemplate from "../prompts/skills/user-invocation.md" with { type: "text" };
 import type { SkillPromptDetails } from "../session/messages";
 import { expandTilde } from "../tools/path-utils";
 export interface Skill {
@@ -461,18 +463,39 @@ function startsWithLocalExecutionPrefix(trimmedStart: string): boolean {
 	return next === 32 /* space */ || next === 9 /* tab */ || next === 10 /* LF */ || next === 13 /* CR */;
 }
 
+export type SkillInvocationKind = "user" | "autoload";
+
 export async function buildSkillPromptMessage(
-	skill: Pick<Skill, "name" | "filePath">,
+	skill: Pick<Skill, "name" | "filePath" | "baseDir">,
 	args: string,
+	invocation: SkillInvocationKind = "user",
 ): Promise<BuiltSkillPromptMessage> {
 	const content = await Bun.file(skill.filePath).text();
 	const body = content.replace(/^---\n[\s\S]*?\n---\n/, "").trim();
-	const metaLines = [`Skill: ${skill.filePath}`];
 	const trimmedArgs = args.trim();
-	if (trimmedArgs) {
-		metaLines.push(`User: ${trimmedArgs}`);
+	let message: string;
+	if (invocation === "user") {
+		// User-invoked skills announce themselves and expose their skill directory
+		// so the model resolves the skill's own relative paths (scripts/, templates/).
+		message = prompt
+			.render(userInvocationTemplate, {
+				name: skill.name,
+				body,
+				baseDir: skill.baseDir,
+				userArgs: trimmedArgs || undefined,
+			})
+			.trim();
+	} else {
+		// Autoload skills are hidden, non-user context — they MUST NOT claim the
+		// user invoked them; this keeps the minimal provenance-only format.
+		message = prompt
+			.render(autoloadTemplate, {
+				body,
+				filePath: skill.filePath,
+				userArgs: trimmedArgs || undefined,
+			})
+			.trim();
 	}
-	const message = `${body}\n\n---\n\n${metaLines.join("\n")}`;
 	return {
 		message,
 		details: {

package/src/goals/guided-setup.ts

@@ -5,7 +5,7 @@ import { extractTextContent, extractToolCall, parseJsonPayload } from "../commit
 import guidedGoalInterviewPrompt from "../prompts/goals/guided-goal-interview.md" with { type: "text" };
 import guidedGoalSystemPrompt from "../prompts/goals/guided-goal-system.md" with { type: "text" };
 import type { AgentSession } from "../session/agent-session";
-import { shouldDisableReasoning, toReasoningEffort } from "../thinking";
+import { concreteThinkingLevel, shouldDisableReasoning, toReasoningEffort } from "../thinking";
 
 const RESPOND_TOOL_NAME = "respond";
 
@@ -92,6 +92,7 @@ export async function runGuidedGoalTurn(
 	// never sent verbatim to the plan/slow provider. Deobfuscated again below before display/use.
 	const obfuscator = session.obfuscator;
 	const promptText = obfuscator?.hasSecrets() ? obfuscator.obfuscate(userPrompt) : userPrompt;
+	const thinkingLevel = concreteThinkingLevel(resolved.thinkingLevel);
 	const response = await instrumentedCompleteSimple(
 		resolved.model,
 		{
@@ -102,8 +103,8 @@ export async function runGuidedGoalTurn(
 		{
 			apiKey: session.modelRegistry.resolver(resolved.model, session.sessionId),
 			signal: options.signal,
-			reasoning: toReasoningEffort(resolved.thinkingLevel),
-			disableReasoning: shouldDisableReasoning(resolved.thinkingLevel),
+			reasoning: toReasoningEffort(thinkingLevel),
+			disableReasoning: shouldDisableReasoning(thinkingLevel),
 			toolChoice: { type: "tool", name: RESPOND_TOOL_NAME },
 		},
 		{ telemetry: resolveTelemetry(session.agent.telemetry, session.sessionId), oneshotKind: "guided_goal_setup" },