omp-fabric 1.0.4 → 1.0.5

package/dist/index.js

@@ -60,14 +60,14 @@ import {
   expandSkillDirMarkersForRead,
   expandSkillDirMarkersInSkillBlock,
   filterPrewalkContinuationMessages,
-  formatSkillsForPrompt,
+  formatSkillsSection,
   hasPrewalkArmedPrompt,
   prewalkArmedPrompt,
   repairFabricGuestCode,
   resolveFabricIdentity,
   settleInPlacePrewalk,
   streamedToolCallName
-} from "./chunks/chunk-DOKANNFC.js";
+} from "./chunks/chunk-TLSJXU4F.js";
 import "./chunks/chunk-7VIQNUPS.js";
 import {
   AgentTranscriptReader
@@ -2175,23 +2175,35 @@ var fabricSchemaGuidance = (mode) => {
 };
 
 // src/core/skill-prompt.ts
+import { getActiveSkills, Settings } from "@oh-my-pi/pi-coding-agent";
 var OMP_SKILL_SECTION_MARKER = "<skills>";
+var OMP_SKILL_SECTION_HEADING = "# Skills & Rules\n";
 var OMP_SKILL_LOAD_INSTRUCTION = "Matching skill \u2192 MUST read `skill://<name>` first.";
+var OMP_CUSTOM_SKILL_LOAD_INSTRUCTION = "If a skill applies, you MUST read `skill://<name>` before proceeding.";
 var FABRIC_OMP_SKILL_LOAD_INSTRUCTION = "Matching skill \u2192 MUST read `skill://<name>` through `omp.read` inside `fabric_exec` first.";
-var LEGACY_SKILL_LOAD_INSTRUCTION = "Use the read tool to load a skill's file when the task matches its description.";
-var FABRIC_SKILL_LOAD_INSTRUCTION = "Use `omp.read` inside `fabric_exec` to load a skill's file when the task matches its description.";
+var FABRIC_CUSTOM_SKILL_LOAD_INSTRUCTION = "If a skill applies, you MUST read `skill://<name>` through `omp.read` inside `fabric_exec` before proceeding.";
+var activeSkills = () => getActiveSkills();
+var listableSkills = (skills) => {
+  try {
+    if (Settings.instance.get("skillful") === false) return [];
+  } catch {
+    return skills;
+  }
+  return skills;
+};
 var restoreSkillsForFullCodePrompt = (systemPrompt, skills) => {
   if (systemPrompt.includes(OMP_SKILL_SECTION_MARKER)) {
-    return systemPrompt.replace(
-      OMP_SKILL_LOAD_INSTRUCTION,
-      FABRIC_OMP_SKILL_LOAD_INSTRUCTION
-    );
+    return systemPrompt.replace(OMP_SKILL_LOAD_INSTRUCTION, FABRIC_OMP_SKILL_LOAD_INSTRUCTION).replace(OMP_CUSTOM_SKILL_LOAD_INSTRUCTION, FABRIC_CUSTOM_SKILL_LOAD_INSTRUCTION);
   }
-  const section = formatSkillsForPrompt([...skills]).replace(
-    LEGACY_SKILL_LOAD_INSTRUCTION,
-    FABRIC_SKILL_LOAD_INSTRUCTION
-  );
-  return section ? `${systemPrompt}${section}` : systemPrompt;
+  const section = formatSkillsSection(skills, FABRIC_OMP_SKILL_LOAD_INSTRUCTION);
+  if (!section) return systemPrompt;
+  const heading = systemPrompt.indexOf(OMP_SKILL_SECTION_HEADING);
+  if (heading < 0) return `${systemPrompt}
+
+${section}`;
+  const insertAt = heading + OMP_SKILL_SECTION_HEADING.length;
+  return `${systemPrompt.slice(0, insertAt)}${section}
+${systemPrompt.slice(insertAt)}`;
 };
 
 // src/core/proxy-contract.ts
@@ -2346,7 +2358,7 @@ var buildSkillReferenceGuidance = (prompt, skills) => {
   const body = prompt.slice(openingEnd + 2, closingTag);
   const invocationLines = body.split("\n").filter((line) => INVOCATION_VERB.test(line) && !NEGATED_INVOCATION.test(line));
   const referenced = skills.filter(
-    (skill) => skill.name !== active.name && skill.disableModelInvocation !== true && invocationLines.some((line) => referencesSkill(line, skill.name))
+    (skill) => skill.name !== active.name && skill.hide !== true && invocationLines.some((line) => referencesSkill(line, skill.name))
   );
   if (referenced.length === 0) return void 0;
   const mappings = referenced.map((skill) => `- /${skill.name} -> ${JSON.stringify(skill.filePath)}`).join("\n");
@@ -5595,9 +5607,12 @@ async function ompFabric(omp) {
     reassertToolOwnership();
     const effectiveFullCodeMode = fullCodeMode || schemaMode === "enforce";
     if (!omp.getActiveTools().includes("fabric_exec")) return;
-    const skills = event.systemPromptOptions?.skills ?? [];
+    const skills = activeSkills();
     const captureSnapshot = state.cwd ? capturePolicy() : void 0;
-    const systemPrompt = effectiveFullCodeMode ? restoreSkillsForFullCodePrompt(event.systemPrompt.join("\n"), skills) : event.systemPrompt.join("\n");
+    const systemPrompt = effectiveFullCodeMode ? restoreSkillsForFullCodePrompt(
+      event.systemPrompt.join("\n"),
+      listableSkills(skills)
+    ) : event.systemPrompt.join("\n");
     const skillReferenceGuidance = effectiveFullCodeMode ? buildSkillReferenceGuidance(event.prompt, skills) : void 0;
     const currentModel = context.model ? `${context.model.provider}/${context.model.id}` : void 0;
     const resolvedGuidance = resolveFabricModelGuidance(state.modelGuidance(), {