agent-contracts 0.5.1 → 0.6.0

package/dist/index.js

@@ -3951,7 +3951,7 @@ var require_lodash = __commonJS({
           }
           return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
         });
-        function join2(array, separator) {
+        function join3(array, separator) {
           return array == null ? "" : nativeJoin.call(array, separator);
         }
         function last(array) {
@@ -5875,7 +5875,7 @@ var require_lodash = __commonJS({
         lodash.isUndefined = isUndefined;
         lodash.isWeakMap = isWeakMap;
         lodash.isWeakSet = isWeakSet;
-        lodash.join = join2;
+        lodash.join = join3;
         lodash.kebabCase = kebabCase;
         lodash.last = last;
         lodash.lastIndexOf = lastIndexOf;
@@ -6292,7 +6292,7 @@ var init_index_es = __esm({
         return { drive: t4.toLowerCase() + ":" };
       }, k2 = function() {
         return { drive: null };
-      }, z14 = function() {
+      }, z15 = function() {
         return { drive: null };
       }, B2 = function(t4) {
         return { protocol: null, origin: null, absolute: false, drive: null, ...t4 };
@@ -6333,7 +6333,7 @@ var init_index_es = __esm({
           var t4, n4, r4, e4, o4;
           return t4 = K2, (n4 = rt()) !== c2 && (r4 = et()) !== c2 && (e4 = ut()) !== c2 && (o4 = it()) !== c2 ? (n4 = s2(n4, r4, e4, o4), t4 = n4) : (K2 = t4, t4 = c2), t4 === c2 && (t4 = K2, (n4 = rt()) !== c2 && (r4 = et()) !== c2 && (e4 = (function() {
             var t5;
-            return (t5 = x3) !== c2 && (t5 = z14()), t5;
+            return (t5 = x3) !== c2 && (t5 = z15()), t5;
           })()) !== c2 ? (n4 = f2(n4, r4, e4), t4 = n4) : (K2 = t4, t4 = c2)), t4;
         })()) === c2 && (n3 = (function() {
           var n4, r4, e4, o4;
@@ -7496,7 +7496,7 @@ var require_stable = __commonJS({
       return result;
     }
     function stringifyFullFn(key, parent, stack, replacer, indent) {
-      var i3, res, join2;
+      var i3, res, join3;
       const originalIndentation = indentation;
       var value = parent[key];
       if (typeof value === "object" && value !== null && typeof value.toJSON === "function") {
@@ -7522,12 +7522,12 @@ var require_stable = __commonJS({
             indentation += indent;
             res += `
 ${indentation}`;
-            join2 = `,
+            join3 = `,
 ${indentation}`;
             for (i3 = 0; i3 < value.length - 1; i3++) {
               const tmp2 = stringifyFullFn(i3, value, stack, replacer, indent);
               res += tmp2 !== void 0 ? tmp2 : "null";
-              res += join2;
+              res += join3;
             }
             const tmp = stringifyFullFn(i3, value, stack, replacer, indent);
             res += tmp !== void 0 ? tmp : "null";
@@ -7549,7 +7549,7 @@ ${originalIndentation}`;
           indentation += indent;
           res += `
 ${indentation}`;
-          join2 = `,
+          join3 = `,
 ${indentation}`;
           var separator = "";
           for (i3 = 0; i3 < keys.length; i3++) {
@@ -7557,7 +7557,7 @@ ${indentation}`;
             const tmp = stringifyFullFn(key, value, stack, replacer, indent);
             if (tmp !== void 0) {
               res += `${separator}"${strEscape(key)}": ${tmp}`;
-              separator = join2;
+              separator = join3;
             }
           }
           if (separator !== "") {
@@ -7579,7 +7579,7 @@ ${originalIndentation}`;
       }
     }
     function stringifyFullArr(key, value, stack, replacer, indent) {
-      var i3, res, join2;
+      var i3, res, join3;
       const originalIndentation = indentation;
       if (typeof value === "object" && value !== null && typeof value.toJSON === "function") {
         value = value.toJSON(key);
@@ -7603,12 +7603,12 @@ ${originalIndentation}`;
             indentation += indent;
             res += `
 ${indentation}`;
-            join2 = `,
+            join3 = `,
 ${indentation}`;
             for (i3 = 0; i3 < value.length - 1; i3++) {
               const tmp2 = stringifyFullArr(i3, value[i3], stack, replacer, indent);
               res += tmp2 !== void 0 ? tmp2 : "null";
-              res += join2;
+              res += join3;
             }
             const tmp = stringifyFullArr(i3, value[i3], stack, replacer, indent);
             res += tmp !== void 0 ? tmp : "null";
@@ -7629,7 +7629,7 @@ ${originalIndentation}`;
           indentation += indent;
           res += `
 ${indentation}`;
-          join2 = `,
+          join3 = `,
 ${indentation}`;
           var separator = "";
           for (i3 = 0; i3 < replacer.length; i3++) {
@@ -7638,7 +7638,7 @@ ${indentation}`;
               const tmp = stringifyFullArr(key, value[key], stack, replacer, indent);
               if (tmp !== void 0) {
                 res += `${separator}"${strEscape(key)}": ${tmp}`;
-                separator = join2;
+                separator = join3;
               }
             }
           }
@@ -7661,7 +7661,7 @@ ${originalIndentation}`;
       }
     }
     function stringifyIndent(key, value, stack, indent) {
-      var i3, res, join2;
+      var i3, res, join3;
       const originalIndentation = indentation;
       switch (typeof value) {
         case "object":
@@ -7691,12 +7691,12 @@ ${originalIndentation}`;
             indentation += indent;
             res += `
 ${indentation}`;
-            join2 = `,
+            join3 = `,
 ${indentation}`;
             for (i3 = 0; i3 < value.length - 1; i3++) {
               const tmp2 = stringifyIndent(i3, value[i3], stack, indent);
               res += tmp2 !== void 0 ? tmp2 : "null";
-              res += join2;
+              res += join3;
             }
             const tmp = stringifyIndent(i3, value[i3], stack, indent);
             res += tmp !== void 0 ? tmp : "null";
@@ -7718,7 +7718,7 @@ ${originalIndentation}`;
           indentation += indent;
           res += `
 ${indentation}`;
-          join2 = `,
+          join3 = `,
 ${indentation}`;
           var separator = "";
           for (i3 = 0; i3 < keys.length; i3++) {
@@ -7726,7 +7726,7 @@ ${indentation}`;
             const tmp = stringifyIndent(key, value[key], stack, indent);
             if (tmp !== void 0) {
               res += `${separator}"${strEscape(key)}": ${tmp}`;
-              separator = join2;
+              separator = join3;
             }
           }
           if (separator !== "") {
@@ -8022,7 +8022,7 @@ __export(index_es_exports2, {
   resolveExternalRef: () => ye,
   resolveExternalRefWithLocation: () => ge,
   resolveInlineRef: () => B,
-  resolveInlineRefWithLocation: () => z12,
+  resolveInlineRefWithLocation: () => z13,
   safeParse: () => de,
   safeStringify: () => ve,
   startsWith: () => be,
@@ -8066,9 +8066,9 @@ function* L(e3, t3, r3) {
   for (const [n3, o3] of t3.entries()) O(e3.value, o3, r3), e3.value = e3.value[o3], A(e3.value) && (j(e3.value), yield [n3, e3.value]);
 }
 function B(e3, t3) {
-  return z12(e3, t3).value;
+  return z13(e3, t3).value;
 }
-function z12(e3, t3) {
+function z13(e3, t3) {
   return (function e4(t4, r3, n3, o3) {
     if (null !== V(r3)) throw new ReferenceError("Cannot resolve external references");
     const i3 = K(r3);
@@ -16898,7 +16898,7 @@ var require_immer_cjs_production_min = __commonJS({
       var t4 = n4[H2];
       return (t4 ? s2(t4) : n4)[r4];
     }
-    function z14(n4, r4) {
+    function z15(n4, r4) {
       if (r4 in n4) for (var t4 = Object.getPrototypeOf(n4); t4; ) {
         var e4 = Object.getOwnPropertyDescriptor(t4, r4);
         if (e4) return e4;
@@ -17291,7 +17291,7 @@ var require_immer_cjs_production_min = __commonJS({
       if (r4 === H2) return n4;
       var e4 = s2(n4);
       if (!u2(e4, r4)) return (function(n5, r5, t4) {
-        var e5, i5 = z14(r5, t4);
+        var e5, i5 = z15(r5, t4);
         return i5 ? "value" in i5 ? i5.value : null === (e5 = i5.get) || void 0 === e5 ? void 0 : e5.call(n5.k) : void 0;
       })(n4, e4, r4);
       var i4 = e4[r4];
@@ -17301,7 +17301,7 @@ var require_immer_cjs_production_min = __commonJS({
     }, ownKeys: function(n4) {
       return Reflect.ownKeys(s2(n4));
     }, set: function(n4, r4, t4) {
-      var e4 = z14(s2(n4), r4);
+      var e4 = z15(s2(n4), r4);
       if (null == e4 ? void 0 : e4.set) return e4.set.call(n4.k, t4), true;
       if (!n4.g) {
         var i4 = A2(s2(n4), r4), o4 = null == i4 ? void 0 : i4[H2];
@@ -35640,11 +35640,11 @@ var require_brace_expansion = __commonJS({
             if (pad) {
               var need = width - c2.length;
               if (need > 0) {
-                var z14 = new Array(need + 1).join("0");
+                var z15 = new Array(need + 1).join("0");
                 if (i3 < 0)
-                  c2 = "-" + z14 + c2.slice(1);
+                  c2 = "-" + z15 + c2.slice(1);
                 else
-                  c2 = z14 + c2;
+                  c2 = z15 + c2;
               }
             }
           }
@@ -52697,7 +52697,7 @@ var require_lodash3 = __commonJS({
           }
           return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
         });
-        function join2(array, separator) {
+        function join3(array, separator) {
           return array == null ? "" : nativeJoin.call(array, separator);
         }
         function last(array) {
@@ -54616,7 +54616,7 @@ var require_lodash3 = __commonJS({
         lodash.isUndefined = isUndefined;
         lodash.isWeakMap = isWeakMap;
         lodash.isWeakSet = isWeakSet;
-        lodash.join = join2;
+        lodash.join = join3;
         lodash.kebabCase = kebabCase;
         lodash.last = last;
         lodash.lastIndexOf = lastIndexOf;
@@ -55620,7 +55620,7 @@ var require_dist10 = __commonJS({
     var getSiblings = (parent) => (node) => getChildren(parent).filter(not(eq(node)));
     var concatAll = (
       /*::<T>*/
-      (xs) => (ys) => ys.reduce((zs, z14) => zs.concat(z14), xs)
+      (xs) => (ys) => ys.reduce((zs, z15) => zs.concat(z15), xs)
     );
     function getLastSegment(instancePath) {
       const index4 = instancePath.lastIndexOf("/");
@@ -58308,7 +58308,7 @@ var RuleSchema = z.object({
   detection_method: z.string().optional(),
   escalation: z.string().optional(),
   ref: z.string().optional()
-}).strict();
+}).passthrough();
 var EscalationCriterionSchema = z.object({
   condition: z.string(),
   action: z.enum([
@@ -58316,12 +58316,12 @@ var EscalationCriterionSchema = z.object({
     "report_to_architect",
     "wait_for_approval"
   ])
-}).strict();
+}).passthrough();
 var PrerequisiteSchema = z.object({
   action: z.enum(["read", "execute"]),
   target: z.string(),
   required: z.boolean()
-}).strict();
+}).passthrough();
 var AgentSchema = z.object({
   role_name: z.string(),
   purpose: z.string(),
@@ -58363,14 +58363,15 @@ import { z as z3 } from "zod";
 var HandoffTypeSchema = z3.object({
   version: z3.number(),
   description: z3.string().optional(),
-  payload: z3.record(z3.string(), z3.any())
+  payload: z3.record(z3.string(), z3.any()),
+  example: z3.record(z3.string(), z3.any()).optional()
 }).passthrough();
 
 // src/schema/policy.ts
 import { z as z4 } from "zod";
 var PolicyWhenSchema = z4.object({
   artifact_type: z4.string().optional(),
-  phase: z4.string().optional()
+  workflow: z4.string().optional()
 }).passthrough();
 var PolicySchema = z4.object({
   when: PolicyWhenSchema,
@@ -58385,7 +58386,7 @@ var ExtendsSchema = z5.string().optional();
 var SystemSchema = z5.object({
   id: z5.string(),
   name: z5.string(),
-  default_phase_order: z5.array(z5.string())
+  default_workflow_order: z5.array(z5.string())
 }).passthrough();
 
 // src/schema/task.ts
@@ -58393,6 +58394,7 @@ import { z as z6 } from "zod";
 var ExecutionStepSchema = z6.object({
   id: z6.string(),
   action: z6.string(),
+  description: z6.string().optional(),
   required: z6.boolean().optional(),
   abort_on_failure: z6.boolean().optional(),
   uses_tool: z6.string().optional(),
@@ -58400,12 +58402,12 @@ var ExecutionStepSchema = z6.object({
   depends_on: z6.array(z6.string()).optional(),
   skip_condition: z6.string().optional(),
   wait_for_approval: z6.boolean().optional()
-}).strict();
+}).passthrough();
 var TaskSchema = z6.object({
   description: z6.string(),
   target_agent: z6.string(),
   allowed_from_agents: z6.array(z6.string()),
-  phase: z6.string(),
+  workflow: z6.string(),
   input_artifacts: z6.array(z6.string()),
   invocation_handoff: z6.string(),
   result_handoff: z6.string(),
@@ -58445,19 +58447,22 @@ var ValidationSchema = z8.object({
 import { z as z9 } from "zod";
 var WorkflowHandoffStepSchema = z9.object({
   type: z9.literal("handoff"),
+  description: z9.string().optional(),
   handoff_kind: z9.string(),
   task: z9.string().optional(),
   from_agent: z9.string().optional()
-}).strict();
+}).passthrough();
 var WorkflowValidationStepSchema = z9.object({
   type: z9.literal("validation"),
+  description: z9.string().optional(),
   validation: z9.string()
-}).strict();
+}).passthrough();
 var WorkflowDecisionStepSchema = z9.object({
   type: z9.literal("decision"),
+  description: z9.string().optional(),
   on: z9.string(),
   branches: z9.record(z9.string(), z9.array(z9.string()))
-}).strict();
+}).passthrough();
 var WorkflowStepSchema = z9.discriminatedUnion("type", [
   WorkflowHandoffStepSchema,
   WorkflowValidationStepSchema,
@@ -58465,6 +58470,7 @@ var WorkflowStepSchema = z9.discriminatedUnion("type", [
 ]);
 var WorkflowSchema = z9.object({
   entry_conditions: z9.array(z9.string()).default([]),
+  trigger: z9.string().optional(),
   steps: z9.array(WorkflowStepSchema)
 }).passthrough();
 
@@ -58503,8 +58509,8 @@ var RemoveOperatorSchema = z11.object({
 });
 
 // src/loader/loader.ts
-import { readFile } from "fs/promises";
-import { dirname, resolve } from "path";
+import { readFile, readdir, stat as fsStat } from "fs/promises";
+import { dirname, resolve, join, extname } from "path";
 import { parse as parseYaml } from "yaml";
 var DslLoadError = class extends Error {
   constructor(message, filePath) {
@@ -58514,18 +58520,16 @@ var DslLoadError = class extends Error {
   }
   filePath;
 };
-var REF_ELIGIBLE_SECTIONS = [
-  "agents",
-  "tasks",
-  "artifacts",
-  "tools",
-  "validations",
-  "handoff_types",
-  "workflow",
-  "policies"
-];
+function isRecord(v2) {
+  return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
+}
 function isRef(value) {
-  return typeof value === "object" && value !== null && "$ref" in value && typeof value["$ref"] === "string";
+  return isRecord(value) && "$ref" in value && typeof value["$ref"] === "string";
+}
+function hasRefs(value) {
+  if (!("$refs" in value)) return false;
+  const refs = value["$refs"];
+  return Array.isArray(refs) && refs.every((r3) => typeof r3 === "string");
 }
 async function readYaml(filePath) {
   let content;
@@ -58547,17 +58551,160 @@ async function readYaml(filePath) {
     );
   }
 }
-async function resolveRefs(data, baseDir) {
-  const resolved = { ...data };
-  for (const section of REF_ELIGIBLE_SECTIONS) {
-    const value = resolved[section];
-    if (isRef(value)) {
-      const refPath = resolve(baseDir, value.$ref);
-      resolved[section] = await readYaml(refPath);
+function deepMergeRefs(a3, b3, sourcePath) {
+  const result = { ...a3 };
+  for (const [key, bVal] of Object.entries(b3)) {
+    const aVal = result[key];
+    if (aVal === void 0) {
+      result[key] = bVal;
+    } else if (isRecord(aVal) && isRecord(bVal)) {
+      result[key] = deepMergeRefs(aVal, bVal, sourcePath);
+    } else {
+      throw new DslLoadError(
+        `Conflicting value for key "${key}" while merging $refs from ${sourcePath}`,
+        sourcePath
+      );
+    }
+  }
+  return result;
+}
+async function loadRefsSource(refPath, baseDir, resolving) {
+  const target = resolve(baseDir, refPath);
+  const s2 = await fsStat(target).catch(() => null);
+  if (s2?.isDirectory()) {
+    if (resolving.has(target)) {
+      throw new DslLoadError(`Circular $refs detected: ${target}`, target);
     }
+    resolving.add(target);
+    const result = await loadDirectoryAsMap(target, resolving);
+    resolving.delete(target);
+    return result;
+  }
+  if (!s2?.isFile()) {
+    throw new DslLoadError(`File not found: ${target}`, target);
+  }
+  if (resolving.has(target)) {
+    throw new DslLoadError(`Circular $refs detected: ${target}`, target);
+  }
+  resolving.add(target);
+  const content = await readYaml(target);
+  if (!isRecord(content)) {
+    throw new DslLoadError(
+      `Expected YAML object in ${target}, got ${Array.isArray(content) ? "array" : typeof content}`,
+      target
+    );
   }
+  const resolved = await resolveRefsDeep(
+    content,
+    dirname(target),
+    resolving
+  );
+  resolving.delete(target);
   return resolved;
 }
+async function loadDirectoryAsMap(dirPath, resolving) {
+  let entries;
+  try {
+    entries = await readdir(dirPath);
+  } catch {
+    throw new DslLoadError(
+      `Cannot read directory: ${dirPath}`,
+      dirPath
+    );
+  }
+  const yamlFiles = entries.filter((f2) => [".yaml", ".yml"].includes(extname(f2))).sort();
+  if (yamlFiles.length === 0) {
+    throw new DslLoadError(
+      `No YAML files found in directory: ${dirPath}`,
+      dirPath
+    );
+  }
+  let merged = {};
+  for (const file of yamlFiles) {
+    const filePath = join(dirPath, file);
+    const content = await readYaml(filePath);
+    if (!isRecord(content)) {
+      throw new DslLoadError(
+        `Expected YAML object in ${filePath}, got ${Array.isArray(content) ? "array" : typeof content}`,
+        filePath
+      );
+    }
+    const resolved = await resolveRefsDeep(
+      content,
+      dirPath,
+      resolving
+    );
+    merged = deepMergeRefs(merged, resolved, filePath);
+  }
+  return merged;
+}
+async function processRefs(obj, baseDir, resolving) {
+  const refPaths = obj["$refs"];
+  const inline = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (key !== "$refs") {
+      inline[key] = value;
+    }
+  }
+  let merged = {};
+  for (const refPath of refPaths) {
+    const loaded = await loadRefsSource(refPath, baseDir, resolving);
+    merged = deepMergeRefs(merged, loaded, refPath);
+  }
+  merged = deepMergeRefs(merged, inline, "(inline)");
+  return merged;
+}
+async function resolveRefsDeep(data, baseDir, resolving) {
+  if (typeof data !== "object" || data === null) return data;
+  if (Array.isArray(data)) {
+    return Promise.all(
+      data.map((item) => resolveRefsDeep(item, baseDir, resolving))
+    );
+  }
+  if (isRef(data)) {
+    const refTarget = resolve(baseDir, data.$ref);
+    const s2 = await fsStat(refTarget).catch(() => null);
+    if (s2?.isDirectory()) {
+      if (resolving.has(refTarget)) {
+        throw new DslLoadError(
+          `Circular $ref detected: ${refTarget}`,
+          refTarget
+        );
+      }
+      resolving.add(refTarget);
+      const result2 = await loadDirectoryAsMap(refTarget, resolving);
+      resolving.delete(refTarget);
+      return result2;
+    }
+    if (!s2?.isFile()) {
+      throw new DslLoadError(`File not found: ${refTarget}`, refTarget);
+    }
+    if (resolving.has(refTarget)) {
+      throw new DslLoadError(
+        `Circular $ref detected: ${refTarget}`,
+        refTarget
+      );
+    }
+    resolving.add(refTarget);
+    const content = await readYaml(refTarget);
+    const resolved = await resolveRefsDeep(
+      content,
+      dirname(refTarget),
+      resolving
+    );
+    resolving.delete(refTarget);
+    return resolved;
+  }
+  let obj = data;
+  if (hasRefs(obj)) {
+    obj = await processRefs(obj, baseDir, resolving);
+  }
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    result[key] = await resolveRefsDeep(value, baseDir, resolving);
+  }
+  return result;
+}
 function checkVersion(data, filePath) {
   const version = data["version"];
   if (version === void 0) {
@@ -58585,12 +58732,17 @@ async function loadDsl(entryPath) {
   const data = raw;
   checkVersion(data, absPath);
   const baseDir = dirname(absPath);
-  const resolved = await resolveRefs(data, baseDir);
+  const resolving = /* @__PURE__ */ new Set([absPath]);
+  const resolved = await resolveRefsDeep(
+    data,
+    baseDir,
+    resolving
+  );
   return { data: resolved, filePath: absPath };
 }
 
 // src/resolver/base-resolver.ts
-import { resolve as resolve2, join } from "path";
+import { resolve as resolve2, join as join2 } from "path";
 import { stat } from "fs/promises";
 var BaseResolveError = class extends Error {
   constructor(message) {
@@ -58601,7 +58753,7 @@ var BaseResolveError = class extends Error {
 async function findEntryFile(dir) {
   const candidates = ["agent-contracts.yaml", "agent-contracts.yml"];
   for (const name of candidates) {
-    const p2 = join(dir, name);
+    const p2 = join2(dir, name);
     try {
       const s2 = await stat(p2);
       if (s2.isFile()) return p2;
@@ -58653,7 +58805,7 @@ var MergeError = class extends Error {
     this.name = "MergeError";
   }
 };
-function isRecord(v2) {
+function isRecord2(v2) {
   return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
 }
 function hasOperator(obj) {
@@ -58665,7 +58817,7 @@ function hasOperator(obj) {
 }
 function findIndexById(arr, id) {
   return arr.findIndex(
-    (item) => isRecord(item) && item["id"] === id
+    (item) => isRecord2(item) && item["id"] === id
   );
 }
 function applyArrayMergeOperator(baseArray, operatorObj, path) {
@@ -58701,7 +58853,7 @@ function applyArrayMergeOperator(baseArray, operatorObj, path) {
       const removeList = operatorObj["$remove"];
       const idsToRemove = new Set(removeList.map((r3) => r3["id"]));
       const result = baseArray.filter((item) => {
-        if (isRecord(item) && typeof item["id"] === "string") {
+        if (isRecord2(item) && typeof item["id"] === "string") {
           const itemId = item["id"];
           if (idsToRemove.has(itemId)) {
             idsToRemove.delete(itemId);
@@ -58790,7 +58942,7 @@ function deepMergeEntities(base, project, path, hasExtends) {
   for (const key of Object.keys(project)) {
     const baseVal = result[key];
     const projVal = project[key];
-    if (isRecord(projVal) && hasOperator(projVal)) {
+    if (isRecord2(projVal) && hasOperator(projVal)) {
       if (!hasExtends) {
         throw new MergeError(
           `Merge operator used without extends at ${path}.${key}`
@@ -58798,12 +58950,12 @@ function deepMergeEntities(base, project, path, hasExtends) {
       }
       if (Array.isArray(baseVal)) {
         result[key] = applyArrayMergeOperator(baseVal, projVal, `${path}.${key}`);
-      } else if (isRecord(baseVal)) {
+      } else if (isRecord2(baseVal)) {
         result[key] = applyMapMergeOperator(baseVal, projVal, `${path}.${key}`);
       } else {
         result[key] = applyArrayMergeOperator([], projVal, `${path}.${key}`);
       }
-    } else if (isRecord(projVal) && isRecord(baseVal) && !Array.isArray(projVal) && !Array.isArray(baseVal)) {
+    } else if (isRecord2(projVal) && isRecord2(baseVal) && !Array.isArray(projVal) && !Array.isArray(baseVal)) {
       result[key] = deepMergeEntities(
         baseVal,
         projVal,
@@ -58817,7 +58969,7 @@ function deepMergeEntities(base, project, path, hasExtends) {
   return result;
 }
 function mergeEntityMaps(baseMap, projectMap, path, hasExtends) {
-  if (isRecord(projectMap) && !Array.isArray(projectMap)) {
+  if (isRecord2(projectMap) && !Array.isArray(projectMap)) {
     const op = hasOperator(projectMap);
     if (op) {
       if (!hasExtends) {
@@ -58831,7 +58983,7 @@ function mergeEntityMaps(baseMap, projectMap, path, hasExtends) {
   const result = { ...baseMap };
   for (const [key, projVal] of Object.entries(projectMap)) {
     const baseVal = result[key];
-    if (baseVal !== void 0 && isRecord(baseVal) && isRecord(projVal)) {
+    if (baseVal !== void 0 && isRecord2(baseVal) && isRecord2(projVal)) {
       result[key] = deepMergeEntities(
         baseVal,
         projVal,
@@ -58871,7 +59023,7 @@ function mergeDsl(base, project) {
     if (projVal === void 0) {
       continue;
     }
-    const baseMap = isRecord(baseVal) ? baseVal : {};
+    const baseMap = isRecord2(baseVal) ? baseVal : {};
     result[section] = mergeEntityMaps(
       baseMap,
       projVal,
@@ -58907,113 +59059,66 @@ async function resolve3(projectDirOrFile) {
 }
 
 // src/validator/schema-validator.ts
-function hasNonExtensionCustomProps(obj, knownKeys, path) {
-  const diagnostics = [];
-  for (const key of Object.keys(obj)) {
-    if (knownKeys.has(key)) continue;
-    if (key.startsWith("x-")) continue;
-    diagnostics.push({
-      path: `${path}.${key}`,
-      message: `Unknown property "${key}". Custom properties must use "x-" prefix.`,
-      code: "unknown-property"
-    });
-  }
-  return diagnostics;
+import { z as z12 } from "zod";
+function unwrap(schema) {
+  if (schema instanceof z12.ZodOptional) return unwrap(schema.unwrap());
+  if (schema instanceof z12.ZodDefault) return unwrap(schema.removeDefault());
+  if (schema instanceof z12.ZodNullable) return unwrap(schema.unwrap());
+  return schema;
 }
-var SYSTEM_KEYS = /* @__PURE__ */ new Set(["id", "name", "default_phase_order"]);
-var AGENT_KEYS = /* @__PURE__ */ new Set([
-  "role_name",
-  "purpose",
-  "can_read_artifacts",
-  "can_write_artifacts",
-  "can_execute_tools",
-  "can_perform_validations",
-  "can_invoke_agents",
-  "can_return_handoffs",
-  "dispatch_only",
-  "mode",
-  "responsibilities",
-  "constraints",
-  "rules",
-  "anti_patterns",
-  "escalation_criteria",
-  "prerequisites"
-]);
-var TASK_KEYS = /* @__PURE__ */ new Set([
-  "description",
-  "target_agent",
-  "allowed_from_agents",
-  "phase",
-  "input_artifacts",
-  "invocation_handoff",
-  "result_handoff",
-  "default_priority",
-  "responsibilities",
-  "constraints",
-  "execution_steps",
-  "completion_criteria",
-  "rules",
-  "anti_patterns",
-  "escalation_criteria"
-]);
-var ARTIFACT_KEYS = /* @__PURE__ */ new Set([
-  "type",
-  "description",
-  "owner",
-  "producers",
-  "editors",
-  "consumers",
-  "states",
-  "required_validations",
-  "visibility"
-]);
-var TOOL_KEYS = /* @__PURE__ */ new Set([
-  "kind",
-  "description",
-  "input_artifacts",
-  "output_artifacts",
-  "invokable_by",
-  "side_effects"
-]);
-var VALIDATION_KEYS = /* @__PURE__ */ new Set([
-  "target_artifact",
-  "kind",
-  "executor_type",
-  "executor",
-  "blocking",
-  "produces_evidence"
-]);
-var HANDOFF_TYPE_KEYS = /* @__PURE__ */ new Set(["version", "description", "payload"]);
-var WORKFLOW_KEYS = /* @__PURE__ */ new Set(["entry_conditions", "steps"]);
-var POLICY_KEYS = /* @__PURE__ */ new Set(["when", "requires_validations", "requires"]);
-function checkCustomProps(data) {
-  const diagnostics = [];
-  if (data["system"] && typeof data["system"] === "object") {
-    diagnostics.push(
-      ...hasNonExtensionCustomProps(data["system"], SYSTEM_KEYS, "system")
-    );
+function checkCustomPropsRecursive(data, schema, path) {
+  const inner = unwrap(schema);
+  if (inner instanceof z12.ZodObject) {
+    if (typeof data !== "object" || data === null || Array.isArray(data)) return [];
+    const obj = data;
+    const shape = inner.shape;
+    const knownKeys = new Set(Object.keys(shape));
+    const diagnostics = [];
+    for (const key of Object.keys(obj)) {
+      if (knownKeys.has(key)) continue;
+      if (key.startsWith("x-")) continue;
+      diagnostics.push({
+        path: path ? `${path}.${key}` : key,
+        message: `Unknown property "${key}". Custom properties must use "x-" prefix.`,
+        code: "unknown-property"
+      });
+    }
+    for (const [field, fieldSchema] of Object.entries(shape)) {
+      if (obj[field] === void 0) continue;
+      diagnostics.push(...checkCustomPropsRecursive(obj[field], fieldSchema, path ? `${path}.${field}` : field));
+    }
+    return diagnostics;
   }
-  const sections = [
-    { key: "agents", knownKeys: AGENT_KEYS },
-    { key: "tasks", knownKeys: TASK_KEYS },
-    { key: "artifacts", knownKeys: ARTIFACT_KEYS },
-    { key: "tools", knownKeys: TOOL_KEYS },
-    { key: "validations", knownKeys: VALIDATION_KEYS },
-    { key: "handoff_types", knownKeys: HANDOFF_TYPE_KEYS },
-    { key: "workflow", knownKeys: WORKFLOW_KEYS },
-    { key: "policies", knownKeys: POLICY_KEYS }
-  ];
-  for (const { key, knownKeys } of sections) {
-    const map = data[key];
-    if (typeof map !== "object" || map === null || Array.isArray(map)) continue;
-    for (const [entryKey, item] of Object.entries(map)) {
-      if (typeof item !== "object" || item === null) continue;
-      diagnostics.push(
-        ...hasNonExtensionCustomProps(item, knownKeys, `${key}.${entryKey}`)
-      );
+  if (inner instanceof z12.ZodRecord) {
+    if (typeof data !== "object" || data === null || Array.isArray(data)) return [];
+    const valueSchema = inner._def.valueType;
+    const diagnostics = [];
+    for (const [key, value] of Object.entries(data)) {
+      diagnostics.push(...checkCustomPropsRecursive(value, valueSchema, path ? `${path}.${key}` : key));
+    }
+    return diagnostics;
+  }
+  if (inner instanceof z12.ZodArray) {
+    if (!Array.isArray(data)) return [];
+    const diagnostics = [];
+    for (let i3 = 0; i3 < data.length; i3++) {
+      diagnostics.push(...checkCustomPropsRecursive(data[i3], inner.element, `${path}[${i3}]`));
     }
+    return diagnostics;
   }
-  return diagnostics;
+  if (inner instanceof z12.ZodDiscriminatedUnion) {
+    if (typeof data !== "object" || data === null) return [];
+    const obj = data;
+    const disc = inner._def.discriminator;
+    const discValue = obj[disc];
+    const match = inner.options.find((opt) => {
+      const shape = opt.shape;
+      return shape[disc] instanceof z12.ZodLiteral && shape[disc].value === discValue;
+    });
+    if (match) return checkCustomPropsRecursive(data, match, path);
+    return [];
+  }
+  return [];
 }
 function validateSchema(data) {
   const result = DslSchema.safeParse(data);
@@ -59025,7 +59130,7 @@ function validateSchema(data) {
     }));
     return { success: false, diagnostics };
   }
-  const customPropDiagnostics = checkCustomProps(data);
+  const customPropDiagnostics = checkCustomPropsRecursive(data, DslSchema, "");
   if (customPropDiagnostics.length > 0) {
     return { success: false, diagnostics: customPropDiagnostics };
   }
@@ -59041,7 +59146,7 @@ function checkReferences(dsl) {
   const validationIds = new Set(Object.keys(dsl.validations));
   const handoffKinds = new Set(Object.keys(dsl.handoff_types));
   const taskIds = new Set(Object.keys(dsl.tasks));
-  const phases = new Set(dsl.system.default_phase_order);
+  const workflowIds = new Set(dsl.system.default_workflow_order);
   function checkExists(value, validSet, entityType, path) {
     if (!validSet.has(value)) {
       diagnostics.push({
@@ -59127,26 +59232,26 @@ function checkReferences(dsl) {
     for (const ref of task.allowed_from_agents) {
       checkExists(ref, agentIds, "agents", `tasks.${id}.allowed_from_agents`);
     }
-    checkExists(task.phase, phases, "system.default_phase_order", `tasks.${id}.phase`);
+    checkExists(task.workflow, workflowIds, "system.default_workflow_order", `tasks.${id}.workflow`);
     checkExists(task.invocation_handoff, handoffKinds, "handoff_types", `tasks.${id}.invocation_handoff`);
     checkExists(task.result_handoff, handoffKinds, "handoff_types", `tasks.${id}.result_handoff`);
     for (const ref of task.input_artifacts) {
       checkExists(ref, artifactIds, "artifacts", `tasks.${id}.input_artifacts`);
     }
   }
-  for (const [phase, wf] of Object.entries(dsl.workflow)) {
-    checkExists(phase, phases, "system.default_phase_order", `workflow.${phase}`);
+  for (const [wfId, wf] of Object.entries(dsl.workflow)) {
+    checkExists(wfId, workflowIds, "system.default_workflow_order", `workflow.${wfId}`);
     for (let j2 = 0; j2 < wf.steps.length; j2++) {
       const step = wf.steps[j2];
       if (step.type === "handoff") {
         if (step.task) {
-          checkExists(step.task, taskIds, "tasks", `workflow.${phase}.steps[${j2}].task`);
+          checkExists(step.task, taskIds, "tasks", `workflow.${wfId}.steps[${j2}].task`);
         }
         if (step.from_agent) {
-          checkExists(step.from_agent, agentIds, "agents", `workflow.${phase}.steps[${j2}].from_agent`);
+          checkExists(step.from_agent, agentIds, "agents", `workflow.${wfId}.steps[${j2}].from_agent`);
         }
       } else if (step.type === "validation") {
-        checkExists(step.validation, validationIds, "validations", `workflow.${phase}.steps[${j2}].validation`);
+        checkExists(step.validation, validationIds, "validations", `workflow.${wfId}.steps[${j2}].validation`);
       }
     }
   }
@@ -59354,85 +59459,6 @@ var toolExecutionRule = {
   }
 };
 
-// src/linter/rules/release-audit.ts
-var releaseAuditRule = {
-  id: "release-audit",
-  description: "Workflow graph completeness: release/audit phases should have proper handoff structures",
-  run(dsl) {
-    const diagnostics = [];
-    const phases = dsl.system.default_phase_order;
-    const hasAuditPhase = phases.some(
-      (p2) => p2 === "audit" || p2 === "release" || p2 === "review"
-    );
-    if (!hasAuditPhase) {
-      return diagnostics;
-    }
-    const handoffKinds = new Set(Object.keys(dsl.handoff_types));
-    const hasReleaseReadiness = handoffKinds.has("release-readiness");
-    const hasReleaseResult = handoffKinds.has("release-result");
-    if (!hasReleaseReadiness) {
-      diagnostics.push({
-        ruleId: "release-audit",
-        severity: "warning",
-        path: "handoff_types",
-        message: 'Missing "release-readiness" handoff type for audit/release workflow'
-      });
-    }
-    if (!hasReleaseResult) {
-      diagnostics.push({
-        ruleId: "release-audit",
-        severity: "warning",
-        path: "handoff_types",
-        message: 'Missing "release-result" handoff type for audit/release workflow'
-      });
-    }
-    if (phases.some((p2) => p2 === "audit")) {
-      const hasAuditReport = handoffKinds.has("audit-report");
-      const hasAuditReconciliation = handoffKinds.has("audit-reconciliation");
-      if (!hasAuditReport) {
-        diagnostics.push({
-          ruleId: "release-audit",
-          severity: "warning",
-          path: "handoff_types",
-          message: 'Missing "audit-report" handoff type for audit workflow'
-        });
-      }
-      if (!hasAuditReconciliation) {
-        diagnostics.push({
-          ruleId: "release-audit",
-          severity: "warning",
-          path: "handoff_types",
-          message: 'Missing "audit-reconciliation" handoff type for audit workflow'
-        });
-      }
-    }
-    const workflowPhases = new Set(Object.keys(dsl.workflow));
-    for (const phase of phases) {
-      if ((phase === "audit" || phase === "release") && !workflowPhases.has(phase)) {
-        diagnostics.push({
-          ruleId: "release-audit",
-          severity: "warning",
-          path: "workflow",
-          message: `Phase "${phase}" is in default_phase_order but has no workflow definition`
-        });
-      }
-    }
-    for (const [phase, wf] of Object.entries(dsl.workflow)) {
-      if (phase !== "audit" && phase !== "release") continue;
-      const hasDecision = wf.steps.some((s2) => s2.type === "decision");
-      if (!hasDecision) {
-        diagnostics.push({
-          ruleId: "release-audit",
-          severity: "info",
-          path: `workflow.${phase}`,
-          message: `Audit/release workflow phase "${phase}" has no decision step for remediation routing`
-        });
-      }
-    }
-    return diagnostics;
-  }
-};
-
 // src/linter/rules/task-agent-binding.ts
 var taskAgentBindingRule = {
   id: "task-agent-binding",
@@ -59536,21 +59562,21 @@ var taskAgentBindingRule = {
 // src/linter/rules/merge-integrity.ts
 var mergeIntegrityRule = {
   id: "merge-integrity",
-  description: "Post-merge integrity: check that resolved DSL phase order has no duplicates",
+  description: "Post-merge integrity: check that resolved DSL workflow order has no duplicates",
   run(dsl) {
     const diagnostics = [];
-    const phases = dsl.system.default_phase_order;
-    const phaseSeen = /* @__PURE__ */ new Set();
-    for (let i3 = 0; i3 < phases.length; i3++) {
-      if (phaseSeen.has(phases[i3])) {
+    const workflows = dsl.system.default_workflow_order;
+    const seen = /* @__PURE__ */ new Set();
+    for (let i3 = 0; i3 < workflows.length; i3++) {
+      if (seen.has(workflows[i3])) {
         diagnostics.push({
           ruleId: "merge-integrity",
           severity: "error",
-          path: `system.default_phase_order[${i3}]`,
-          message: `Duplicate phase "${phases[i3]}" in default_phase_order`
+          path: `system.default_workflow_order[${i3}]`,
+          message: `Duplicate workflow "${workflows[i3]}" in default_workflow_order`
         });
       }
-      phaseSeen.add(phases[i3]);
+      seen.add(workflows[i3]);
     }
     return diagnostics;
   }
@@ -59560,7 +59586,6 @@ var mergeIntegrityRule = {
 var builtinRules = [
   validationCoverageRule,
   toolExecutionRule,
-  releaseAuditRule,
   taskAgentBindingRule,
   mergeIntegrityRule
 ];
@@ -60191,9 +60216,9 @@ function buildHandoffTypeContext(dsl, handoffTypeId) {
   ).map(([id, t3]) => ({ ...t3, id }));
   return { handoff_type, relatedTasks, dsl };
 }
-function buildWorkflowContext(dsl, phaseId) {
-  const wfDef = dsl.workflow[phaseId];
-  const workflow = { ...wfDef, id: phaseId };
+function buildWorkflowContext(dsl, workflowId) {
+  const wfDef = dsl.workflow[workflowId];
+  const workflow = { ...wfDef, id: workflowId };
   return { workflow, dsl };
 }
 function buildPolicyContext(dsl, policyId) {
@@ -60257,7 +60282,7 @@ function buildDelegatableTasks(dsl, agentId) {
       id: taskId,
       description: t3.description,
       target_agent: t3.target_agent,
-      phase: t3.phase,
+      workflow: t3.workflow,
       input_artifacts: t3.input_artifacts,
       invocation_handoff: t3.invocation_handoff,
       invocation_payload_keys: invocationHandoff ? extractPayloadFieldNames(invocationHandoff.payload) : [],
@@ -60508,7 +60533,7 @@ async function checkDriftFromConfig(dsl, renderTargets) {
 }
 
 // src/config/types.ts
-import { z as z13 } from "zod";
+import { z as z14 } from "zod";
 var CONTEXT_TYPES = [
   "agent",
   "task",
@@ -60520,16 +60545,16 @@ var CONTEXT_TYPES = [
   "policy",
   "system"
 ];
-var ContextTypeSchema = z13.enum(CONTEXT_TYPES);
+var ContextTypeSchema = z14.enum(CONTEXT_TYPES);
 var ITERABLE_CONTEXT_TYPES = CONTEXT_TYPES.filter(
   (t3) => t3 !== "system"
 );
-var RenderTargetSchema = z13.object({
-  template: z13.string(),
+var RenderTargetSchema = z14.object({
+  template: z14.string(),
   context: ContextTypeSchema,
-  output: z13.string(),
-  include: z13.array(z13.string()).optional(),
-  exclude: z13.array(z13.string()).optional()
+  output: z14.string(),
+  include: z14.array(z14.string()).optional(),
+  exclude: z14.array(z14.string()).optional()
 }).refine(
   (data) => !(data.include && data.exclude),
   { message: "include and exclude are mutually exclusive" }
@@ -60542,9 +60567,9 @@ var RenderTargetSchema = z13.object({
   },
   { message: "include/exclude cannot be used with context: system" }
 );
-var AgentContractsConfigSchema = z13.object({
-  dsl: z13.string(),
-  renders: z13.array(RenderTargetSchema).min(1)
+var AgentContractsConfigSchema = z14.object({
+  dsl: z14.string(),
+  renders: z14.array(RenderTargetSchema).min(1)
 });
 
 // src/config/loader.ts