agent-contracts 0.23.0 → 0.23.2

package/dist/index.js

@@ -50032,7 +50032,12 @@ function deepMergeEntities(base, project, path, hasExtends) {
       } else if (isRecord2(baseVal)) {
         result[key] = applyMapMergeOperator(baseVal, projVal, `${path}.${key}`);
       } else {
-        result[key] = applyArrayMergeOperator([], projVal, `${path}.${key}`);
+        const op = hasOperator(projVal, `${path}.${key}`);
+        if (op === "$replace") {
+          result[key] = projVal["$replace"];
+        } else {
+          result[key] = applyArrayMergeOperator([], projVal, `${path}.${key}`);
+        }
       }
     } else if (isRecord2(projVal) && isRecord2(baseVal) && !Array.isArray(projVal) && !Array.isArray(baseVal)) {
       result[key] = deepMergeEntities(
@@ -50048,6 +50053,40 @@ function deepMergeEntities(base, project, path, hasExtends) {
   return result;
 }
 var OPERATOR_KEYS = /* @__PURE__ */ new Set(["$append", "$prepend", "$insert_after", "$replace", "$remove"]);
+function mergeSection(base, project, path, hasExtends, mode) {
+  switch (mode) {
+    case "map": {
+      const baseMap = isRecord2(base) ? base : {};
+      return mergeEntityMaps(baseMap, project, path, hasExtends);
+    }
+    case "array": {
+      const baseArr = Array.isArray(base) ? base : [];
+      if (isRecord2(project) && hasOperator(project, path)) {
+        if (!hasExtends) {
+          throw new MergeError(
+            `Merge operator used without extends at ${path}`
+          );
+        }
+        return applyArrayMergeOperator(baseArr, project, path);
+      }
+      const projArr = Array.isArray(project) ? project : [];
+      return [...baseArr, ...projArr];
+    }
+    case "object": {
+      const baseObj = isRecord2(base) ? base : {};
+      const projObj = isRecord2(project) ? project : {};
+      if (hasOperator(projObj, path)) {
+        if (!hasExtends) {
+          throw new MergeError(
+            `Merge operator used without extends at ${path}`
+          );
+        }
+        return applyMapMergeOperator(baseObj, projObj, path);
+      }
+      return deepMergeEntities(baseObj, projObj, path, hasExtends);
+    }
+  }
+}
 function mergeEntityMaps(baseMap, projectMap, path, hasExtends) {
   let result;
   if (isRecord2(projectMap) && !Array.isArray(projectMap)) {
@@ -50068,9 +50107,10 @@ function mergeEntityMaps(baseMap, projectMap, path, hasExtends) {
   for (const [key, projVal] of Object.entries(projectMap)) {
     if (OPERATOR_KEYS.has(key)) continue;
     const baseVal = result[key];
-    if (baseVal !== void 0 && isRecord2(baseVal) && isRecord2(projVal)) {
+    if (isRecord2(projVal) && !Array.isArray(projVal)) {
+      const baseObj = isRecord2(baseVal) ? baseVal : {};
       result[key] = deepMergeEntities(
-        baseVal,
+        baseObj,
         projVal,
         `${path}.${key}`,
         hasExtends
@@ -50081,44 +50121,33 @@ function mergeEntityMaps(baseMap, projectMap, path, hasExtends) {
   }
   return result;
 }
-var MERGE_SECTIONS = [
-  "agents",
-  "tasks",
-  "artifacts",
-  "tools",
-  "validations",
-  "handoff_types",
-  "imports",
-  "workflow",
-  "policies",
-  "guardrails",
-  "guardrail_policies",
-  "components",
-  "extensions"
-];
+var DSL_SECTIONS = {
+  agents: "map",
+  tasks: "map",
+  artifacts: "map",
+  tools: "map",
+  validations: "map",
+  handoff_types: "map",
+  imports: "map",
+  workflow: "map",
+  policies: "map",
+  guardrails: "map",
+  guardrail_policies: "map",
+  components: "map",
+  extensions: "map",
+  system: "object"
+};
 function mergeDsl(base, project) {
   const hasExtends = typeof project["extends"] === "string";
   const result = { ...base, ...project };
-  if (project["system"] && base["system"]) {
-    result["system"] = deepMergeEntities(
-      base["system"],
-      project["system"],
-      "system",
-      hasExtends
-    );
-  }
-  for (const section of MERGE_SECTIONS) {
-    const baseVal = base[section];
-    const projVal = project[section];
-    if (projVal === void 0) {
-      continue;
-    }
-    const baseMap = isRecord2(baseVal) ? baseVal : {};
-    result[section] = mergeEntityMaps(
-      baseMap,
-      projVal,
+  for (const [section, mode] of Object.entries(DSL_SECTIONS)) {
+    if (project[section] === void 0) continue;
+    result[section] = mergeSection(
+      base[section],
+      project[section],
       section,
-      hasExtends
+      hasExtends,
+      mode
     );
   }
   delete result["extends"];
@@ -54141,8 +54170,16 @@ function filterIds(allIds, include, exclude) {
   if (exclude) return allIds.filter((id) => !exclude.includes(id));
   return allIds;
 }
-function expandOutputPath(pattern, context, entityId) {
-  return pattern.replace(new RegExp(`\\{${context}\\.id\\}`, "g"), entityId);
+function expandOutputPath(pattern, context, entityId, entity) {
+  return pattern.replace(
+    new RegExp(`\\{${context}\\.([^}]+)\\}`, "g"),
+    (_match, field) => {
+      if (field === "id") return entityId;
+      if (entity === void 0) return _match;
+      const value = entity[field];
+      return typeof value === "string" ? value : _match;
+    }
+  );
 }
 function buildEntityContext(dsl, context, entityId) {
   switch (context) {
@@ -54207,7 +54244,8 @@ async function renderFromConfig(dsl, renderTargets, options) {
       for (const entityId of ids) {
         const ctx = buildEntityContext(dsl, target.context, entityId);
         const output = compiled(ctx);
-        const outputPath = expandOutputPath(target.output, target.context, entityId);
+        const entity = section[entityId];
+        const outputPath = expandOutputPath(target.output, target.context, entityId, entity);
         if (target.skip_empty && isEffectivelyEmpty(output)) {
           await removeIfExists(outputPath);
           continue;
@@ -54256,7 +54294,8 @@ async function checkDriftFromConfig(dsl, renderTargets, options) {
       for (const entityId of ids) {
         const ctx = buildEntityContext(dsl, target.context, entityId);
         const expected = compiled(ctx);
-        const outputPath = expandOutputPath(target.output, target.context, entityId);
+        const entity = section[entityId];
+        const outputPath = expandOutputPath(target.output, target.context, entityId, entity);
         await checkExpectedVsExisting(expected, outputPath, target.skip_empty, diffs);
       }
     }
@@ -54471,42 +54510,23 @@ function resolveDslPath(dirArg, dirArgDefault, config) {
 }
 
 // src/config/binding-merger.ts
-function isRecord5(v2) {
-  return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
-}
-var BINDING_MAP_MERGE_SECTIONS = ["guardrail_impl", "outputs"];
-var BINDING_ARRAY_MERGE_SECTIONS = ["renders"];
+var BINDING_SECTIONS = {
+  guardrail_impl: "map",
+  outputs: "map",
+  renders: "array",
+  reporting: "object"
+};
 function mergeBinding(base, project) {
   const hasExtends = typeof project["extends"] === "string";
   const result = { ...base, ...project };
-  for (const section of BINDING_MAP_MERGE_SECTIONS) {
-    const baseVal = base[section];
-    const projVal = project[section];
-    if (projVal === void 0) {
-      continue;
-    }
-    const baseMap = isRecord5(baseVal) ? baseVal : {};
-    result[section] = mergeEntityMaps(
-      baseMap,
-      projVal,
+  for (const [section, mode] of Object.entries(BINDING_SECTIONS)) {
+    if (project[section] === void 0) continue;
+    result[section] = mergeSection(
+      base[section],
+      project[section],
       section,
-      hasExtends
-    );
-  }
-  for (const section of BINDING_ARRAY_MERGE_SECTIONS) {
-    const baseVal = base[section];
-    const projVal = project[section];
-    if (projVal === void 0) continue;
-    const baseArr = Array.isArray(baseVal) ? baseVal : [];
-    const projArr = Array.isArray(projVal) ? projVal : [];
-    result[section] = [...baseArr, ...projArr];
-  }
-  if (project["reporting"] !== void 0 && isRecord5(base["reporting"]) && isRecord5(project["reporting"])) {
-    result["reporting"] = deepMergeEntities(
-      base["reporting"],
-      project["reporting"],
-      "reporting",
-      hasExtends
+      hasExtends,
+      mode
     );
   }
   delete result["extends"];
@@ -54945,7 +54965,8 @@ async function loadRenderedFiles(dsl, renderTargets) {
     const section = getDslSection(dsl, target.context);
     const ids = filterIds(Object.keys(section), target.include, target.exclude);
     for (const entityId of ids) {
-      const outputPath = expandOutputPath(target.output, target.context, entityId);
+      const entity = section[entityId];
+      const outputPath = expandOutputPath(target.output, target.context, entityId, entity);
       try {
         const content = await readFile5(outputPath, "utf8");
         entries.push({ agent_id: entityId, path: outputPath, content });
@@ -54997,7 +55018,7 @@ function formatDslOverview(dsl) {
     `- Validations: ${Object.keys(dsl.validations).join(", ")}`
   ].join("\n");
 }
-function isRecord6(v2) {
+function isRecord5(v2) {
   return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
 }
 function collectAllXUsages(dsl) {
@@ -55010,7 +55031,7 @@ function collectAllXUsages(dsl) {
     }
   }
   walk(dsl, "", "root");
-  if (isRecord6(dsl.system)) walk(dsl.system, "system", "system");
+  if (isRecord5(dsl.system)) walk(dsl.system, "system", "system");
   for (const [id, a3] of Object.entries(dsl.agents))
     walk(a3, `agents.${id}`, "agent");
   for (const [id, t3] of Object.entries(dsl.tasks))
@@ -56272,8 +56293,9 @@ async function generateGuardrails(options) {
           const entityCtx = buildEntityContext(dsl, context, entityId);
           const mergedCtx = { ...entityCtx, vars, paths, binding, resolved_checks: checkResult.resolved };
           const rendered = compiled(mergedCtx);
+          const entity = section[entityId];
           const resolvedOutput = resolveBindingRenderOutputPath(
-            expandOutputPath(renderTarget.output, context, entityId),
+            expandOutputPath(renderTarget.output, context, entityId, entity),
             paths
           );
           const outputPath = resolve6(config.configDir, resolvedOutput);