oh-my-promptfoo 1.11.0 → 1.12.0

package/README.md

@@ -25,6 +25,12 @@ Set the agent credential through `delegate.env` in authored evals. Set
 require ORAS 1.x through `ALLAGENTS_ORAS_PATH`. A trusted runner must provide
 `ALLAGENTS_LOCAL_SOURCE_ROOT` before acquiring `type: local` sources.
 
+Several `type: local` sources may name the same `destination` and merge into one
+tree, so N plugins can stage their skills into a single `.agents/skills`. They
+must agree on `permissions`, and no two of them may contribute the same relative
+path; a collision names both sources and fails. Git and OCI sources keep
+exclusive destinations, and nested destinations remain rejected.
+
 `llmAssert` batches named criteria into one judge request. A component passes
 when its judge verdict is not false, and `config.threshold` adds a numeric bar
 on top of that verdict when you state one — the same contract as Promptfoo's

package/dist/cli.js

@@ -898,7 +898,7 @@ async function prepareProtectedCopy(source, path2, viewMode = "auto", caseIndex,
 init_esm_shims();
 import { isAbsolute as isAbsolute2, posix } from "path";
 var DEFAULT_LIMITS = {
-  maxSources: 8,
+  maxSources: 64,
   maxDownloadBytes: 268435456,
   maxExtractedBytes: 536870912,
   timeoutMs: 12e4
@@ -2077,6 +2077,11 @@ import { isAbsolute as isAbsolute6, join as join8, relative as relative3, resolv
 import { Transform } from "stream";
 import { pipeline } from "stream/promises";
 var snapshots = /* @__PURE__ */ new WeakMap();
+function localEntries(source) {
+  const entries = snapshots.get(source);
+  if (!entries) throw new Error("Local source snapshot is not available to this provider");
+  return entries;
+}
 var ordered = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 var READ_FLAGS = constants5.O_RDONLY | constants5.O_NOFOLLOW | constants5.O_NONBLOCK;
 function sourceRoot(source, channels) {
@@ -2417,9 +2422,41 @@ async function logicalBytes(root) {
   }
   return total;
 }
+function assertMergeable(destination2, group) {
+  const owners = /* @__PURE__ */ new Map();
+  for (const source of group) {
+    if (source.type !== "local")
+      throw new Error(
+        `Only local sources may share destination ${JSON.stringify(destination2)}; ${source.type} source ${JSON.stringify(source.repository)} cannot merge`
+      );
+    for (const entry of localEntries(source)) {
+      const owner = owners.get(entry.path);
+      if (!owner) {
+        owners.set(entry.path, { path: source.path, entry });
+        continue;
+      }
+      if (owner.entry.size !== void 0 || entry.size !== void 0)
+        throw new Error(
+          `Sources sharing destination ${JSON.stringify(destination2)} both provide ${JSON.stringify(entry.path)}: ${owner.path} and ${source.path}`
+        );
+      if (owner.entry.mode !== entry.mode)
+        throw new Error(
+          `Sources sharing destination ${JSON.stringify(destination2)} disagree on the mode of directory ${JSON.stringify(entry.path)}: ${owner.path} and ${source.path}`
+        );
+    }
+  }
+}
 async function materializeSources(resolved, staging, limits, channels, signal, caseIndex) {
   signal?.throwIfAborted();
   if (resolved.length > limits.maxSources) throw new Error("Too many resolved sources");
+  const groups = /* @__PURE__ */ new Map();
+  for (const source of resolved) {
+    const group = groups.get(source.destination);
+    if (group) group.push(source);
+    else groups.set(source.destination, [source]);
+  }
+  for (const [destination2, group] of groups)
+    if (group.length > 1) assertMergeable(destination2, group);
   staging = resolve9(staging);
   const writer = await PhysicalWriter.create(
     staging,
@@ -2489,13 +2526,20 @@ function acquisitionIdentity(source) {
     materializerVersion: source.materializerVersion ?? 1
   };
 }
-function protectedCheckoutKey(source, viewMode = "auto") {
-  const identity = canonicalJson(acquisitionIdentity(source));
+function sortedIdentities(sources) {
+  return sources.map((source) => {
+    const identity = acquisitionIdentity(source);
+    return { destination: source.destination, identity, text: canonicalJson(identity) };
+  }).sort(
+    (a, b) => a.destination < b.destination ? -1 : a.destination > b.destination ? 1 : a.text < b.text ? -1 : a.text > b.text ? 1 : 0
+  ).map((entry) => entry.identity);
+}
+function protectedCheckoutKey(sources, viewMode = "auto") {
+  const identity = sources.length === 1 ? canonicalJson(acquisitionIdentity(sources[0])) : canonicalJson({ schemaVersion: 1, merged: sortedIdentities(sources) });
   return hash(viewMode === "copy-only" ? `${identity}\0copy-only` : identity);
 }
 function manifestDigest(sources) {
-  const identities = [...sources].sort((a, b) => a.destination < b.destination ? -1 : a.destination > b.destination ? 1 : 0).map(acquisitionIdentity);
-  return `sha256:${hash(canonicalJson({ schemaVersion: 1, sources: identities }))}`;
+  return `sha256:${hash(canonicalJson({ schemaVersion: 1, sources: sortedIdentities(sources) }))}`;
 }
 var MAX_INVENTORY_JSON_BYTES = 512 * 1024 ** 2;
 var LAST_USED_REFRESH_MS = 60 * 60 * 1e3;
@@ -2794,8 +2838,12 @@ var SeedCache = class {
       }
     });
   }
-  async protectedSource(record, source, signal, viewMode = "auto", caseIndex, sourceIndex, sourceCount) {
-    const key = protectedCheckoutKey(source, viewMode);
+  /** `sources` is every source contributing to one destination, merged or alone. */
+  async protectedSource(record, sources, signal, viewMode = "auto", caseIndex, sourceIndex, sourceCount) {
+    const destination2 = sources[0]?.destination;
+    if (destination2 === void 0 || sources.some((source) => source.destination !== destination2))
+      throw new Error("Protected checkout requires sources sharing one destination");
+    const key = protectedCheckoutKey(sources, viewMode);
     const path2 = join10(this.root, "checkouts", key, "tree");
     return this.lockAcquisition(
       join10(this.root, "locks", "admission"),
@@ -2818,7 +2866,7 @@ var SeedCache = class {
               );
             }
           } else {
-            const seedSource = join10(this.seedPath(record.digest), source.destination);
+            const seedSource = join10(this.seedPath(record.digest), destination2);
             await measuredPhase(
               "checkout-admission",
               async () => this.admit(