agent-contracts 0.23.0 → 0.23.2

package/dist/cli.js

@@ -51005,7 +51005,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(
@@ -51021,6 +51026,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)) {
@@ -51041,9 +51080,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
@@ -51054,44 +51094,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"];
@@ -51188,42 +51217,23 @@ function expandDefaults(data) {
 }
 
 // src/config/binding-merger.ts
-function isRecord3(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 = isRecord3(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 && isRecord3(base["reporting"]) && isRecord3(project["reporting"])) {
-    result["reporting"] = deepMergeEntities(
-      base["reporting"],
-      project["reporting"],
-      "reporting",
-      hasExtends
+      hasExtends,
+      mode
     );
   }
   delete result["extends"];
@@ -51437,7 +51447,7 @@ function checkDecisionStepRoutingKey(data) {
   }
   return diagnostics;
 }
-function isRecord4(v2) {
+function isRecord3(v2) {
   return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
 }
 function* enumerateEntitiesByType(data, nodeType) {
@@ -51447,41 +51457,41 @@ function* enumerateEntitiesByType(data, nodeType) {
       return;
     case "system": {
       const sys = data["system"];
-      if (isRecord4(sys)) yield { path: "system", obj: sys };
+      if (isRecord3(sys)) yield { path: "system", obj: sys };
       return;
     }
     case "agent": {
       const agents = data["agents"];
-      if (!isRecord4(agents)) return;
+      if (!isRecord3(agents)) return;
       for (const [id, a3] of Object.entries(agents)) {
-        if (isRecord4(a3)) yield { path: `agents.${id}`, obj: a3 };
+        if (isRecord3(a3)) yield { path: `agents.${id}`, obj: a3 };
       }
       return;
     }
     case "rule": {
       const agents = data["agents"];
-      if (!isRecord4(agents)) return;
+      if (!isRecord3(agents)) return;
       for (const [aid, a3] of Object.entries(agents)) {
-        if (!isRecord4(a3)) continue;
+        if (!isRecord3(a3)) continue;
         const rules = a3["rules"];
         if (!Array.isArray(rules)) continue;
         for (let i3 = 0; i3 < rules.length; i3++) {
           const r3 = rules[i3];
-          if (isRecord4(r3)) yield { path: `agents.${aid}.rules[${i3}]`, obj: r3 };
+          if (isRecord3(r3)) yield { path: `agents.${aid}.rules[${i3}]`, obj: r3 };
         }
       }
       return;
     }
     case "escalation_criterion": {
       const agents = data["agents"];
-      if (!isRecord4(agents)) return;
+      if (!isRecord3(agents)) return;
       for (const [aid, a3] of Object.entries(agents)) {
-        if (!isRecord4(a3)) continue;
+        if (!isRecord3(a3)) continue;
         const esc = a3["escalation_criteria"];
         if (!Array.isArray(esc)) continue;
         for (let i3 = 0; i3 < esc.length; i3++) {
           const e3 = esc[i3];
-          if (isRecord4(e3)) {
+          if (isRecord3(e3)) {
             yield {
               path: `agents.${aid}.escalation_criteria[${i3}]`,
               obj: e3
@@ -51493,14 +51503,14 @@ function* enumerateEntitiesByType(data, nodeType) {
     }
     case "prerequisite": {
       const agents = data["agents"];
-      if (!isRecord4(agents)) return;
+      if (!isRecord3(agents)) return;
       for (const [aid, a3] of Object.entries(agents)) {
-        if (!isRecord4(a3)) continue;
+        if (!isRecord3(a3)) continue;
         const pre = a3["prerequisites"];
         if (!Array.isArray(pre)) continue;
         for (let i3 = 0; i3 < pre.length; i3++) {
           const p2 = pre[i3];
-          if (isRecord4(p2)) {
+          if (isRecord3(p2)) {
             yield { path: `agents.${aid}.prerequisites[${i3}]`, obj: p2 };
           }
         }
@@ -51509,22 +51519,22 @@ function* enumerateEntitiesByType(data, nodeType) {
     }
     case "task": {
       const tasks = data["tasks"];
-      if (!isRecord4(tasks)) return;
+      if (!isRecord3(tasks)) return;
       for (const [id, t3] of Object.entries(tasks)) {
-        if (isRecord4(t3)) yield { path: `tasks.${id}`, obj: t3 };
+        if (isRecord3(t3)) yield { path: `tasks.${id}`, obj: t3 };
       }
       return;
     }
     case "execution_step": {
       const tasks = data["tasks"];
-      if (!isRecord4(tasks)) return;
+      if (!isRecord3(tasks)) return;
       for (const [tid, t3] of Object.entries(tasks)) {
-        if (!isRecord4(t3)) continue;
+        if (!isRecord3(t3)) continue;
         const steps = t3["execution_steps"];
         if (!Array.isArray(steps)) continue;
         for (let i3 = 0; i3 < steps.length; i3++) {
           const s2 = steps[i3];
-          if (isRecord4(s2)) {
+          if (isRecord3(s2)) {
             yield {
               path: `tasks.${tid}.execution_steps[${i3}]`,
               obj: s2
@@ -51536,30 +51546,30 @@ function* enumerateEntitiesByType(data, nodeType) {
     }
     case "artifact": {
       const arts = data["artifacts"];
-      if (!isRecord4(arts)) return;
+      if (!isRecord3(arts)) return;
       for (const [id, a3] of Object.entries(arts)) {
-        if (isRecord4(a3)) yield { path: `artifacts.${id}`, obj: a3 };
+        if (isRecord3(a3)) yield { path: `artifacts.${id}`, obj: a3 };
       }
       return;
     }
     case "tool": {
       const tools = data["tools"];
-      if (!isRecord4(tools)) return;
+      if (!isRecord3(tools)) return;
       for (const [id, t3] of Object.entries(tools)) {
-        if (isRecord4(t3)) yield { path: `tools.${id}`, obj: t3 };
+        if (isRecord3(t3)) yield { path: `tools.${id}`, obj: t3 };
       }
       return;
     }
     case "tool_command": {
       const tools = data["tools"];
-      if (!isRecord4(tools)) return;
+      if (!isRecord3(tools)) return;
       for (const [tid, t3] of Object.entries(tools)) {
-        if (!isRecord4(t3)) continue;
+        if (!isRecord3(t3)) continue;
         const cmds = t3["commands"];
         if (!Array.isArray(cmds)) continue;
         for (let i3 = 0; i3 < cmds.length; i3++) {
           const c2 = cmds[i3];
-          if (isRecord4(c2)) {
+          if (isRecord3(c2)) {
             yield { path: `tools.${tid}.commands[${i3}]`, obj: c2 };
           }
         }
@@ -51568,38 +51578,38 @@ function* enumerateEntitiesByType(data, nodeType) {
     }
     case "validation": {
       const vals = data["validations"];
-      if (!isRecord4(vals)) return;
+      if (!isRecord3(vals)) return;
       for (const [id, v2] of Object.entries(vals)) {
-        if (isRecord4(v2)) yield { path: `validations.${id}`, obj: v2 };
+        if (isRecord3(v2)) yield { path: `validations.${id}`, obj: v2 };
       }
       return;
     }
     case "handoff_type": {
       const ht = data["handoff_types"];
-      if (!isRecord4(ht)) return;
+      if (!isRecord3(ht)) return;
       for (const [id, h2] of Object.entries(ht)) {
-        if (isRecord4(h2)) yield { path: `handoff_types.${id}`, obj: h2 };
+        if (isRecord3(h2)) yield { path: `handoff_types.${id}`, obj: h2 };
       }
       return;
     }
     case "workflow": {
       const wf = data["workflow"];
-      if (!isRecord4(wf)) return;
+      if (!isRecord3(wf)) return;
       for (const [id, w2] of Object.entries(wf)) {
-        if (isRecord4(w2)) yield { path: `workflow.${id}`, obj: w2 };
+        if (isRecord3(w2)) yield { path: `workflow.${id}`, obj: w2 };
       }
       return;
     }
     case "workflow_step": {
       const wf = data["workflow"];
-      if (!isRecord4(wf)) return;
+      if (!isRecord3(wf)) return;
       for (const [wid, w2] of Object.entries(wf)) {
-        if (!isRecord4(w2)) continue;
+        if (!isRecord3(w2)) continue;
         const steps = w2["steps"];
         if (!Array.isArray(steps)) continue;
         for (let i3 = 0; i3 < steps.length; i3++) {
           const s2 = steps[i3];
-          if (isRecord4(s2)) {
+          if (isRecord3(s2)) {
             yield { path: `workflow.${wid}.steps[${i3}]`, obj: s2 };
           }
         }
@@ -51608,25 +51618,25 @@ function* enumerateEntitiesByType(data, nodeType) {
     }
     case "policy": {
       const pol = data["policies"];
-      if (!isRecord4(pol)) return;
+      if (!isRecord3(pol)) return;
       for (const [id, p2] of Object.entries(pol)) {
-        if (isRecord4(p2)) yield { path: `policies.${id}`, obj: p2 };
+        if (isRecord3(p2)) yield { path: `policies.${id}`, obj: p2 };
       }
       return;
     }
     case "guardrail": {
       const gr = data["guardrails"];
-      if (!isRecord4(gr)) return;
+      if (!isRecord3(gr)) return;
       for (const [id, g2] of Object.entries(gr)) {
-        if (isRecord4(g2)) yield { path: `guardrails.${id}`, obj: g2 };
+        if (isRecord3(g2)) yield { path: `guardrails.${id}`, obj: g2 };
       }
       return;
     }
     case "guardrail_policy": {
       const gp = data["guardrail_policies"];
-      if (!isRecord4(gp)) return;
+      if (!isRecord3(gp)) return;
       for (const [id, p2] of Object.entries(gp)) {
-        if (isRecord4(p2)) yield { path: `guardrail_policies.${id}`, obj: p2 };
+        if (isRecord3(p2)) yield { path: `guardrail_policies.${id}`, obj: p2 };
       }
       return;
     }
@@ -51675,7 +51685,7 @@ function validateDeclaredExtension(parentPath, nodeType, key, val, declMap, diag
   }
 }
 function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInstance, strict) {
-  if (!isRecord4(value)) return;
+  if (!isRecord3(value)) return;
   const obj = value;
   for (const key of Object.keys(obj)) {
     if (key === "extensions" || key === "extensions_strict" || key === "x-extensions" || key === "x-extensions-strict") {
@@ -51697,7 +51707,7 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
   switch (nodeType) {
     case "root": {
       const sys = obj["system"];
-      if (isRecord4(sys)) {
+      if (isRecord3(sys)) {
         walkExtensionNodes(
           sys,
           "system",
@@ -51709,9 +51719,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         );
       }
       const agents = obj["agents"];
-      if (isRecord4(agents)) {
+      if (isRecord3(agents)) {
         for (const [id, a3] of Object.entries(agents)) {
-          if (isRecord4(a3)) {
+          if (isRecord3(a3)) {
             walkExtensionNodes(
               a3,
               `agents.${id}`,
@@ -51725,9 +51735,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const tasks = obj["tasks"];
-      if (isRecord4(tasks)) {
+      if (isRecord3(tasks)) {
         for (const [id, t3] of Object.entries(tasks)) {
-          if (isRecord4(t3)) {
+          if (isRecord3(t3)) {
             walkExtensionNodes(
               t3,
               `tasks.${id}`,
@@ -51741,9 +51751,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const artifacts = obj["artifacts"];
-      if (isRecord4(artifacts)) {
+      if (isRecord3(artifacts)) {
         for (const [id, a3] of Object.entries(artifacts)) {
-          if (isRecord4(a3)) {
+          if (isRecord3(a3)) {
             walkExtensionNodes(
               a3,
               `artifacts.${id}`,
@@ -51757,9 +51767,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const tools = obj["tools"];
-      if (isRecord4(tools)) {
+      if (isRecord3(tools)) {
         for (const [id, t3] of Object.entries(tools)) {
-          if (isRecord4(t3)) {
+          if (isRecord3(t3)) {
             walkExtensionNodes(
               t3,
               `tools.${id}`,
@@ -51773,9 +51783,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const validations = obj["validations"];
-      if (isRecord4(validations)) {
+      if (isRecord3(validations)) {
         for (const [id, v2] of Object.entries(validations)) {
-          if (isRecord4(v2)) {
+          if (isRecord3(v2)) {
             walkExtensionNodes(
               v2,
               `validations.${id}`,
@@ -51789,9 +51799,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const handoffTypes = obj["handoff_types"];
-      if (isRecord4(handoffTypes)) {
+      if (isRecord3(handoffTypes)) {
         for (const [id, h2] of Object.entries(handoffTypes)) {
-          if (isRecord4(h2)) {
+          if (isRecord3(h2)) {
             walkExtensionNodes(
               h2,
               `handoff_types.${id}`,
@@ -51805,9 +51815,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const workflow = obj["workflow"];
-      if (isRecord4(workflow)) {
+      if (isRecord3(workflow)) {
         for (const [id, w2] of Object.entries(workflow)) {
-          if (isRecord4(w2)) {
+          if (isRecord3(w2)) {
             walkExtensionNodes(
               w2,
               `workflow.${id}`,
@@ -51821,9 +51831,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const policies = obj["policies"];
-      if (isRecord4(policies)) {
+      if (isRecord3(policies)) {
         for (const [id, p2] of Object.entries(policies)) {
-          if (isRecord4(p2)) {
+          if (isRecord3(p2)) {
             walkExtensionNodes(
               p2,
               `policies.${id}`,
@@ -51837,9 +51847,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const guardrails = obj["guardrails"];
-      if (isRecord4(guardrails)) {
+      if (isRecord3(guardrails)) {
         for (const [id, g2] of Object.entries(guardrails)) {
-          if (isRecord4(g2)) {
+          if (isRecord3(g2)) {
             walkExtensionNodes(
               g2,
               `guardrails.${id}`,
@@ -51853,9 +51863,9 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
         }
       }
       const guardrailPolicies = obj["guardrail_policies"];
-      if (isRecord4(guardrailPolicies)) {
+      if (isRecord3(guardrailPolicies)) {
         for (const [id, p2] of Object.entries(guardrailPolicies)) {
-          if (isRecord4(p2)) {
+          if (isRecord3(p2)) {
             walkExtensionNodes(
               p2,
               `guardrail_policies.${id}`,
@@ -51875,7 +51885,7 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
       if (Array.isArray(rules)) {
         for (let i3 = 0; i3 < rules.length; i3++) {
           const r3 = rules[i3];
-          if (isRecord4(r3)) {
+          if (isRecord3(r3)) {
             walkExtensionNodes(
               r3,
               `${path}.rules[${i3}]`,
@@ -51892,7 +51902,7 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
       if (Array.isArray(esc)) {
         for (let i3 = 0; i3 < esc.length; i3++) {
           const e3 = esc[i3];
-          if (isRecord4(e3)) {
+          if (isRecord3(e3)) {
             walkExtensionNodes(
               e3,
               `${path}.escalation_criteria[${i3}]`,
@@ -51909,7 +51919,7 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
       if (Array.isArray(pre)) {
         for (let i3 = 0; i3 < pre.length; i3++) {
           const p2 = pre[i3];
-          if (isRecord4(p2)) {
+          if (isRecord3(p2)) {
             walkExtensionNodes(
               p2,
               `${path}.prerequisites[${i3}]`,
@@ -51929,7 +51939,7 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
       if (Array.isArray(steps)) {
         for (let i3 = 0; i3 < steps.length; i3++) {
           const s2 = steps[i3];
-          if (isRecord4(s2)) {
+          if (isRecord3(s2)) {
             walkExtensionNodes(
               s2,
               `${path}.execution_steps[${i3}]`,
@@ -51949,7 +51959,7 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
       if (Array.isArray(cmds)) {
         for (let i3 = 0; i3 < cmds.length; i3++) {
           const c2 = cmds[i3];
-          if (isRecord4(c2)) {
+          if (isRecord3(c2)) {
             walkExtensionNodes(
               c2,
               `${path}.commands[${i3}]`,
@@ -51969,7 +51979,7 @@ function walkExtensionNodes(value, path, nodeType, declMap, diagnostics, ajvInst
       if (Array.isArray(steps)) {
         for (let i3 = 0; i3 < steps.length; i3++) {
           const s2 = steps[i3];
-          if (isRecord4(s2)) {
+          if (isRecord3(s2)) {
             walkExtensionNodes(
               s2,
               `${path}.steps[${i3}]`,
@@ -51992,7 +52002,7 @@ function checkExtensionValidation(data) {
   const strict = data["extensions_strict"] === true;
   const raw = data["extensions"];
   let declMap;
-  if (!isRecord4(raw) || Object.keys(raw).length === 0) {
+  if (!isRecord3(raw) || Object.keys(raw).length === 0) {
     if (!strict) return [];
     declMap = {};
   } else {
@@ -53185,7 +53195,7 @@ var validationExecutorNoContextRule = {
 };
 
 // src/linter/rules/extension-consumption.ts
-function isRecord5(v2) {
+function isRecord4(v2) {
   return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
 }
 function collectXUsages(dsl) {
@@ -53206,7 +53216,7 @@ function collectXUsages(dsl) {
     }
   }
   walkObj(dsl, "", "root");
-  if (isRecord5(dsl.system)) {
+  if (isRecord4(dsl.system)) {
     walkObj(dsl.system, "system", "system");
   }
   for (const [id, agent] of Object.entries(dsl.agents)) {
@@ -53215,19 +53225,19 @@ function collectXUsages(dsl) {
     if (Array.isArray(agentObj["rules"])) {
       for (let i3 = 0; i3 < agentObj["rules"].length; i3++) {
         const r3 = agentObj["rules"][i3];
-        if (isRecord5(r3)) walkObj(r3, `agents.${id}.rules[${i3}]`, "rule");
+        if (isRecord4(r3)) walkObj(r3, `agents.${id}.rules[${i3}]`, "rule");
       }
     }
     if (Array.isArray(agentObj["escalation_criteria"])) {
       for (let i3 = 0; i3 < agentObj["escalation_criteria"].length; i3++) {
         const e3 = agentObj["escalation_criteria"][i3];
-        if (isRecord5(e3)) walkObj(e3, `agents.${id}.escalation_criteria[${i3}]`, "escalation_criterion");
+        if (isRecord4(e3)) walkObj(e3, `agents.${id}.escalation_criteria[${i3}]`, "escalation_criterion");
       }
     }
     if (Array.isArray(agentObj["prerequisites"])) {
       for (let i3 = 0; i3 < agentObj["prerequisites"].length; i3++) {
         const p2 = agentObj["prerequisites"][i3];
-        if (isRecord5(p2)) walkObj(p2, `agents.${id}.prerequisites[${i3}]`, "prerequisite");
+        if (isRecord4(p2)) walkObj(p2, `agents.${id}.prerequisites[${i3}]`, "prerequisite");
       }
     }
   }
@@ -53237,7 +53247,7 @@ function collectXUsages(dsl) {
     if (Array.isArray(taskObj["execution_steps"])) {
       for (let i3 = 0; i3 < taskObj["execution_steps"].length; i3++) {
         const s2 = taskObj["execution_steps"][i3];
-        if (isRecord5(s2)) walkObj(s2, `tasks.${id}.execution_steps[${i3}]`, "execution_step");
+        if (isRecord4(s2)) walkObj(s2, `tasks.${id}.execution_steps[${i3}]`, "execution_step");
       }
     }
   }
@@ -53250,7 +53260,7 @@ function collectXUsages(dsl) {
     if (Array.isArray(toolObj["commands"])) {
       for (let i3 = 0; i3 < toolObj["commands"].length; i3++) {
         const c2 = toolObj["commands"][i3];
-        if (isRecord5(c2)) walkObj(c2, `tools.${id}.commands[${i3}]`, "tool_command");
+        if (isRecord4(c2)) walkObj(c2, `tools.${id}.commands[${i3}]`, "tool_command");
       }
     }
   }
@@ -53266,7 +53276,7 @@ function collectXUsages(dsl) {
     if (Array.isArray(wfObj["steps"])) {
       for (let i3 = 0; i3 < wfObj["steps"].length; i3++) {
         const s2 = wfObj["steps"][i3];
-        if (isRecord5(s2)) walkObj(s2, `workflow.${id}.steps[${i3}]`, "workflow_step");
+        if (isRecord4(s2)) walkObj(s2, `workflow.${id}.steps[${i3}]`, "workflow_step");
       }
     }
   }
@@ -55289,8 +55299,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) {
@@ -55355,7 +55373,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;
@@ -55404,7 +55423,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);
       }
     }
@@ -56126,8 +56146,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);
@@ -56254,7 +56275,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 readFile6(outputPath, "utf8");
         entries.push({ agent_id: entityId, path: outputPath, content });
@@ -56306,7 +56328,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) {
@@ -56319,7 +56341,7 @@ function collectAllXUsages(dsl) {
     }
   }
   walk2(dsl, "", "root");
-  if (isRecord6(dsl.system)) walk2(dsl.system, "system", "system");
+  if (isRecord5(dsl.system)) walk2(dsl.system, "system", "system");
   for (const [id, a3] of Object.entries(dsl.agents))
     walk2(a3, `agents.${id}`, "agent");
   for (const [id, t3] of Object.entries(dsl.tasks))