pi-cache-optimizer 2.8.24 → 2.8.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cache-optimizer",
-  "version": "2.8.24",
+  "version": "2.8.25",
   "description": "Improve Pi prompt/KV cache hit rates with stable prompts, OpenAI-compatible cache keys, proxy compat warnings, and footer cache stats.",
   "keywords": [
     "pi-package",

package/src/prompt-rewrite.ts

@@ -19,15 +19,21 @@ export function escapeXml(value: string): string {
     .replace(/'/g, "'");
 }
 
-/** The tool Pi tells the model to load skill files with: `read` when selected, otherwise `bash`; undefined when neither. */
-export type SkillFileReadTool = "read" | "bash";
-
-export function skillFileReadTool(opts: Pick<BuildSystemPromptOptions, "selectedTools">): SkillFileReadTool | undefined {
-  const tools = opts.selectedTools ?? ["read", "bash", "edit", "write"];
-  return (["read", "bash"] as const).find((tool) => tools.includes(tool));
+/**
+ * The tool Pi tells the model to load skill files with: the first declared of `read`/`bash`;
+ * `indirect` when they are selected but hidden (reachable only through another tool); undefined when neither.
+ */
+export type SkillFileReadTool = "read" | "bash" | "indirect";
+
+export function skillFileReadTool(opts: Pick<BuildSystemPromptOptions, "selectedTools" | "hiddenTools">): SkillFileReadTool | undefined {
+  const selected = opts.selectedTools ?? ["read", "bash", "edit", "write"];
+  const hidden = opts.hiddenTools ?? [];
+  const readers = ["read", "bash"] as const;
+  return readers.find((tool) => selected.includes(tool) && !hidden.includes(tool)) ??
+    (readers.some((tool) => selected.includes(tool)) ? "indirect" : undefined);
 }
 
-/** Byte-for-byte copy of Pi's formatter (contract-tested against the installed Pi for both tool wordings). */
+/** Byte-for-byte copy of Pi's formatter (contract-tested against the installed Pi for every tool wording). */
 export function formatSkillsForPrompt(skills: NonNullable<BuildSystemPromptOptions["skills"]>, fileReadTool: SkillFileReadTool = "read"): string {
   const visibleSkills = skills.filter((skill) => !skill.disableModelInvocation);
   if (visibleSkills.length === 0) return "";
@@ -36,7 +42,9 @@ export function formatSkillsForPrompt(skills: NonNullable<BuildSystemPromptOptio
     "\n\nThe following skills provide specialized instructions for specific tasks.",
     fileReadTool === "read"
       ? "Use the read tool to load a skill's file when the task matches its description."
-      : "Use bash to load a skill's file when the task matches its description.",
+      : fileReadTool === "bash"
+        ? "Use bash to load a skill's file when the task matches its description."
+        : "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>",