agent-contracts 0.11.0 → 0.11.2

package/dist/index.d.ts

@@ -97,29 +97,31 @@ type Artifact = z.infer<typeof ArtifactSchema>;
 declare const MatcherSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     type: z.ZodLiteral<"command_regex">;
     pattern: z.ZodString;
-}, z.core.$strip>, z.ZodObject<{
+}, z.core.$loose>, z.ZodObject<{
     type: z.ZodLiteral<"content_regex">;
     pattern: z.ZodString;
     file_glob: z.ZodOptional<z.ZodString>;
     exclude_glob: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>, z.ZodObject<{
+}, z.core.$loose>, z.ZodObject<{
     type: z.ZodLiteral<"file_glob">;
     pattern: z.ZodString;
-}, z.core.$strip>], "type">;
+    exclude_glob: z.ZodOptional<z.ZodString>;
+}, z.core.$loose>], "type">;
 type Matcher = z.infer<typeof MatcherSchema>;
 declare const CheckSchema: z.ZodObject<{
     matcher: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
         type: z.ZodLiteral<"command_regex">;
         pattern: z.ZodString;
-    }, z.core.$strip>, z.ZodObject<{
+    }, z.core.$loose>, z.ZodObject<{
         type: z.ZodLiteral<"content_regex">;
         pattern: z.ZodString;
         file_glob: z.ZodOptional<z.ZodString>;
         exclude_glob: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>, z.ZodObject<{
+    }, z.core.$loose>, z.ZodObject<{
         type: z.ZodLiteral<"file_glob">;
         pattern: z.ZodString;
-    }, z.core.$strip>], "type">>;
+        exclude_glob: z.ZodOptional<z.ZodString>;
+    }, z.core.$loose>], "type">>;
     script: z.ZodOptional<z.ZodString>;
     message: z.ZodOptional<z.ZodString>;
 }, z.core.$loose>;
@@ -151,15 +153,16 @@ declare const SoftwareBindingSchema: z.ZodObject<{
             matcher: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
                 type: z.ZodLiteral<"command_regex">;
                 pattern: z.ZodString;
-            }, z.core.$strip>, z.ZodObject<{
+            }, z.core.$loose>, z.ZodObject<{
                 type: z.ZodLiteral<"content_regex">;
                 pattern: z.ZodString;
                 file_glob: z.ZodOptional<z.ZodString>;
                 exclude_glob: z.ZodOptional<z.ZodString>;
-            }, z.core.$strip>, z.ZodObject<{
+            }, z.core.$loose>, z.ZodObject<{
                 type: z.ZodLiteral<"file_glob">;
                 pattern: z.ZodString;
-            }, z.core.$strip>], "type">>;
+                exclude_glob: z.ZodOptional<z.ZodString>;
+            }, z.core.$loose>], "type">>;
             script: z.ZodOptional<z.ZodString>;
             message: z.ZodOptional<z.ZodString>;
         }, z.core.$loose>>;

package/dist/index.js

@@ -158,11 +158,11 @@ function __metadata(metadataKey, metadataValue) {
 }
 function __awaiter(thisArg, _arguments, P2, generator) {
   function adopt(value) {
-    return value instanceof P2 ? value : new P2(function(resolve6) {
-      resolve6(value);
+    return value instanceof P2 ? value : new P2(function(resolve7) {
+      resolve7(value);
     });
   }
-  return new (P2 || (P2 = Promise))(function(resolve6, reject) {
+  return new (P2 || (P2 = Promise))(function(resolve7, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -178,7 +178,7 @@ function __awaiter(thisArg, _arguments, P2, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve6(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve7(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -369,14 +369,14 @@ function __asyncValues(o3) {
   }, i3);
   function verb(n3) {
     i3[n3] = o3[n3] && function(v2) {
-      return new Promise(function(resolve6, reject) {
-        v2 = o3[n3](v2), settle(resolve6, reject, v2.done, v2.value);
+      return new Promise(function(resolve7, reject) {
+        v2 = o3[n3](v2), settle(resolve7, reject, v2.done, v2.value);
       });
     };
   }
-  function settle(resolve6, reject, d2, v2) {
+  function settle(resolve7, reject, d2, v2) {
     Promise.resolve(v2).then(function(v3) {
-      resolve6({ value: v3, done: d2 });
+      resolve7({ value: v3, done: d2 });
     }, reject);
   }
 }
@@ -13032,11 +13032,11 @@ function __metadata2(metadataKey, metadataValue) {
 }
 function __awaiter2(thisArg, _arguments, P2, generator) {
   function adopt(value) {
-    return value instanceof P2 ? value : new P2(function(resolve6) {
-      resolve6(value);
+    return value instanceof P2 ? value : new P2(function(resolve7) {
+      resolve7(value);
     });
   }
-  return new (P2 || (P2 = Promise))(function(resolve6, reject) {
+  return new (P2 || (P2 = Promise))(function(resolve7, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -13052,7 +13052,7 @@ function __awaiter2(thisArg, _arguments, P2, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve6(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve7(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -13230,14 +13230,14 @@ function __asyncValues2(o3) {
   }, i3);
   function verb(n3) {
     i3[n3] = o3[n3] && function(v2) {
-      return new Promise(function(resolve6, reject) {
-        v2 = o3[n3](v2), settle(resolve6, reject, v2.done, v2.value);
+      return new Promise(function(resolve7, reject) {
+        v2 = o3[n3](v2), settle(resolve7, reject, v2.done, v2.value);
       });
     };
   }
-  function settle(resolve6, reject, d2, v2) {
+  function settle(resolve7, reject, d2, v2) {
     Promise.resolve(v2).then(function(v3) {
-      resolve6({ value: v3, done: d2 });
+      resolve7({ value: v3, done: d2 });
     }, reject);
   }
 }
@@ -15151,7 +15151,7 @@ function consumeBody() {
   let accum = [];
   let accumBytes = 0;
   let abort = false;
-  return new Body.Promise(function(resolve6, reject) {
+  return new Body.Promise(function(resolve7, reject) {
     let resTimeout;
     if (_this4.timeout) {
       resTimeout = setTimeout(function() {
@@ -15185,7 +15185,7 @@ function consumeBody() {
       }
       clearTimeout(resTimeout);
       try {
-        resolve6(Buffer.concat(accum, accumBytes));
+        resolve7(Buffer.concat(accum, accumBytes));
       } catch (err) {
         reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, "system", err));
       }
@@ -15448,7 +15448,7 @@ function fetch(url, opts) {
     throw new Error("native promise missing, set fetch.Promise to your favorite alternative");
   }
   Body.Promise = fetch.Promise;
-  return new fetch.Promise(function(resolve6, reject) {
+  return new fetch.Promise(function(resolve7, reject) {
     const request = new Request(url, opts);
     const options = getNodeRequestOptions(request);
     const send = (options.protocol === "https:" ? https : http).request;
@@ -15581,7 +15581,7 @@ function fetch(url, opts) {
               requestOpts.body = void 0;
               requestOpts.headers.delete("content-length");
             }
-            resolve6(fetch(new Request(locationURL, requestOpts)));
+            resolve7(fetch(new Request(locationURL, requestOpts)));
             finalize();
             return;
         }
@@ -15602,7 +15602,7 @@ function fetch(url, opts) {
       const codings = headers.get("Content-Encoding");
       if (!request.compress || request.method === "HEAD" || codings === null || res.statusCode === 204 || res.statusCode === 304) {
         response = new Response(body, response_options);
-        resolve6(response);
+        resolve7(response);
         return;
       }
       const zlibOptions = {
@@ -15612,7 +15612,7 @@ function fetch(url, opts) {
       if (codings == "gzip" || codings == "x-gzip") {
         body = body.pipe(zlib.createGunzip(zlibOptions));
         response = new Response(body, response_options);
-        resolve6(response);
+        resolve7(response);
         return;
       }
       if (codings == "deflate" || codings == "x-deflate") {
@@ -15624,12 +15624,12 @@ function fetch(url, opts) {
             body = body.pipe(zlib.createInflateRaw());
           }
           response = new Response(body, response_options);
-          resolve6(response);
+          resolve7(response);
         });
         raw.on("end", function() {
           if (!response) {
             response = new Response(body, response_options);
-            resolve6(response);
+            resolve7(response);
           }
         });
         return;
@@ -15637,11 +15637,11 @@ function fetch(url, opts) {
       if (codings == "br" && typeof zlib.createBrotliDecompress === "function") {
         body = body.pipe(zlib.createBrotliDecompress());
         response = new Response(body, response_options);
-        resolve6(response);
+        resolve7(response);
         return;
       }
       response = new Response(body, response_options);
-      resolve6(response);
+      resolve7(response);
     });
     writeToStream(req, request);
   });
@@ -16354,13 +16354,13 @@ var require_file = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     var fs_1 = __require("fs");
     function resolveFile(ref) {
-      return new Promise((resolve6, reject) => {
+      return new Promise((resolve7, reject) => {
         const path = ref.href();
         fs_1.readFile(path, "utf8", (err, data) => {
           if (err) {
             reject(err);
           } else {
-            resolve6(data);
+            resolve7(data);
           }
         });
       });
@@ -23963,12 +23963,12 @@ var require_reader = __commonJS({
         }
       } else {
         try {
-          return await new Promise((resolve6, reject) => {
+          return await new Promise((resolve7, reject) => {
             fs.readFile(name, opts.encoding, (err, data) => {
               if (err !== null) {
                 reject(err);
               } else {
-                resolve6(data);
+                resolve7(data);
               }
             });
           });
@@ -40853,14 +40853,14 @@ var require_AsyncFromSyncIteratorContinuation = __commonJS({
       if (!$Promise) {
         throw new $SyntaxError("This environment does not support Promises.");
       }
-      return new $Promise(function(resolve6) {
+      return new $Promise(function(resolve7) {
         var done = IteratorComplete(result);
         var value = IteratorValue(result);
         var valueWrapper = PromiseResolve($Promise, value);
         var onFulfilled = function(value2) {
           return CreateIteratorResultObject(value2, done);
         };
-        resolve6($then(valueWrapper, onFulfilled));
+        resolve7($then(valueWrapper, onFulfilled));
       });
     };
   }
@@ -41408,7 +41408,7 @@ var require_CreateAsyncFromSyncIterator = __commonJS({
         var O2 = this;
         SLOT.assert(O2, "[[SyncIteratorRecord]]");
         var argsLength = arguments.length;
-        return new $Promise(function(resolve6) {
+        return new $Promise(function(resolve7) {
           var syncIteratorRecord = SLOT.get(O2, "[[SyncIteratorRecord]]");
           var result;
           if (argsLength > 0) {
@@ -41416,7 +41416,7 @@ var require_CreateAsyncFromSyncIterator = __commonJS({
           } else {
             result = IteratorNext(syncIteratorRecord);
           }
-          resolve6(AsyncFromSyncIteratorContinuation(result));
+          resolve7(AsyncFromSyncIteratorContinuation(result));
         });
       },
       "return": function() {
@@ -41427,12 +41427,12 @@ var require_CreateAsyncFromSyncIterator = __commonJS({
         SLOT.assert(O2, "[[SyncIteratorRecord]]");
         var valueIsPresent = arguments.length > 0;
         var value = valueIsPresent ? arguments[0] : void 0;
-        return new $Promise(function(resolve6, reject) {
+        return new $Promise(function(resolve7, reject) {
           var syncIterator = SLOT.get(O2, "[[SyncIteratorRecord]]")["[[Iterator]]"];
           var iteratorReturn = GetMethod(syncIterator, "return");
           if (typeof iteratorReturn === "undefined") {
             var iterResult = CreateIteratorResultObject(value, true);
-            Call(resolve6, void 0, [iterResult]);
+            Call(resolve7, void 0, [iterResult]);
             return;
           }
           var result;
@@ -41445,7 +41445,7 @@ var require_CreateAsyncFromSyncIterator = __commonJS({
             Call(reject, void 0, [new $TypeError("Iterator `return` method returned a non-object value.")]);
             return;
           }
-          resolve6(AsyncFromSyncIteratorContinuation(result));
+          resolve7(AsyncFromSyncIteratorContinuation(result));
         });
       },
       "throw": function() {
@@ -41456,7 +41456,7 @@ var require_CreateAsyncFromSyncIterator = __commonJS({
         SLOT.assert(O2, "[[SyncIteratorRecord]]");
         var valueIsPresent = arguments.length > 0;
         var value = valueIsPresent ? arguments[0] : void 0;
-        return new $Promise(function(resolve6, reject) {
+        return new $Promise(function(resolve7, reject) {
           var syncIterator = SLOT.get(O2, "[[SyncIteratorRecord]]")["[[Iterator]]"];
           var throwMethod = GetMethod(syncIterator, "throw");
           if (typeof throwMethod === "undefined") {
@@ -41473,7 +41473,7 @@ var require_CreateAsyncFromSyncIterator = __commonJS({
             Call(reject, void 0, [new $TypeError("Iterator `throw` method returned a non-object value.")]);
             return;
           }
-          resolve6(AsyncFromSyncIteratorContinuation(
+          resolve7(AsyncFromSyncIteratorContinuation(
             result
             /* , promiseCapability */
           ));
@@ -50485,17 +50485,18 @@ import { z as z3 } from "zod";
 var CommandRegexMatcherSchema = z3.object({
   type: z3.literal("command_regex"),
   pattern: z3.string()
-});
+}).passthrough();
 var ContentRegexMatcherSchema = z3.object({
   type: z3.literal("content_regex"),
   pattern: z3.string(),
   file_glob: z3.string().optional(),
   exclude_glob: z3.string().optional()
-});
+}).passthrough();
 var FileGlobMatcherSchema = z3.object({
   type: z3.literal("file_glob"),
-  pattern: z3.string()
-});
+  pattern: z3.string(),
+  exclude_glob: z3.string().optional()
+}).passthrough();
 var MatcherSchema = z3.discriminatedUnion("type", [
   CommandRegexMatcherSchema,
   ContentRegexMatcherSchema,
@@ -54021,6 +54022,8 @@ async function checkDriftFromConfig(dsl, renderTargets) {
 
 // src/config/binding-loader.ts
 import { readFile as readFile4 } from "fs/promises";
+import { dirname as dirname5, resolve as resolve5 } from "path";
+import { stat as stat2 } from "fs/promises";
 import { parse as parseYaml3 } from "yaml";
 
 // src/config/loader.ts
@@ -54158,30 +54161,130 @@ function resolveDslPath(dirArg, dirArgDefault, config) {
   return resolve4(dirArgDefault);
 }
 
+// src/config/binding-merger.ts
+function isRecord3(v2) {
+  return typeof v2 === "object" && v2 !== null && !Array.isArray(v2);
+}
+var BINDING_MERGE_SECTIONS = ["guardrail_impl", "outputs"];
+function mergeBinding(base, project) {
+  const hasExtends = typeof project["extends"] === "string";
+  const result = { ...base, ...project };
+  for (const section of BINDING_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,
+      section,
+      hasExtends
+    );
+  }
+  if (project["reporting"] !== void 0 && isRecord3(base["reporting"]) && isRecord3(project["reporting"])) {
+    result["reporting"] = deepMergeEntities(
+      base["reporting"],
+      project["reporting"],
+      "reporting",
+      hasExtends
+    );
+  }
+  delete result["extends"];
+  return result;
+}
+
 // src/config/binding-loader.ts
-async function loadBindings(bindingPaths) {
-  const results = [];
-  for (const filePath of bindingPaths) {
-    let content;
+async function loadRawBinding(filePath) {
+  let content;
+  try {
+    content = await readFile4(filePath, "utf8");
+  } catch {
+    throw new ConfigLoadError(
+      `Failed to read binding file: ${filePath}`,
+      filePath
+    );
+  }
+  try {
+    return parseYaml3(content);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new ConfigLoadError(
+      `Invalid YAML syntax in binding file ${filePath}: ${msg}`,
+      filePath
+    );
+  }
+}
+async function resolveBindingExtends(raw, filePath, seen) {
+  const extendsValue = raw["extends"];
+  if (typeof extendsValue !== "string") {
+    return raw;
+  }
+  const bindingDir = dirname5(filePath);
+  let basePath;
+  if (extendsValue.startsWith("./") || extendsValue.startsWith("../")) {
+    basePath = resolve5(bindingDir, extendsValue);
+  } else {
     try {
-      content = await readFile4(filePath, "utf8");
+      const resolved = import.meta.resolve(extendsValue);
+      basePath = new URL(resolved).pathname;
     } catch {
       throw new ConfigLoadError(
-        `Failed to read binding file: ${filePath}`,
+        `Could not resolve binding extends package: ${extendsValue}`,
         filePath
       );
     }
-    let raw;
-    try {
-      raw = parseYaml3(content);
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      throw new ConfigLoadError(
-        `Invalid YAML syntax in binding file ${filePath}: ${msg}`,
-        filePath
-      );
+  }
+  try {
+    const s2 = await stat2(basePath);
+    if (s2.isDirectory()) {
+      const candidates = ["binding.yaml", "binding.yml"];
+      let found = false;
+      for (const name of candidates) {
+        const candidate = resolve5(basePath, name);
+        try {
+          const cs = await stat2(candidate);
+          if (cs.isFile()) {
+            basePath = candidate;
+            found = true;
+            break;
+          }
+        } catch {
+          continue;
+        }
+      }
+      if (!found) {
+        throw new ConfigLoadError(
+          `No binding.yaml found in directory: ${basePath}`,
+          filePath
+        );
+      }
     }
-    const result = SoftwareBindingSchema.safeParse(raw);
+  } catch (err) {
+    if (err instanceof ConfigLoadError) throw err;
+    throw new ConfigLoadError(
+      `Base binding path not found: ${basePath}`,
+      filePath
+    );
+  }
+  if (seen.has(basePath)) {
+    throw new ConfigLoadError(
+      `Circular binding extends detected: ${basePath}`,
+      filePath
+    );
+  }
+  seen.add(basePath);
+  const baseRaw = await loadRawBinding(basePath);
+  const resolvedBase = await resolveBindingExtends(baseRaw, basePath, seen);
+  return mergeBinding(resolvedBase, raw);
+}
+async function loadBindings(bindingPaths) {
+  const results = [];
+  for (const filePath of bindingPaths) {
+    const raw = await loadRawBinding(filePath);
+    const merged = await resolveBindingExtends(raw, filePath, /* @__PURE__ */ new Set([filePath]));
+    const result = SoftwareBindingSchema.safeParse(merged);
     if (!result.success) {
       const issues = result.error.issues.map((i3) => `  ${i3.path.join(".")}: ${i3.message}`).join("\n");
       throw new ConfigLoadError(
@@ -54197,7 +54300,7 @@ ${issues}`,
 
 // src/guardrail-generator/generator.ts
 import { readFile as readFile5, writeFile as writeFile2, mkdir as mkdir2, chmod } from "fs/promises";
-import { resolve as resolve5, dirname as dirname5 } from "path";
+import { resolve as resolve6, dirname as dirname6 } from "path";
 import Handlebars2 from "handlebars";
 
 // src/guardrail-generator/resolve-checks.ts
@@ -54338,7 +54441,7 @@ async function generateGuardrails(options) {
       if (pathResult.diagnostics.some((d2) => d2.severity === "error")) {
         continue;
       }
-      const targetPath = resolve5(config.configDir, pathResult.resolved);
+      const targetPath = resolve6(config.configDir, pathResult.resolved);
       let templateContent;
       if (outputDef.inline_template) {
         templateContent = outputDef.inline_template;
@@ -54351,7 +54454,7 @@ async function generateGuardrails(options) {
           });
           continue;
         }
-        const templatePath = resolve5(config.configDir, outputDef.template);
+        const templatePath = resolve6(config.configDir, outputDef.template);
         try {
           templateContent = await readFile5(templatePath, "utf8");
         } catch {
@@ -54388,9 +54491,9 @@ async function generateGuardrails(options) {
           };
           const compiled = Handlebars2.compile(templateContent, { noEscape: true });
           const output = compiled(groupCtx);
-          const groupTarget = resolve5(targetPath, groupKey);
+          const groupTarget = resolve6(targetPath, groupKey);
           if (!dryRun) {
-            await mkdir2(dirname5(groupTarget), { recursive: true });
+            await mkdir2(dirname6(groupTarget), { recursive: true });
             await writeFile2(groupTarget, output, "utf8");
             if (outputDef.executable) {
               await chmod(groupTarget, 493);
@@ -54402,7 +54505,7 @@ async function generateGuardrails(options) {
         const compiled = Handlebars2.compile(templateContent, { noEscape: true });
         const output = compiled(ctx);
         if (!dryRun) {
-          await mkdir2(dirname5(targetPath), { recursive: true });
+          await mkdir2(dirname6(targetPath), { recursive: true });
           await writeFile2(targetPath, output, "utf8");
           if (outputDef.executable) {
             await chmod(targetPath, 493);