oh-my-promptfoo 1.7.0 → 1.7.1

package/dist/delegate-runner.js

@@ -5048,7 +5048,7 @@ init_esm();
 var import_context_async_hooks = __toESM(require_src(), 1);
 init_esm3();
 var import_sdk_trace_node = __toESM(require_src2(), 1);
-import { lstatSync, statSync as statSync2 } from "fs";
+import { lstatSync, readFileSync, statSync as statSync2 } from "fs";
 import { stat } from "fs/promises";
 import { basename, dirname as dirname2, isAbsolute as isAbsolute2, resolve as resolve3 } from "path";
 import { pathToFileURL as pathToFileURL3 } from "url";
@@ -6889,6 +6889,21 @@ async function runNative(frame, signal) {
   }
   return response;
 }
+var skillParentDirectories = [".agents", ".claude", ".github"];
+function workspaceSkillDirectories(workingDir) {
+  const directories = [];
+  for (const name of skillParentDirectories) {
+    const parent = resolve3(workingDir, name);
+    const skills = resolve3(parent, "skills");
+    try {
+      if (lstatSync(parent).isDirectory() && lstatSync(skills).isDirectory())
+        directories.push(skills);
+    } catch (error) {
+      if (error.code !== "ENOENT") throw error;
+    }
+  }
+  return directories;
+}
 function observedSkillRead(toolName, args, workingDir) {
   if (!["read", "read_file", "view"].includes(toolName) || !args || typeof args !== "object" || Array.isArray(args))
     return;
@@ -6898,17 +6913,20 @@ function observedSkillRead(toolName, args, workingDir) {
   const candidate = resolve3(workingDir, path4);
   const skillDirectory = dirname2(candidate);
   const skillsDirectory = dirname2(skillDirectory);
-  if (basename(skillsDirectory) !== "skills" || ![".agents", ".claude", ".github"].includes(basename(dirname2(skillsDirectory))))
+  if (basename(skillsDirectory) !== "skills" || !skillParentDirectories.includes(basename(dirname2(skillsDirectory))))
     return;
   try {
-    const root = statSync2(workingDir, { bigint: true });
+    const rootPath = resolve3(workingDir);
+    const root = statSync2(rootPath, { bigint: true });
     if (root.ino === 0n) return;
     let cursor = candidate;
     let file = true;
     while (true) {
       const info = lstatSync(cursor, { bigint: true });
-      if (info.isSymbolicLink() || file && !info.isFile()) return;
-      if (info.dev === root.dev && info.ino === root.ino)
+      const allowedAlias = info.isSymbolicLink() && cursor === rootPath;
+      if (info.isSymbolicLink() && !allowedAlias || file && !info.isFile()) return;
+      const physical = allowedAlias ? statSync2(cursor, { bigint: true }) : info;
+      if (physical.dev === root.dev && physical.ino === root.ino)
         return { name: basename(skillDirectory), path: candidate, source: "read-tool" };
       const parent = dirname2(cursor);
       if (parent === cursor) return;
@@ -6919,10 +6937,25 @@ function observedSkillRead(toolName, args, workingDir) {
     return;
   }
 }
+function verifiedSkillLoaderRecord(entry, workingDir) {
+  if (!entry || typeof entry !== "object" || Array.isArray(entry)) return;
+  const { name, path: path4, content } = entry;
+  if (typeof name !== "string" || typeof path4 !== "string" || typeof content !== "string") return;
+  const local = observedSkillRead("read_file", { path: path4 }, workingDir);
+  if (!local || local.name !== name) return;
+  try {
+    const body = readFileSync(local.path, "utf8").replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n/, "").replace(/\r\n/g, "\n").trim();
+    if (!body || body !== content.replace(/\r\n/g, "\n").trim()) return;
+    return { ...local, source: "sdk-skill-loader" };
+  } catch {
+    return;
+  }
+}
 async function runCopilot(frame, signal) {
   const sdk = await import(pathToFileURL3(resolvePeer(frame.basePath, "@github/copilot-sdk")).href);
   if (typeof sdk.CopilotClient !== "function")
     throw new Error("Install the supported @github/copilot-sdk@1.0.6 peer");
+  const skillDirectories = workspaceSkillDirectories(frame.workingDir);
   const client = new sdk.CopilotClient({
     workingDirectory: frame.workingDir,
     env: process.env,
@@ -6968,6 +7001,8 @@ async function runCopilot(frame, signal) {
       ...frame.config.provider ? { provider: frame.config.provider } : {},
       onPermissionRequest: approve,
       enableConfigDiscovery: false,
+      // Keep general config discovery off; expose only physical workspace skill directories.
+      ...skillDirectories.length ? { enableSkills: true, skillDirectories } : {},
       infiniteSessions: { enabled: false }
     });
     unsubscribe = session.on((event) => {
@@ -7031,6 +7066,18 @@ async function runCopilot(frame, signal) {
       frame.config.timeoutMs ?? 9e5
     );
     if (signal.aborted) throw new Error("Copilot call aborted");
+    if (!sessionError) {
+      try {
+        const invoked = await session.rpc?.skills?.getInvoked?.();
+        if (Array.isArray(invoked?.skills) && invoked.skills.length) {
+          for (const entry of invoked.skills) {
+            const loaded = verifiedSkillLoaderRecord(entry, frame.workingDir);
+            if (loaded) skillCalls.push(loaded);
+          }
+        }
+      } catch {
+      }
+    }
     if (sessionError)
       result = { error: sessionError, ...output ? { output } : {}, tokenUsage: usage, cost };
     else {