@adhd/apigen-engine-runtime 0.2.2 → 0.2.3

package/index.mjs

@@ -2,69 +2,69 @@ import "ts-morph";
 import "node:fs";
 import "node:path";
 import "ts-json-schema-generator";
-import N from "pino";
-import ge from "ajv";
-import we from "ajv-formats";
-const C = "$apigen";
-class W extends Error {
+import j from "pino";
+import $e from "ajv";
+import Ae from "ajv-formats";
+const x = "$apigen";
+class J extends Error {
   constructor(t) {
     super(t), this.code = "E_DUP_CODEC", this.name = "CodecRegistryError";
   }
 }
-function be(e) {
+function Oe(e) {
   const t = /* @__PURE__ */ new Map();
   return {
-    register(r, n) {
-      if (t.has(r.id) && !(n != null && n.override))
-        throw new W(
-          `E_DUP_CODEC: a codec is already registered for id "${r.id}"`
+    register(n, r) {
+      if (t.has(n.id) && !(r != null && r.override))
+        throw new J(
+          `E_DUP_CODEC: a codec is already registered for id "${n.id}"`
         );
-      t.set(r.id, r);
+      t.set(n.id, n);
     },
-    resolve(r) {
-      for (const n of t.values())
-        if (n.matches(r))
-          return n;
+    resolve(n) {
+      for (const r of t.values())
+        if (r.matches(n))
+          return r;
     },
-    get(r) {
-      return t.get(r);
+    get(n) {
+      return t.get(n);
     },
     ids() {
       return [...t.keys()];
     },
     freeze() {
-      const r = new Map(t), n = {
+      const n = new Map(t), r = {
         register() {
-          throw new W(
+          throw new J(
             "E_DUP_CODEC: registry is frozen and cannot accept new codecs"
           );
         },
         resolve(o) {
-          for (const i of r.values())
+          for (const i of n.values())
             if (i.matches(o))
               return i;
         },
         get(o) {
-          return r.get(o);
+          return n.get(o);
         },
         ids() {
-          return [...r.keys()];
+          return [...n.keys()];
         },
         freeze() {
-          return n;
+          return r;
         }
       };
-      return n;
+      return r;
     }
   };
 }
-const L = "x-apigen-logical", R = "x-apigen-codec", S = "x-apigen-ctor", x = "x-apigen-tojson", ve = "0.1.0";
+const L = "x-apigen-logical", B = "x-apigen-codec", S = "x-apigen-ctor", M = "x-apigen-tojson", je = "0.1.0";
 function G(e, t) {
   return {
     registry: e,
-    resolve: (r) => {
+    resolve: (n) => {
       throw new Error(
-        `[apigen-logical] $ref "${r}" cannot be resolved in run-mode without a descriptor root. Supply a resolve() in the ctx override to handle $ref.`
+        `[apigen-logical] $ref "${n}" cannot be resolved in run-mode without a descriptor root. Supply a resolve() in the ctx override to handle $ref.`
       );
     },
     seen: /* @__PURE__ */ new WeakSet(),
@@ -73,66 +73,66 @@ function G(e, t) {
     ...t
   };
 }
-function v(e, t, r) {
-  const n = r.registry.resolve(t);
-  if (n)
-    return n.encode(e, t, r);
+function v(e, t, n) {
+  const r = n.registry.resolve(t);
+  if (r)
+    return r.encode(e, t, n);
   const o = t.$ref;
   if (typeof o == "string") {
-    const a = r.resolve(o);
-    return v(e, a, r);
+    const a = n.resolve(o);
+    return v(e, a, n);
   }
   const i = t.oneOf;
   if (Array.isArray(i)) {
-    const a = ue(e, i, t);
-    return v(e, a, r);
+    const a = le(e, i, t);
+    return v(e, a, n);
   }
   const s = t.type;
   if (s === "array") {
     if (!Array.isArray(e))
-      return _(e, t, r);
+      return _(e, t, n);
     const a = t.items;
     if (!a)
       return e.map((c) => w(c));
-    const f = r.path;
+    const f = n.path;
     return Array.isArray(a) ? e.map((c, u) => {
       const p = a[u];
-      return p === void 0 ? w(c) : v(c, p, { ...r, path: `${f}/${u}` });
+      return p === void 0 ? w(c) : v(c, p, { ...n, path: `${f}/${u}` });
     }) : e.map(
-      (c, u) => v(c, a, { ...r, path: `${f}/${u}` })
+      (c, u) => v(c, a, { ...n, path: `${f}/${u}` })
     );
   }
   if (s === "object") {
     if (e === null || typeof e != "object" || Array.isArray(e))
-      return _(e, t, r);
+      return _(e, t, n);
     const a = t.properties;
     if (!a)
       return w(e);
-    const f = r.path, c = {};
+    const f = n.path, c = {};
     for (const [u, p] of Object.entries(a)) {
       const d = e[u];
       d !== void 0 && (c[u] = v(d, p, {
-        ...r,
+        ...n,
         path: `${f}/${u}`
       }));
     }
     return c;
   }
-  return s == null ? _(e, t, r) : w(e);
+  return s == null ? _(e, t, n) : w(e);
 }
-function $(e, t, r) {
-  const n = r.registry.resolve(t);
-  if (n)
-    return n.decode(e, t, r);
+function $(e, t, n) {
+  const r = n.registry.resolve(t);
+  if (r)
+    return r.decode(e, t, n);
   const o = t.$ref;
   if (typeof o == "string") {
-    const a = r.resolve(o);
-    return $(e, a, r);
+    const a = n.resolve(o);
+    return $(e, a, n);
   }
   const i = t.oneOf;
   if (Array.isArray(i)) {
-    const a = ue(e, i, t);
-    return $(e, a, r);
+    const a = le(e, i, t);
+    return $(e, a, n);
   }
   const s = t.type;
   if (s === "array") {
@@ -141,12 +141,12 @@ function $(e, t, r) {
     const a = t.items;
     if (!a)
       return e;
-    const f = r.path;
+    const f = n.path;
     return Array.isArray(a) ? e.map((c, u) => {
       const p = a[u];
-      return p === void 0 ? c : $(c, p, { ...r, path: `${f}/${u}` });
+      return p === void 0 ? c : $(c, p, { ...n, path: `${f}/${u}` });
     }) : e.map(
-      (c, u) => $(c, a, { ...r, path: `${f}/${u}` })
+      (c, u) => $(c, a, { ...n, path: `${f}/${u}` })
     );
   }
   if (s === "object") {
@@ -155,20 +155,20 @@ function $(e, t, r) {
     const a = t.properties;
     if (!a)
       return e;
-    const f = r.path, c = {};
+    const f = n.path, c = {};
     for (const [u, p] of Object.entries(a)) {
       const d = e[u];
       d !== void 0 && (c[u] = $(d, p, {
-        ...r,
+        ...n,
         path: `${f}/${u}`
       }));
     }
     return c;
   }
-  return s == null ? $e(e, r) : e;
+  return s == null ? Ne(e, n) : e;
 }
-function ue(e, t, r, n) {
-  const o = r.discriminator;
+function le(e, t, n, r) {
+  const o = n.discriminator;
   if (o != null && o.propertyName) {
     const i = e !== null && typeof e == "object" ? e[o.propertyName] : void 0;
     if (typeof i == "string" && o.mapping) {
@@ -182,23 +182,23 @@ function ue(e, t, r, n) {
   }
   return t[0] ?? {};
 }
-function _(e, t, r) {
-  for (const n of r.registry.ids()) {
-    const o = r.registry.get(n);
+function _(e, t, n) {
+  for (const r of n.registry.ids()) {
+    const o = n.registry.get(r);
     if (o)
       try {
-        const i = o.encode(e, o.schema, r);
-        return { [C]: n, v: i };
+        const i = o.encode(e, o.schema, n);
+        return { [x]: r, v: i };
       } catch {
       }
   }
   return w(e);
 }
-function $e(e, t) {
-  if (e !== null && typeof e == "object" && !Array.isArray(e) && C in e) {
-    const r = e, n = r[C], o = t.registry.get(n);
+function Ne(e, t) {
+  if (e !== null && typeof e == "object" && !Array.isArray(e) && x in e) {
+    const n = e, r = n[x], o = t.registry.get(r);
     if (o)
-      return o.decode(r.v, o.schema, t);
+      return o.decode(n.v, o.schema, t);
   }
   return e;
 }
@@ -209,63 +209,63 @@ function w(e) {
     return e.map(w);
   if (typeof e == "object") {
     const t = {};
-    for (const [r, n] of Object.entries(e))
-      n !== void 0 && (t[r] = w(n));
+    for (const [n, r] of Object.entries(e))
+      r !== void 0 && (t[n] = w(r));
     return t;
   }
   return null;
 }
-function je(e) {
+function Ee(e) {
   return {
-    encode(t, r, n) {
-      const o = G(e, n);
-      return v(t, r, o);
+    encode(t, n, r) {
+      const o = G(e, r);
+      return v(t, n, o);
     },
-    decode(t, r, n) {
-      const o = G(e, n);
-      return $(t, r, o);
+    decode(t, n, r) {
+      const o = G(e, r);
+      return $(t, n, o);
     }
   };
 }
-const B = {
+const F = {
   id: "date-time",
   kind: "scalar",
   schema: { type: "string", format: "date-time" },
   matches(e) {
     return e.type === "string" && e.format === "date-time";
   },
-  encode(e, t, r) {
+  encode(e, t, n) {
     return e.toISOString();
   },
-  decode(e, t, r) {
+  decode(e, t, n) {
     if (typeof e != "string") {
-      if (r.mode === "strict")
+      if (n.mode === "strict")
         throw new TypeError(
-          `[date-time] expected a string on the wire at "${r.path}", got ${typeof e}`
+          `[date-time] expected a string on the wire at "${n.path}", got ${typeof e}`
         );
       return new Date(String(e));
     }
-    if (r.mode === "strict" && Number.isNaN(new Date(e).getTime()))
+    if (n.mode === "strict" && Number.isNaN(new Date(e).getTime()))
       throw new TypeError(
-        `[date-time] invalid date-time string at "${r.path}": ${JSON.stringify(e)}`
+        `[date-time] invalid date-time string at "${n.path}": ${JSON.stringify(e)}`
       );
     return new Date(e);
   }
-}, F = {
+}, q = {
   id: "int64",
   kind: "scalar",
   schema: { type: "string", format: "int64" },
   matches(e) {
     return e.type === "string" && e.format === "int64";
   },
-  encode(e, t, r) {
+  encode(e, t, n) {
     return String(e);
   },
-  decode(e, t, r) {
+  decode(e, t, n) {
     if (typeof e != "string") {
-      if (r.mode === "strict")
+      if (n.mode === "strict")
         throw new TypeError(
-          `[int64] expected a string on the wire at "${r.path}", got ${typeof e}`
+          `[int64] expected a string on the wire at "${n.path}", got ${typeof e}`
         );
       try {
         return BigInt(Math.trunc(Number(e)));
@@ -273,7 +273,7 @@ const B = {
         return BigInt(0);
       }
     }
-    if (r.mode === "strict")
+    if (n.mode === "strict")
       return BigInt(e);
     if (/^-?\d+$/.test(e))
       try {
@@ -290,169 +290,283 @@ const B = {
   matches(e) {
     return e.type === "string" && e.format === "decimal";
   },
-  encode(e, t, r) {
+  encode(e, t, n) {
     return e;
   },
-  decode(e, t, r) {
+  decode(e, t, n) {
     if (typeof e != "string") {
-      if (r.mode === "strict")
+      if (n.mode === "strict")
         throw new TypeError(
-          `[decimal] expected a string on the wire at "${r.path}", got ${typeof e}`
+          `[decimal] expected a string on the wire at "${n.path}", got ${typeof e}`
         );
       return String(e);
     }
-    if (r.mode === "strict" && !/^-?\d+(\.\d+)?$/.test(e))
+    if (n.mode === "strict" && !/^-?\d+(\.\d+)?$/.test(e))
       throw new TypeError(
-        `[decimal] wire value "${e}" at "${r.path}" is not a valid decimal string`
+        `[decimal] wire value "${e}" at "${n.path}" is not a valid decimal string`
       );
     return e;
   }
-}, H = {
+}, z = {
   id: "byte",
   kind: "scalar",
   schema: { type: "string", format: "byte" },
   matches(e) {
     return e.type === "string" && e.format === "byte";
   },
-  encode(e, t, r) {
+  encode(e, t, n) {
     return Buffer.from(e).toString("base64");
   },
-  decode(e, t, r) {
+  decode(e, t, n) {
     if (typeof e != "string") {
-      if (r.mode === "strict")
+      if (n.mode === "strict")
         throw new TypeError(
-          `[byte] expected a base64 string on the wire at "${r.path}", got ${typeof e}`
+          `[byte] expected a base64 string on the wire at "${n.path}", got ${typeof e}`
         );
       return new Uint8Array(0);
     }
-    if (r.mode === "strict" && !/^[A-Za-z0-9+/]*={0,2}$/.test(e))
+    if (n.mode === "strict" && !/^[A-Za-z0-9+/]*={0,2}$/.test(e))
       throw new TypeError(
-        `[byte] wire value at "${r.path}" is not standard base64 (format:byte): "${e}"`
+        `[byte] wire value at "${n.path}" is not standard base64 (format:byte): "${e}"`
       );
     return new Uint8Array(Buffer.from(e, "base64"));
   }
-}, Ne = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/, q = {
+}, _e = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/, H = {
   id: "uuid",
   kind: "scalar",
   schema: { type: "string", format: "uuid" },
   matches(e) {
     return e.type === "string" && e.format === "uuid";
   },
-  encode(e, t, r) {
+  encode(e, t, n) {
     return e.toLowerCase();
   },
-  decode(e, t, r) {
+  decode(e, t, n) {
     if (typeof e != "string") {
-      if (r.mode === "strict")
+      if (n.mode === "strict")
         throw new TypeError(
-          `[uuid] expected a string on the wire at "${r.path}", got ${typeof e}`
+          `[uuid] expected a string on the wire at "${n.path}", got ${typeof e}`
         );
       return String(e).toLowerCase();
     }
-    if (r.mode === "strict" && !Ne.test(e))
+    if (n.mode === "strict" && !_e.test(e))
       throw new TypeError(
-        `[uuid] wire value "${e}" at "${r.path}" is not a lowercase-hyphenated RFC 4122 UUID`
+        `[uuid] wire value "${e}" at "${n.path}" is not a lowercase-hyphenated RFC 4122 UUID`
       );
     return e;
   }
-}, M = "NaN", T = "Infinity", P = "-Infinity", Oe = /* @__PURE__ */ new Set([
-  M,
+}, T = "NaN", P = "Infinity", D = "-Infinity", ke = /* @__PURE__ */ new Set([
   T,
-  P
-]), z = {
+  P,
+  D
+]), W = {
   id: "number-special",
   kind: "scalar",
   schema: { type: "number" },
   matches(e) {
     return e.type === "number" && e.format === void 0;
   },
-  encode(e, t, r) {
-    return Number.isNaN(e) ? M : e === 1 / 0 ? T : e === -1 / 0 ? P : e;
+  encode(e, t, n) {
+    return Number.isNaN(e) ? T : e === 1 / 0 ? P : e === -1 / 0 ? D : e;
   },
-  decode(e, t, r) {
+  decode(e, t, n) {
     if (typeof e == "number")
       return e;
     if (typeof e == "string") {
-      if (e === M)
-        return NaN;
       if (e === T)
-        return 1 / 0;
+        return NaN;
       if (e === P)
+        return 1 / 0;
+      if (e === D)
         return -1 / 0;
-      const n = Number(e);
-      if (!Number.isNaN(n))
-        return n;
+      const r = Number(e);
+      if (!Number.isNaN(r))
+        return r;
     }
-    if (r.mode === "strict")
+    if (n.mode === "strict")
       throw new TypeError(
-        `[number-special] unrecognized wire value at "${r.path}": ${JSON.stringify(e)}. Expected a number or one of ${[...Oe].join(", ")}.`
+        `[number-special] unrecognized wire value at "${n.path}": ${JSON.stringify(e)}. Expected a number or one of ${[...ke].join(", ")}.`
       );
     return NaN;
   }
-}, Ae = [
-  B,
+}, Ie = [
   F,
+  q,
   K,
+  z,
   H,
-  q,
-  z
+  W
 ];
-function _e(e, t = {}) {
-  for (const r of Ae)
-    e.register(r, { override: t.override ?? !1 });
+function Ce(e, t = {}) {
+  for (const n of Ie)
+    e.register(n, { override: t.override ?? !1 });
+}
+const xe = 12;
+function Se(e, t) {
+  const n = /^#\/(definitions|\$defs)\/(.+)$/.exec(e);
+  if (!n)
+    return;
+  const [, r, o] = n, i = r === "$defs" ? t.$defs : t.definitions;
+  return i == null ? void 0 : i[decodeURIComponent(o)];
+}
+function Y(e) {
+  return Array.isArray(e) && e.length > 0 ? e[0] : void 0;
+}
+function Me(e) {
+  if (Array.isArray(e.type))
+    return e.type.find((t) => t !== "null") ?? e.type[0];
+  if (typeof e.type == "string")
+    return e.type;
+  if (e.properties)
+    return "object";
+}
+function Te(e) {
+  switch (e.format) {
+    case "date-time":
+      return "1970-01-01T00:00:00.000Z";
+    case "date":
+      return "1970-01-01";
+    case "time":
+      return "00:00:00Z";
+    case "uuid":
+      return "00000000-0000-0000-0000-000000000000";
+    case "email":
+      return "user@example.com";
+    case "uri":
+    case "url":
+    case "uri-reference":
+      return "https://example.com";
+    case "hostname":
+      return "example.com";
+    case "ipv4":
+      return "127.0.0.1";
+    case "ipv6":
+      return "::1";
+    case "decimal":
+      return "0";
+    case "int64":
+      return "0";
+    case "byte":
+      return "";
+    default:
+      return "<string>";
+  }
+}
+function Z(e, t, n) {
+  const r = e.properties ?? {}, o = e.required ?? [], i = {};
+  for (const s of o) {
+    const a = r[s];
+    i[s] = a !== void 0 ? A(a, t, n + 1) : `<${s}>`;
+  }
+  return i;
+}
+function Pe(e, t, n) {
+  const r = Array.isArray(e.items) ? e.items[0] : e.items;
+  return r ? [A(r, t, n + 1)] : [];
+}
+function A(e, t = e ?? {}, n = 0) {
+  if (!e || n > xe)
+    return null;
+  if (typeof e.$ref == "string") {
+    const o = Se(e.$ref, t);
+    return o !== void 0 ? A(o, t, n + 1) : null;
+  }
+  if (e.const !== void 0)
+    return e.const;
+  if (Array.isArray(e.enum) && e.enum.length > 0)
+    return e.enum[0];
+  if (Array.isArray(e.allOf) && e.allOf.length > 0) {
+    const o = {}, i = [];
+    for (const s of e.allOf) {
+      Object.assign(o, s.properties ?? {});
+      for (const a of s.required ?? [])
+        i.includes(a) || i.push(a);
+    }
+    return Z(
+      { ...e, properties: o, required: i },
+      t,
+      n
+    );
+  }
+  const r = Y(e.oneOf) ?? Y(e.anyOf);
+  if (r)
+    return A(r, t, n + 1);
+  switch (Me(e)) {
+    case "object":
+      return Z(e, t, n);
+    case "array":
+      return Pe(e, t, n);
+    case "string":
+      return Te(e);
+    case "integer":
+    case "number":
+      return 0;
+    case "boolean":
+      return !1;
+    case "null":
+      return null;
+    default:
+      return null;
+  }
+}
+function de(e) {
+  if (!e)
+    return;
+  const t = A(e);
+  return `Example: ${JSON.stringify(t)}`;
 }
-B.id, // 'date-time'
-F.id, // 'int64'
+F.id, // 'date-time'
+q.id, // 'int64'
 K.id, // 'decimal'
-H.id, // 'byte'
-q.id, // 'uuid'
-z.id;
-const fe = be();
-_e(fe);
-const pe = je(fe.freeze());
-function Ee(e, t) {
-  var n;
-  const r = ((n = e.input) == null ? void 0 : n.properties) ?? {};
-  return t in r;
-}
-function ke(e) {
-  var r, n;
-  const t = (n = (r = e.input) == null ? void 0 : r.properties) == null ? void 0 : n.data;
+z.id, // 'byte'
+H.id, // 'uuid'
+W.id;
+const ye = Oe();
+Ce(ye);
+const me = Ee(ye.freeze());
+function De(e, t) {
+  var r;
+  const n = ((r = e.input) == null ? void 0 : r.properties) ?? {};
+  return t in n;
+}
+function Ue(e) {
+  var n, r;
+  const t = (r = (n = e.input) == null ? void 0 : n.properties) == null ? void 0 : r.data;
   return Object.keys((t == null ? void 0 : t.properties) ?? {});
 }
-function Ie(e, t) {
+function Re(e, t) {
   var o, i, s;
-  const r = (s = (i = (o = e.input) == null ? void 0 : o.properties) == null ? void 0 : i.data) == null ? void 0 : s.properties, n = r == null ? void 0 : r[t];
-  return n !== void 0 ? n : void 0;
+  const n = (s = (i = (o = e.input) == null ? void 0 : o.properties) == null ? void 0 : i.data) == null ? void 0 : s.properties, r = n == null ? void 0 : n[t];
+  return r !== void 0 ? r : void 0;
 }
-function Ce(e, t) {
-  return t === void 0 || e === void 0 ? e : pe.decode(e, t);
+function Le(e, t) {
+  return t === void 0 || e === void 0 ? e : me.decode(e, t);
 }
-function E(e, t) {
-  const r = t.output;
-  return !r || Object.keys(r).length === 0 ? e : pe.encode(e, r);
+function k(e, t) {
+  const n = t.output;
+  return !n || Object.keys(n).length === 0 ? e : me.encode(e, n);
 }
-async function Se(e, t, r, n, o, i) {
-  const a = ke(r).map(
-    (c) => Ce(i[c], Ie(r, c))
+async function Be(e, t, n, r, o, i) {
+  const a = Ue(n).map(
+    (c) => Le(i[c], Re(n, c))
   );
-  if (Ee(r, "session") && t) {
-    const c = await t({ session: o.session }), u = await e[n](c, ...a);
-    return E(u, r);
+  if (De(n, "session") && t) {
+    const c = await t({ session: o.session }), u = await e[r](c, ...a);
+    return k(u, n);
   }
-  if (r.hasCtx) {
-    const c = t ? await t(o) : void 0, u = await e[n](c, ...a);
-    return E(u, r);
+  if (n.hasCtx) {
+    const c = t ? await t(o) : void 0, u = await e[r](c, ...a);
+    return k(u, n);
   }
-  const f = await e[n](...a);
-  return E(f, r);
+  const f = await e[r](...a);
+  return k(f, n);
 }
-class xe {
+class Fe {
   constructor() {
     this._map = /* @__PURE__ */ new Map();
   }
-  set(t, r) {
-    this._map.set(t, r);
+  set(t, n) {
+    this._map.set(t, n);
   }
   get(t) {
     return this._map.get(t);
@@ -462,31 +576,31 @@ class xe {
     return this._map.has(t);
   }
 }
-function Me(e = []) {
-  return async function(r, n, o) {
-    const i = o.schemas[r];
+function qe(e = []) {
+  return async function(n, r, o) {
+    const i = o.schemas[n];
     if (!i)
       throw new Error(
-        `apigen/invoke: no schema found for operation "${r}"`
+        `apigen/invoke: no schema found for operation "${n}"`
       );
-    const s = () => Se(
+    const s = () => Be(
       o.fns,
       o.createClient,
       i,
-      r,
-      n.envelope,
-      n.domainArgs
+      n,
+      r.envelope,
+      r.domainArgs
     );
     return e.reduceRight(
-      (f, c) => () => c(n, f),
+      (f, c) => () => c(r, f),
       s
     )();
   };
 }
-function Kt(e) {
+function Xt(e) {
   return e;
 }
-class Te {
+class Ke {
   constructor() {
     this.handlers = /* @__PURE__ */ new Map();
   }
@@ -495,16 +609,16 @@ class Te {
    * per-request/per-package MUST be removed (via the returned fn, {@link off},
    * or {@link clear}) or they accumulate for the bus's lifetime.
    */
-  on(t, r) {
-    const n = this.handlers.get(t) ?? [];
-    return this.handlers.set(t, [...n, r]), () => this.off(t, r);
+  on(t, n) {
+    const r = this.handlers.get(t) ?? [];
+    return this.handlers.set(t, [...r, n]), () => this.off(t, n);
   }
   /** Remove a previously registered handler (no-op if absent). */
-  off(t, r) {
-    const n = this.handlers.get(t);
-    if (!n)
+  off(t, n) {
+    const r = this.handlers.get(t);
+    if (!r)
       return;
-    const o = n.filter((i) => i !== r);
+    const o = r.filter((i) => i !== n);
     o.length === 0 ? this.handlers.delete(t) : this.handlers.set(t, o);
   }
   /** Remove every handler — call on package/server teardown. */
@@ -512,59 +626,59 @@ class Te {
     this.handlers.clear();
   }
   async emit(t) {
-    for (const [r, n] of this.handlers)
-      if (Pe(r, t))
-        for (const o of n)
+    for (const [n, r] of this.handlers)
+      if (ze(n, t))
+        for (const o of r)
           await o(t);
   }
 }
-function Pe(e, t) {
-  const [r, n, o] = e.split(":");
-  return !(r !== "*" && r !== t.module || n && n !== "*" && n !== t.method || o && o !== "*" && o !== t.lifecycle);
+function ze(e, t) {
+  const [n, r, o] = e.split(":");
+  return !(n !== "*" && n !== t.module || r && r !== "*" && r !== t.method || o && o !== "*" && o !== t.lifecycle);
 }
-function De(e, t) {
-  for (const r of e)
-    if (r.eventMapping)
-      for (const [n, o] of Object.entries(r.eventMapping))
-        t.on(n, o);
+function He(e, t) {
+  for (const n of e)
+    if (n.eventMapping)
+      for (const [r, o] of Object.entries(n.eventMapping))
+        t.on(r, o);
 }
-async function Ue(e, t, r) {
-  let n = { ...t };
+async function We(e, t, n) {
+  let r = { ...t };
   for (const o of e)
     if (o.createContext) {
-      await r.emit({
+      await n.emit({
         module: o.id,
         method: "createContext",
         lifecycle: "start",
-        ctx: n
+        ctx: r
       });
       try {
-        const i = await o.createContext(n);
-        n = { ...n, ...i }, await r.emit({
+        const i = await o.createContext(r);
+        r = { ...r, ...i }, await n.emit({
           module: o.id,
           method: "createContext",
           lifecycle: "complete",
-          ctx: n
+          ctx: r
         });
       } catch (i) {
-        throw await r.emit({
+        throw await n.emit({
           module: o.id,
           method: "createContext",
           lifecycle: "error",
-          ctx: n,
+          ctx: r,
           error: i
         }), i;
       }
     }
-  return n;
+  return r;
 }
-function J(e, t) {
-  const r = /* @__PURE__ */ new Set(), n = [e];
-  for (; n.length > 0; ) {
-    const o = n.pop();
-    if (!o || r.has(o))
+function X(e, t) {
+  const n = /* @__PURE__ */ new Set(), r = [e];
+  for (; r.length > 0; ) {
+    const o = r.pop();
+    if (!o || n.has(o))
       continue;
-    r.add(o);
+    n.add(o);
     const i = o.$ref;
     if (typeof i == "string") {
       if (t) {
@@ -575,52 +689,52 @@ function J(e, t) {
             `[apigen-logical] $ref "${i}" cannot be resolved. Available $defs: ${d}`
           );
         }
-        n.push(p);
+        r.push(p);
       }
       continue;
     }
     const s = o.oneOf;
     if (Array.isArray(s))
       for (const p of s)
-        typeof p == "object" && p !== null && n.push(p);
+        typeof p == "object" && p !== null && r.push(p);
     const a = o.properties;
     if (a)
       for (const p of Object.values(a))
-        n.push(p);
+        r.push(p);
     const f = o.items;
     if (Array.isArray(f))
       for (const p of f)
-        typeof p == "object" && p !== null && n.push(p);
+        typeof p == "object" && p !== null && r.push(p);
     else
-      typeof f == "object" && f !== null && n.push(f);
+      typeof f == "object" && f !== null && r.push(f);
     const c = o.additionalProperties;
-    typeof c == "object" && c !== null && n.push(c);
+    typeof c == "object" && c !== null && r.push(c);
     const u = o.propertyNames;
-    typeof u == "object" && u !== null && n.push(u);
+    typeof u == "object" && u !== null && r.push(u);
   }
 }
-const Y = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
-function Le(e) {
+const Q = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
+function Ve(e) {
   if (typeof e != "object" || e === null)
     return !1;
   const t = e;
   if (t.$ref !== void 0 || t.oneOf || t.anyOf || t.allOf)
     return !1;
-  const { type: r } = t;
-  return typeof r == "string" ? Y.has(r) : Array.isArray(r) ? r.every((n) => Y.has(n) || n === "null") : Array.isArray(t.enum) && t.enum.length > 0 ? t.enum.every((n) => ["string", "number", "boolean"].includes(typeof n)) : !1;
+  const { type: n } = t;
+  return typeof n == "string" ? Q.has(n) : Array.isArray(n) ? n.every((r) => Q.has(r) || r === "null") : Array.isArray(t.enum) && t.enum.length > 0 ? t.enum.every((r) => ["string", "number", "boolean"].includes(typeof r)) : !1;
 }
-function Re(e) {
+function Je(e) {
   if (!e || typeof e != "object")
     return !1;
   const t = e.properties;
   return t === void 0 || typeof t != "object" || t === null ? !1 : Object.values(t).every(
-    Le
+    Ve
   );
 }
-function Be(e) {
-  const t = {}, r = (n) => {
+function Ge(e) {
+  const t = {}, n = (r) => {
     for (const o of ["definitions", "$defs"]) {
-      const i = n[o];
+      const i = r[o];
       if (i)
         for (const [s, a] of Object.entries(i)) {
           const f = s.startsWith("#/") ? s : `#/${o}/${s}`;
@@ -628,42 +742,42 @@ function Be(e) {
         }
     }
   };
-  for (const n of Object.values(e.schemas))
-    r(n.input), r(n.output);
+  for (const r of Object.values(e.schemas))
+    n(r.input), n(r.output);
   if (Object.keys(t).length !== 0)
-    for (const [n, o] of Object.entries(e.schemas))
+    for (const [r, o] of Object.entries(e.schemas))
       try {
-        J(o.input, t), J(o.output, t);
+        X(o.input, t), X(o.output, t);
       } catch (i) {
         throw new Error(
-          `[apigen-core-client] Schema validation failed for function "${n}": ${i.message}`
+          `[apigen-core-client] Schema validation failed for function "${r}": ${i.message}`
         );
       }
 }
-function Fe(e, t) {
-  const r = [
+function Ye(e, t) {
+  const n = [
     'apigen calling convention: all domain parameters go inside a "data" envelope — e.g. { "data": { ... } }' + (t ? "." : " (an empty object for this zero-parameter tool).")
   ];
-  return e.length > 0 && r.push(
-    `Field(s) ${e.map((n) => `"${n}"`).join(", ")} are transport-level envelope metadata, NOT domain data — do not nest them under "data". Over MCP they are read from arguments._meta["x-<pluginId>-<field>"] (default pluginId "adhd"); see @adhd/apigen-engine-naming's envelopeMetaKey/envelopeCliFlag/envelopeEnvVar for the HTTP-header / CLI-flag / env-var equivalents.`
-  ), r.join(" ");
+  return e.length > 0 && n.push(
+    `Field(s) ${e.map((r) => `"${r}"`).join(", ")} are transport-level envelope metadata, NOT domain data — do not nest them under "data". Over MCP they are read from arguments._meta["x-<pluginId>-<field>"] (default pluginId "adhd"); see @adhd/apigen-engine-naming's envelopeMetaKey/envelopeCliFlag/envelopeEnvVar for the HTTP-header / CLI-flag / env-var equivalents.`
+  ), n.join(" ");
 }
-function Ke(e, t, r) {
-  Be(e);
-  const n = {};
+function Ze(e, t, n) {
+  Ge(e);
+  const r = {};
   for (const [o, i] of Object.entries(e.schemas)) {
-    const s = (r == null ? void 0 : r[o]) ?? {}, a = i.input.properties ?? {}, f = i.input.required ?? [], c = {}, u = [], p = {};
+    const s = (n == null ? void 0 : n[o]) ?? {}, a = i.input.properties ?? {}, f = i.input.required ?? [], c = {}, u = [], p = {};
     for (const h of t)
       if (h.envelope && s[h.id] !== !1)
-        for (const [b, he] of Object.entries(h.envelope))
-          c[b] = he, p[b] = h.id, u.includes(b) || u.push(b);
+        for (const [b, ve] of Object.entries(h.envelope))
+          c[b] = ve, p[b] = h.id, u.includes(b) || u.push(b);
     const d = {
       type: "object",
       properties: a,
       additionalProperties: !1,
       ...f.length > 0 ? { required: f } : {}
-    }, m = i.safe === !0 || Re(i.input), l = i.input.definitions, y = i.input.$defs;
-    n[o] = {
+    }, m = i.safe === !0 || Je(i.input), l = i.input.definitions, y = i.input.$defs;
+    r[o] = {
       input: {
         type: "object",
         properties: { ...c, data: d },
@@ -675,7 +789,7 @@ function Ke(e, t, r) {
         // field or the "data" wrapper — no silently-ignored junk params.
         additionalProperties: !1,
         // BUG-APIGEN-020: document the envelope/data calling convention inline.
-        description: Fe(
+        description: Ye(
           Object.keys(c),
           Object.keys(a).length > 0
         ),
@@ -693,15 +807,15 @@ function Ke(e, t, r) {
       ...Object.keys(p).length > 0 ? { "x-apigen-envelope": p } : {}
     };
   }
-  return n;
+  return r;
 }
-const He = {
+const Xe = {
   "decimal.js": "Decimal"
 };
-function qe(e) {
+function Qe(e) {
   return e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-Object.entries(He).map(([e, t]) => ({
+Object.entries(Xe).map(([e, t]) => ({
   // Matches: import("...{modSpec}...").<anyMemberName>  (single or double quotes)
   // The module specifier appears inside an absolute path, so we allow any
   // characters between the quote and the specifier, and between the specifier
@@ -709,96 +823,96 @@ Object.entries(He).map(([e, t]) => ({
   // …) is matched generically (`\w+`) rather than anchored to one spelling —
   // see the doc comment above for why.
   pattern: new RegExp(
-    `import\\(["'][^"']*${qe(e)}[^"']*["']\\)\\.\\w+`,
+    `import\\(["'][^"']*${Qe(e)}[^"']*["']\\)\\.\\w+`,
     "g"
   ),
   key: t
 }));
-class D extends Error {
+class U extends Error {
   constructor(t) {
     super(t), this.name = "ConfigurationError";
   }
 }
-function ze(e) {
+function et(e) {
   for (const t of e)
-    for (const r of Object.keys(t.eventMapping ?? {})) {
-      const [n] = r.split(":");
-      if (n !== "*" && n === t.id)
-        throw new D(
-          `Middleware "${t.id}" subscribes to its own events via "${r}". This would cause infinite recursion.`
+    for (const n of Object.keys(t.eventMapping ?? {})) {
+      const [r] = n.split(":");
+      if (r !== "*" && r === t.id)
+        throw new U(
+          `Middleware "${t.id}" subscribes to its own events via "${n}". This would cause infinite recursion.`
         );
     }
 }
-function Ht(e) {
+function Qt(e) {
   const {
     domainSchemas: t,
-    middlewares: r,
-    overrides: n = {},
+    middlewares: n,
+    overrides: r = {},
     strict: o = !1
   } = e;
-  ze(r);
-  for (const c of Object.keys(n))
+  et(n);
+  for (const c of Object.keys(r))
     if (!(c in t.schemas)) {
       const u = `Override key "${c}" not found in domain schemas.`;
       if (o)
-        throw new D(u);
+        throw new U(u);
       console.warn("[apigen-runtime]", u);
     }
-  const i = new Set(r.map((c) => c.id));
-  for (const [c, u] of Object.entries(n))
+  const i = new Set(n.map((c) => c.id));
+  for (const [c, u] of Object.entries(r))
     for (const p of Object.keys(u ?? {}))
       if (!i.has(p)) {
         const d = `Override key "${c}.${p}" does not match any declared middleware id.`;
         if (o)
-          throw new D(d);
+          throw new U(d);
         console.warn("[apigen-runtime]", d);
       }
-  const s = Ke(
+  const s = Ze(
     t,
-    r,
-    n
-  ), a = new Te();
-  return De(r, a), { schemas: s, createClient: async (c) => Ue(r, c, a), dispose: () => a.clear() };
+    n,
+    r
+  ), a = new Ke();
+  return He(n, a), { schemas: s, createClient: async (c) => We(n, c, a), dispose: () => a.clear() };
 }
-function qt(e = {}) {
-  const t = e.level ?? "info", r = typeof e.destination == "string" && e.destination.length > 0, n = !r && !!process.stderr.isTTY, o = e.format ?? (n ? "pretty" : "json"), i = { level: t };
+function en(e = {}) {
+  const t = e.level ?? "info", n = typeof e.destination == "string" && e.destination.length > 0, r = !n && !!process.stderr.isTTY, o = e.format ?? (r ? "pretty" : "json"), i = { level: t };
   if (o === "pretty")
     return i.transport = {
       target: "pino-pretty",
       options: {
-        colorize: !r,
+        colorize: !n,
         translateTime: "SYS:HH:MM:ss.l",
         ignore: "pid,hostname",
-        ...r ? { destination: e.destination, mkdir: !0 } : { destination: 2 }
+        ...n ? { destination: e.destination, mkdir: !0 } : { destination: 2 }
       }
-    }, N(i);
-  const s = r ? N.destination({ dest: e.destination, mkdir: !0, sync: !0 }) : N.destination(2);
-  return N(i, s);
+    }, j(i);
+  const s = n ? j.destination({ dest: e.destination, mkdir: !0, sync: !0 }) : j.destination(2);
+  return j(i, s);
 }
-function le(e) {
-  return e ? e.type === "array" ? `${le(e.items)}[]` : e.enum ? "enum" : e.$ref ? String(e.$ref).split("/").pop() || "object" : e.anyOf || e.oneOf ? "union" : e.type ?? "object" : "unknown";
+function he(e) {
+  return e ? e.type === "array" ? `${he(e.items)}[]` : e.enum ? "enum" : e.$ref ? String(e.$ref).split("/").pop() || "object" : e.anyOf || e.oneOf ? "union" : e.type ?? "object" : "unknown";
 }
-function Ve(e) {
+function tt(e) {
   var a;
-  const r = (a = ((e == null ? void 0 : e.input) ?? {}).properties) == null ? void 0 : a.data, n = (r == null ? void 0 : r.properties) ?? {}, o = new Set((r == null ? void 0 : r.required) ?? []), i = Object.entries(n).map(([f, c]) => ({
+  const n = (a = ((e == null ? void 0 : e.input) ?? {}).properties) == null ? void 0 : a.data, r = (n == null ? void 0 : n.properties) ?? {}, o = new Set((n == null ? void 0 : n.required) ?? []), i = Object.entries(r).map(([f, c]) => ({
     name: f,
-    type: le(c),
+    type: he(c),
     required: o.has(f)
   })), s = i.map((f) => `${f.name}${f.required ? "" : "?"}: ${f.type}`).join(", ");
   return { params: i, text: s };
 }
-function We(e) {
+function nt(e) {
   let t;
-  return Array.isArray(e) ? t = e : e ? t = [e] : t = [], t.find((r) => r === "number" || r === "integer" || r === "boolean");
+  return Array.isArray(e) ? t = e : e ? t = [e] : t = [], t.find((n) => n === "number" || n === "integer" || n === "boolean");
 }
-function zt(e, t) {
+function tn(e, t) {
   var i, s;
-  const n = ((s = (i = ((t == null ? void 0 : t.input) ?? {}).properties) == null ? void 0 : i.data) == null ? void 0 : s.properties) ?? {}, o = { ...e };
-  for (const [a, f] of Object.entries(n)) {
+  const r = ((s = (i = ((t == null ? void 0 : t.input) ?? {}).properties) == null ? void 0 : i.data) == null ? void 0 : s.properties) ?? {}, o = { ...e };
+  for (const [a, f] of Object.entries(r)) {
     const c = o[a];
     if (typeof c != "string")
       continue;
-    const u = We(f == null ? void 0 : f.type);
+    const u = nt(f == null ? void 0 : f.type);
     if (u === "number" || u === "integer") {
       const p = Number(c);
       !Number.isNaN(p) && c.trim() !== "" && (o[a] = p);
@@ -807,29 +921,29 @@ function zt(e, t) {
   }
   return o;
 }
-const X = /* @__PURE__ */ new Set(["default", "module.exports", "__esModule"]);
-function Vt(e) {
-  const t = {}, r = (n, o) => {
-    for (const [i, s] of Object.entries(n))
+const ee = /* @__PURE__ */ new Set(["default", "module.exports", "__esModule"]);
+function nn(e) {
+  const t = {}, n = (r, o) => {
+    for (const [i, s] of Object.entries(r))
       if (typeof s == "function") {
-        !X.has(i) && !(i in t) && (t[i] = s);
+        !ee.has(i) && !(i in t) && (t[i] = s);
         const a = s.name;
         a && !(a in t) && (t[a] = s);
       } else
-        s && typeof s == "object" && o < 2 && X.has(i) && r(s, o + 1);
+        s && typeof s == "object" && o < 2 && ee.has(i) && n(s, o + 1);
   };
-  return r(e, 0), t;
+  return n(e, 0), t;
 }
-const Ge = [
+const rt = [
   "invalid_argument",
   "unauthenticated",
   "permission_denied",
   "not_found",
   "internal"
 ];
-class A extends Error {
-  constructor(t, r, n) {
-    super(r), this.name = "ApiError", this.code = t, this.details = n, Object.setPrototypeOf(this, new.target.prototype);
+class E extends Error {
+  constructor(t, n, r) {
+    super(n), this.name = "ApiError", this.code = t, this.details = r, Object.setPrototypeOf(this, new.target.prototype);
   }
   /** Serialise to a plain object suitable for JSON transport. */
   toJSON() {
@@ -840,81 +954,85 @@ class A extends Error {
     return this.details !== void 0 && (t.details = this.details), t;
   }
 }
-function de(e) {
-  return typeof e == "object" && e !== null && e.name === "ApiError" && Ge.includes(e.code) && typeof e.toJSON == "function";
+function ge(e) {
+  return typeof e == "object" && e !== null && e.name === "ApiError" && rt.includes(e.code) && typeof e.toJSON == "function";
 }
-function Q(e, t, r = 0) {
-  return e === "before-first-chunk" ? { phase: e, error: t } : { phase: e, error: t, chunksDelivered: r };
+function te(e, t, n = 0) {
+  return e === "before-first-chunk" ? { phase: e, error: t } : { phase: e, error: t, chunksDelivered: n };
 }
-const j = new ge({ allErrors: !0 });
-we(j);
+const O = new $e({ allErrors: !0 });
+Ae(O);
 for (const e of [
   L,
-  R,
+  B,
   S,
-  x,
+  M,
   "discriminator"
 ])
-  j.addKeyword({ keyword: e, valid: !0 });
-j.addFormat("decimal", /^[+-]?(?:\d+(?:\.\d+)?|\.\d+)$/);
-function ye(e) {
+  O.addKeyword({ keyword: e, valid: !0 });
+O.addFormat("decimal", /^[+-]?(?:\d+(?:\.\d+)?|\.\d+)$/);
+function ot(e) {
   return e.map(
     (t) => `${t.instancePath || "(root)"} ${t.message ?? "failed schema check"}`
   ).join("; ");
 }
-const Wt = async (e, t) => {
-  const r = e.ctx.get(Je);
-  if (r === void 0)
+function we(e, t) {
+  const n = de(t), r = [`Validation failed: ${ot(e)}`];
+  return n && r.push(n), r.join(" — ");
+}
+const rn = async (e, t) => {
+  const n = e.ctx.get(it);
+  if (n === void 0)
     return t();
-  const n = e.operation.id, o = r[n];
+  const r = e.operation.id, o = n[r];
   if (o === void 0)
     return t();
   const i = {
     data: e.domainArgs,
     ...e.envelope
-  }, s = j.compile(o.input);
+  }, s = O.compile(o.input);
   if (!s(i)) {
     const f = s.errors ?? [];
-    throw new A(
+    throw new E(
       "invalid_argument",
-      `Validation failed: ${ye(f)}`,
+      we(f, o.input),
       f
     );
   }
   return t();
-}, Je = Symbol("ValidateSchemasToken");
-function Ye(e) {
-  return async function(r, n) {
-    const o = r.operation.id, i = e[o];
+}, it = Symbol("ValidateSchemasToken");
+function st(e) {
+  return async function(n, r) {
+    const o = n.operation.id, i = e[o];
     if (i === void 0)
-      return n();
+      return r();
     const s = {
-      data: r.domainArgs,
-      ...r.envelope
-    }, a = j.compile(i.input);
+      data: n.domainArgs,
+      ...n.envelope
+    }, a = O.compile(i.input);
     if (!a(s)) {
       const c = a.errors ?? [];
-      throw new A(
+      throw new E(
         "invalid_argument",
-        `Validation failed: ${ye(c)}`,
+        we(c, i.input),
         c
       );
     }
-    return n();
+    return r();
   };
 }
-function Xe() {
+function at() {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (e) => {
     const t = Math.random() * 16 | 0;
     return (e === "x" ? t : t & 3 | 8).toString(16);
   });
 }
-class Gt {
+class on {
   constructor(t = {}) {
-    var n, o;
+    var r, o;
     this._store = /* @__PURE__ */ new Map(), this._sweeper = null, this._defaultTtlMs = t.defaultTtlMs;
-    let r = null;
-    t.sweepIntervalMs === 0 ? r = null : t.sweepIntervalMs !== void 0 ? r = t.sweepIntervalMs : this._defaultTtlMs !== void 0 ? r = Math.max(1e3, Math.floor(this._defaultTtlMs / 4)) : r = null, r !== null && r > 0 && (this._sweeper = setInterval(() => this._sweep(), r), (o = (n = this._sweeper).unref) == null || o.call(n));
+    let n = null;
+    t.sweepIntervalMs === 0 ? n = null : t.sweepIntervalMs !== void 0 ? n = t.sweepIntervalMs : this._defaultTtlMs !== void 0 ? n = Math.max(1e3, Math.floor(this._defaultTtlMs / 4)) : n = null, n !== null && n > 0 && (this._sweeper = setInterval(() => this._sweep(), n), (o = (r = this._sweeper).unref) == null || o.call(r));
   }
   // ---------------------------------------------------------------------------
   // create — construct + register
@@ -927,8 +1045,8 @@ class Gt {
    * @param ttlMs - Per-entry TTL override.  Falls back to `defaultTtlMs`.
    * @returns `{ instanceId }` — pass this to `dispatch()` / `get()`.
    */
-  create(t, r = [], n) {
-    const o = new t(...r), i = Xe(), s = n ?? this._defaultTtlMs, a = s !== void 0 ? Date.now() + s : null;
+  create(t, n = [], r) {
+    const o = new t(...n), i = at(), s = r ?? this._defaultTtlMs, a = s !== void 0 ? Date.now() + s : null;
     return this._store.set(i, { instance: o, expiresAt: a }), { instanceId: i };
   }
   // ---------------------------------------------------------------------------
@@ -940,16 +1058,16 @@ class Gt {
    * @throws When `instanceId` is unknown or the entry has expired.
    */
   get(t) {
-    const r = this._store.get(t);
-    if (!r)
+    const n = this._store.get(t);
+    if (!n)
       throw new Error(
         `[instance-registry] Unknown instanceId: "${t}"`
       );
-    if (r.expiresAt !== null && Date.now() > r.expiresAt)
-      throw this._evict(t, r), new Error(
+    if (n.expiresAt !== null && Date.now() > n.expiresAt)
+      throw this._evict(t, n), new Error(
         `[instance-registry] Instance "${t}" has expired`
       );
-    return r.instance;
+    return n.instance;
   }
   // ---------------------------------------------------------------------------
   // dispatch — call a method on a live instance
@@ -960,13 +1078,13 @@ class Gt {
    * @throws When `instanceId` is unknown/expired, or `method` is not a function
    *   on the instance.
    */
-  async dispatch(t, r, n = []) {
-    const o = this.get(t), i = o[r];
+  async dispatch(t, n, r = []) {
+    const o = this.get(t), i = o[n];
     if (typeof i != "function")
       throw new Error(
-        `[instance-registry] Method "${r}" not found on instance "${t}"`
+        `[instance-registry] Method "${n}" not found on instance "${t}"`
       );
-    return i.call(o, ...n);
+    return i.call(o, ...r);
   }
   // ---------------------------------------------------------------------------
   // dispose — explicit teardown
@@ -976,8 +1094,8 @@ class Gt {
    * instance exposes one (opt-in lifecycle hook).
    */
   async dispose(t) {
-    const r = this._store.get(t);
-    r && (this._store.delete(t), await k(r.instance));
+    const n = this._store.get(t);
+    n && (this._store.delete(t), await I(n.instance));
   }
   // ---------------------------------------------------------------------------
   // disposeAll — full teardown
@@ -989,7 +1107,7 @@ class Gt {
   async disposeAll() {
     this._sweeper !== null && (clearInterval(this._sweeper), this._sweeper = null);
     const t = [...this._store.entries()];
-    this._store.clear(), await Promise.all(t.map(([, r]) => k(r.instance)));
+    this._store.clear(), await Promise.all(t.map(([, n]) => I(n.instance)));
   }
   // ---------------------------------------------------------------------------
   // size — diagnostic helper
@@ -1003,27 +1121,27 @@ class Gt {
   // ---------------------------------------------------------------------------
   _sweep() {
     const t = Date.now();
-    for (const [r, n] of this._store)
-      n.expiresAt !== null && t > n.expiresAt && this._evict(r, n);
+    for (const [n, r] of this._store)
+      r.expiresAt !== null && t > r.expiresAt && this._evict(n, r);
   }
-  _evict(t, r) {
-    this._store.delete(t), k(r.instance);
+  _evict(t, n) {
+    this._store.delete(t), I(n.instance);
   }
 }
-async function k(e) {
+async function I(e) {
   if (e !== null && typeof e == "object" && "dispose" in e) {
     const t = e.dispose;
     typeof t == "function" && await t.call(e);
   }
 }
-function Jt(e) {
-  const { produce: t, signal: r } = e, n = r ?? new AbortController().signal;
+function sn(e) {
+  const { produce: t, signal: n } = e, r = n ?? new AbortController().signal;
   return {
     [Symbol.asyncIterator]() {
-      const o = t(n);
+      const o = t(r);
       return {
         async next() {
-          return n.aborted ? (await o.return(void 0), { done: !0, value: void 0 }) : o.next();
+          return r.aborted ? (await o.return(void 0), { done: !0, value: void 0 }) : o.next();
         },
         async return(i) {
           return await o.return(i), { done: !0, value: void 0 };
@@ -1035,96 +1153,96 @@ function Jt(e) {
     }
   };
 }
-async function Yt(e) {
+async function an(e) {
   const t = [];
-  for await (const r of e)
-    t.push(r);
+  for await (const n of e)
+    t.push(n);
   return t;
 }
-async function Qe(e) {
+async function ct(e) {
   const t = [];
   try {
-    for await (const r of e)
-      t.push(r);
+    for await (const n of e)
+      t.push(n);
     return { ok: !0, chunks: t };
-  } catch (r) {
-    const n = de(r) ? r : new A(
+  } catch (n) {
+    const r = ge(n) ? n : new E(
       "internal",
-      r instanceof Error ? r.message : String(r)
+      n instanceof Error ? n.message : String(n)
     );
     return t.length === 0 ? {
       ok: !1,
-      carrier: Q("before-first-chunk", n)
+      carrier: te("before-first-chunk", r)
     } : {
       ok: !1,
-      carrier: Q("after-first-chunk", n, t.length)
+      carrier: te("after-first-chunk", r, t.length)
     };
   }
 }
-function Ze(e) {
+function ut(e) {
   return e !== null && typeof e == "object" && Symbol.asyncIterator in e;
 }
 class g extends Error {
-  constructor(t, r) {
-    super(r), this.name = "UnionCodecError", this.code = t;
+  constructor(t, n) {
+    super(n), this.name = "UnionCodecError", this.code = t;
   }
 }
-function I(e) {
+function C(e) {
   const t = e.discriminator;
   if (t === null || typeof t != "object" || Array.isArray(t))
     return;
-  const r = t;
-  if (typeof r.propertyName != "string")
+  const n = t;
+  if (typeof n.propertyName != "string")
     return;
-  const n = r.mapping;
-  if (!(n === null || typeof n != "object" || Array.isArray(n)))
+  const r = n.mapping;
+  if (!(r === null || typeof r != "object" || Array.isArray(r)))
     return {
-      propertyName: r.propertyName,
-      mapping: n
+      propertyName: n.propertyName,
+      mapping: r
     };
 }
-function me(e, t) {
-  const r = e[R];
-  if (typeof r == "string") {
-    const n = t.registry.get(r);
-    if (n)
-      return n;
+function be(e, t) {
+  const n = e[B];
+  if (typeof n == "string") {
+    const r = t.registry.get(n);
+    if (r)
+      return r;
   }
   return t.registry.resolve(e);
 }
-function et(e, t, r) {
-  const n = me(t, r);
-  return n ? n.encode(e, t, r) : e;
+function ft(e, t, n) {
+  const r = be(t, n);
+  return r ? r.encode(e, t, n) : e;
 }
-function tt(e, t, r) {
-  const n = me(t, r);
-  return n ? n.decode(e, t, r) : e;
+function pt(e, t, n) {
+  const r = be(t, n);
+  return r ? r.decode(e, t, n) : e;
 }
-function rt(e) {
-  const { id: t, schema: r } = e;
+function lt(e) {
+  const { id: t, schema: n } = e;
   return {
     id: t,
     kind: "union",
-    schema: r,
+    schema: n,
     /**
      * Structural ownership test: the node carries both `oneOf` (non-empty array)
      * and `discriminator.propertyName`. The `x-apigen-logical:"union"` hint
      * accelerates the match but is advisory — the structure is authoritative.
      */
-    matches(n) {
-      if (n[L] === "union")
+    matches(r) {
+      if (r[L] === "union")
         return !0;
-      const o = n.oneOf;
-      return !Array.isArray(o) || o.length === 0 ? !1 : I(n) !== void 0;
+      const o = r.oneOf;
+      return !Array.isArray(o) || o.length === 0 ? !1 : C(r) !== void 0;
     },
-    encode(n, o, i) {
-      const s = I(o);
+    encode(r, o, i) {
+      const s = C(o);
       if (!s)
         throw new g(
           "E_UNION_NO_DISCRIMINATOR",
           `[${t}] schema node at "${i.path}" has no discriminator.propertyName; cannot dispatch union branch.`
         );
-      const { propertyName: a, mapping: f } = s, c = n[a];
+      const { propertyName: a, mapping: f } = s, c = r[a];
       if (c == null)
         throw new g(
           "E_UNION_NO_DISCRIMINATOR",
@@ -1137,20 +1255,20 @@ function rt(e) {
           `[${t}] discriminator tag "${u}" at "${i.path}" is not in the mapping (known: ${Object.keys(f).join(", ")}).`
         );
       const d = i.resolve(p);
-      return et(n, d, {
+      return ft(r, d, {
         ...i,
         path: `${i.path}[${u}]`
       });
     },
-    decode(n, o, i) {
-      if (n === null || typeof n != "object" || Array.isArray(n)) {
+    decode(r, o, i) {
+      if (r === null || typeof r != "object" || Array.isArray(r)) {
         let l;
-        throw n === null ? l = "null" : Array.isArray(n) ? l = "array" : l = typeof n, new g(
+        throw r === null ? l = "null" : Array.isArray(r) ? l = "array" : l = typeof r, new g(
           "E_UNION_INVALID_WIRE",
           `[${t}] expected a JSON object on the wire at "${i.path}", got ${l}.`
         );
       }
-      const s = n, a = I(o);
+      const s = r, a = C(o);
       if (!a)
         throw new g(
           "E_UNION_NO_DISCRIMINATOR",
@@ -1169,49 +1287,49 @@ function rt(e) {
           `[${t}] discriminator tag "${p}" on the wire at "${i.path}" is not in the mapping (known: ${Object.keys(c).join(", ")}).`
         );
       const m = i.resolve(d);
-      return tt(n, m, {
+      return pt(r, m, {
         ...i,
         path: `${i.path}[${p}]`
       });
     }
   };
 }
-const nt = "x-apigen-instances";
-class O extends Error {
-  constructor(t, r) {
-    super(r), this.name = "NominalCodecError", this.code = t;
+const dt = "x-apigen-instances";
+class N extends Error {
+  constructor(t, n) {
+    super(n), this.name = "NominalCodecError", this.code = t;
   }
 }
-function Z(e) {
+function ne(e) {
   const t = e.properties;
   return t && typeof t == "object" && !Array.isArray(t) ? t : {};
 }
-function ot(e) {
+function yt(e) {
   const t = e.required;
-  return Array.isArray(t) ? t.filter((r) => typeof r == "string") : [];
+  return Array.isArray(t) ? t.filter((n) => typeof n == "string") : [];
 }
-function ee(e, t, r) {
+function re(e, t, n) {
   if (t) {
-    const n = r.registry.resolve(t);
-    if (n)
-      return n.encode(e, t, r);
+    const r = n.registry.resolve(t);
+    if (r)
+      return r.encode(e, t, n);
   }
   return e;
 }
-function it(e, t, r) {
+function mt(e, t, n) {
   if (t) {
-    const n = r.registry.resolve(t);
-    if (n)
-      return n.decode(e, t, r);
+    const r = n.registry.resolve(t);
+    if (r)
+      return r.decode(e, t, n);
   }
   return e;
 }
-function st(e) {
-  const { id: t, schema: r, ctor: n } = e;
+function ht(e) {
+  const { id: t, schema: n, ctor: r } = e;
   return {
     id: t,
     kind: "nominal",
-    schema: r,
+    schema: n,
     /**
      * Structural ownership test: the node advertises `x-apigen-logical:'nominal'`
      * or carries an `x-apigen-codec` matching this codec's id. Per
@@ -1220,14 +1338,14 @@ function st(e) {
      * handled by the transcoder walk, not by this cheap test.
      */
     matches(o) {
-      return o[L] === "nominal" ? !0 : o[R] === t;
+      return o[L] === "nominal" ? !0 : o[B] === t;
     },
     encode(o, i, s) {
       if (o === null || typeof o != "object")
         return o;
       if (s.seen.has(o)) {
         if (s.mode === "strict")
-          throw new O(
+          throw new N(
             "E_NOMINAL_CYCLE",
             `[${t}] cycle detected at "${s.path}": a nominal instance references itself. Strict mode rejects cycles (DESIGN §8.3); break the cycle or use 'lossy' mode.`
           );
@@ -1235,7 +1353,7 @@ function st(e) {
       }
       s.seen.add(o);
       try {
-        const a = Z(i), f = typeof i[x] == "string" ? i[x] : "toJSON", c = o[f];
+        const a = ne(i), f = typeof i[M] == "string" ? i[M] : "toJSON", c = o[f];
         if (typeof c == "function") {
           const l = c.call(o);
           if (l !== null && typeof l == "object" && !Array.isArray(l)) {
@@ -1243,7 +1361,7 @@ function st(e) {
             for (const [h, b] of Object.entries(
               l
             ))
-              y[h] = ee(b, a[h], {
+              y[h] = re(b, a[h], {
                 ...s,
                 path: `${s.path}/${h}`
               });
@@ -1254,7 +1372,7 @@ function st(e) {
         const u = {}, p = Object.keys(a), d = o, m = p.length > 0 ? p : Object.keys(d);
         for (const l of m) {
           const y = d[l];
-          y !== void 0 && (u[l] = ee(y, a[l], {
+          y !== void 0 && (u[l] = re(y, a[l], {
             ...s,
             path: `${s.path}/${l}`
           }));
@@ -1267,93 +1385,93 @@ function st(e) {
     decode(o, i, s) {
       if (o === null || typeof o != "object" || Array.isArray(o)) {
         let u;
-        throw o === null ? u = "null" : Array.isArray(o) ? u = "array" : u = typeof o, new O(
+        throw o === null ? u = "null" : Array.isArray(o) ? u = "array" : u = typeof o, new N(
           "E_NOMINAL_INVALID_WIRE",
           `[${t}] expected a JSON object on the wire at "${s.path}", got ${u}.`
         );
       }
       const a = o;
-      for (const u of ot(i))
+      for (const u of yt(i))
         if (!(u in a))
-          throw new O(
+          throw new N(
             "E_NOMINAL_INVALID_WIRE",
             `[${t}] required field "${u}" missing on the wire at "${s.path}".`
           );
-      if (i[nt] === !1)
-        throw new O(
+      if (i[dt] === !1)
+        throw new N(
           "E_NOMINAL_NONRECONSTRUCTABLE",
           `[${t}] is encode-only: the extractor marked it non-reconstructable (x-apigen-instances:false). It cannot be decoded back to a live instance.`
         );
-      const f = Z(i), c = {};
+      const f = ne(i), c = {};
       for (const [u, p] of Object.entries(a))
-        c[u] = it(p, f[u], {
+        c[u] = mt(p, f[u], {
           ...s,
           path: `${s.path}/${u}`
         });
-      if (n) {
-        const u = typeof i[S] == "string" ? i[S] : "fromJSON", p = n[u];
+      if (r) {
+        const u = typeof i[S] == "string" ? i[S] : "fromJSON", p = r[u];
         if (typeof p == "function")
           return p.call(
-            n,
+            r,
             c
           );
-        const d = n;
+        const d = r;
         return new d(c);
       }
       return c;
     }
   };
 }
-const at = [
-  B,
+const gt = [
   F,
+  q,
   K,
+  z,
   H,
-  q,
-  z
-], ct = {
+  W
+], wt = {
   type: "object",
   "x-apigen-logical": "nominal",
   "x-apigen-codec": "ts.NominalSentinel"
-}, te = st({
+}, oe = ht({
   id: "ts.NominalSentinel",
-  schema: ct
-}), ut = {
+  schema: wt
+}), bt = {
   oneOf: [],
   discriminator: { propertyName: "kind", mapping: {} },
   "x-apigen-logical": "union",
   "x-apigen-codec": "ts.UnionSentinel"
-}, re = rt({
+}, ie = lt({
   id: "ts.UnionSentinel",
-  schema: ut
+  schema: bt
 });
-function ft() {
+function vt() {
   const e = [
     // 6 well-known scalars
-    ...at.map((t) => [
+    ...gt.map((t) => [
       t.id,
       t
     ]),
     // nominal kind sentinel
-    [te.id, te],
+    [oe.id, oe],
     // union kind sentinel
-    [re.id, re]
+    [ie.id, ie]
   ];
   return Object.freeze(new Map(e));
 }
-const Xt = Object.freeze({
+const cn = Object.freeze({
   host: "ts",
-  logicalTypeVersion: ve,
-  codecs: ft()
+  logicalTypeVersion: je,
+  codecs: vt()
 });
-function Qt(e, t, r) {
-  var i;
-  const n = typeof ((i = t == null ? void 0 : t.input) == null ? void 0 : i.description) == "string" ? t.input.description : void 0, o = [r, n].filter(
-    (s) => typeof s == "string" && s.length > 0
+function un(e, t, n) {
+  var s;
+  const r = typeof ((s = t == null ? void 0 : t.input) == null ? void 0 : s.description) == "string" ? t.input.description : void 0, o = de(t == null ? void 0 : t.input), i = [n, r, o].filter(
+    (a) => typeof a == "string" && a.length > 0
   );
-  return o.length > 0 ? o.join(" — ") : e;
+  return i.length > 0 ? i.join(" — ") : e;
 }
-function Zt(e) {
+function fn(e) {
   if (!e || typeof e != "object" || Array.isArray(e) || Object.keys(e).length === 0)
     return { outputSchema: void 0, wrapped: !1 };
   const t = e;
@@ -1366,72 +1484,72 @@ function Zt(e) {
     wrapped: !0
   };
 }
-function er(e, t) {
+function pn(e, t) {
   return e ? { result: t } : t && typeof t == "object" && !Array.isArray(t) ? t : void 0;
 }
-const pt = 4, lt = 32;
-function U(e) {
-  return de(e) ? e : e instanceof Error ? new A("internal", e.message) : e;
+const $t = 4, At = 32;
+function R(e) {
+  return ge(e) ? e : e instanceof Error ? new E("internal", e.message) : e;
 }
-function dt(e, t) {
+function Ot(e, t) {
   if (e === "serial" || e === "chained")
     return 1;
-  const r = t ?? pt;
-  return !Number.isFinite(r) || r < 1 ? 1 : Math.min(Math.floor(r), lt);
+  const n = t ?? $t;
+  return !Number.isFinite(n) || n < 1 ? 1 : Math.min(Math.floor(n), At);
 }
-function yt() {
+function jt() {
 }
-function mt(e, t) {
+function Nt(e, t) {
   var i;
   if (!e && !t)
-    return { signal: void 0, dispose: yt };
-  const r = new AbortController(), n = () => {
-    r.abort(e == null ? void 0 : e.reason);
+    return { signal: void 0, dispose: jt };
+  const n = new AbortController(), r = () => {
+    n.abort(e == null ? void 0 : e.reason);
   };
-  e && (e.aborted ? r.abort(e.reason) : e.addEventListener("abort", n, { once: !0 }));
+  e && (e.aborted ? n.abort(e.reason) : e.addEventListener("abort", r, { once: !0 }));
   let o;
-  return t !== void 0 && !r.signal.aborted && (o = setTimeout(() => {
-    r.abort(
+  return t !== void 0 && !n.signal.aborted && (o = setTimeout(() => {
+    n.abort(
       new DOMException(
         `apigen/invokeBatch: item timed out after ${t}ms`,
         "TimeoutError"
       )
     );
   }, t), (i = o.unref) == null || i.call(o)), {
-    signal: r.signal,
+    signal: n.signal,
     dispose() {
-      e && e.removeEventListener("abort", n), o && clearTimeout(o);
+      e && e.removeEventListener("abort", r), o && clearTimeout(o);
     }
   };
 }
-async function ne(e, t, r, n, o, i) {
-  const s = mt(n.signal, i);
+async function se(e, t, n, r, o, i) {
+  const s = Nt(r.signal, i);
   try {
-    const a = s.signal ? { ...n, signal: s.signal } : n, f = await e(t, a, o);
-    if (Ze(f)) {
-      const c = await Qe(f);
+    const a = s.signal ? { ...r, signal: s.signal } : r, f = await e(t, a, o);
+    if (ut(f)) {
+      const c = await ct(f);
       if (c.ok)
-        return { index: r, status: "fulfilled", chunks: c.chunks };
+        return { index: n, status: "fulfilled", chunks: c.chunks };
       const u = c.carrier;
       return {
-        index: r,
+        index: n,
         status: "rejected",
-        reason: U(u.error),
+        reason: R(u.error),
         ...u.phase === "after-first-chunk" ? { chunksDelivered: u.chunksDelivered } : {}
       };
     }
-    return { index: r, status: "fulfilled", value: f };
+    return { index: n, status: "fulfilled", value: f };
   } catch (a) {
-    return { index: r, status: "rejected", reason: U(a) };
+    return { index: n, status: "rejected", reason: R(a) };
   } finally {
     s.dispose();
   }
 }
-async function tr(e, t, r, n, o = {}) {
-  const i = o.mode ?? "parallel", s = o.onItemError ?? "continue", a = dt(i, o.concurrency), f = new Array(r.length), c = (l) => ({
+async function ln(e, t, n, r, o = {}) {
+  const i = o.mode ?? "parallel", s = o.onItemError ?? "continue", a = Ot(i, o.concurrency), f = new Array(n.length), c = (l) => ({
     index: l,
     status: "rejected",
-    reason: U(
+    reason: R(
       new Error(
         "apigen/invokeBatch: not attempted — an earlier item failed and " + (i === "chained" ? 'mode is "chained"' : 'onItemError is "abort"')
       )
@@ -1439,17 +1557,17 @@ async function tr(e, t, r, n, o = {}) {
   });
   if (i === "serial" || i === "chained") {
     let l = !1;
-    for (let y = 0; y < r.length; y++) {
+    for (let y = 0; y < n.length; y++) {
       if (l) {
         f[y] = c(y);
         continue;
       }
-      const h = await ne(
+      const h = await se(
         e,
         t,
         y,
-        r[y],
-        n,
+        n[y],
+        r,
         o.itemTimeoutMs
       );
       f[y] = h, h.status === "rejected" && (i === "chained" || s === "abort") && (l = !0);
@@ -1457,21 +1575,21 @@ async function tr(e, t, r, n, o = {}) {
     return f;
   }
   let u = 0, p = !1;
-  const d = Math.max(1, Math.min(a, r.length)), m = Array.from({ length: d }, async () => {
+  const d = Math.max(1, Math.min(a, n.length)), m = Array.from({ length: d }, async () => {
     for (; ; ) {
       const l = u++;
-      if (l >= r.length)
+      if (l >= n.length)
         return;
       if (p) {
         f[l] = c(l);
         continue;
       }
-      const y = await ne(
+      const y = await se(
         e,
         t,
         l,
-        r[l],
-        n,
+        n[l],
+        r,
         o.itemTimeoutMs
       );
       f[l] = y, y.status === "rejected" && s === "abort" && (p = !0);
@@ -1479,31 +1597,31 @@ async function tr(e, t, r, n, o = {}) {
   });
   return await Promise.all(m), f;
 }
-const oe = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
-function ht(e) {
+const ae = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
+function Et(e) {
   if (typeof e != "object" || e === null)
     return !1;
   const t = e;
   if (t.$ref !== void 0 || t.oneOf || t.anyOf || t.allOf)
     return !1;
-  const { type: r } = t;
-  return typeof r == "string" ? oe.has(r) : Array.isArray(r) ? r.every((n) => oe.has(n) || n === "null") : Array.isArray(t.enum) && t.enum.length > 0 ? t.enum.every((n) => ["string", "number", "boolean"].includes(typeof n)) : !1;
+  const { type: n } = t;
+  return typeof n == "string" ? ae.has(n) : Array.isArray(n) ? n.every((r) => ae.has(r) || r === "null") : Array.isArray(t.enum) && t.enum.length > 0 ? t.enum.every((r) => ["string", "number", "boolean"].includes(typeof r)) : !1;
 }
-function gt(e) {
+function _t(e) {
   if (!e || typeof e != "object")
     return !1;
   const t = e.properties;
   return t === void 0 || typeof t != "object" || t === null ? !1 : Object.values(t).every(
-    ht
+    Et
   );
 }
-const wt = {
+const kt = {
   "decimal.js": "Decimal"
 };
-function bt(e) {
+function It(e) {
   return e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-Object.entries(wt).map(([e, t]) => ({
+Object.entries(kt).map(([e, t]) => ({
   // Matches: import("...{modSpec}...").<anyMemberName>  (single or double quotes)
   // The module specifier appears inside an absolute path, so we allow any
   // characters between the quote and the specifier, and between the specifier
@@ -1511,23 +1629,23 @@ Object.entries(wt).map(([e, t]) => ({
   // …) is matched generically (`\w+`) rather than anchored to one spelling —
   // see the doc comment above for why.
   pattern: new RegExp(
-    `import\\(["'][^"']*${bt(e)}[^"']*["']\\)\\.\\w+`,
+    `import\\(["'][^"']*${It(e)}[^"']*["']\\)\\.\\w+`,
     "g"
   ),
   key: t
 }));
-function ie(e) {
+function ce(e) {
   return e.words.join("-");
 }
-function se(e) {
-  return e.words.map(Ot).join("");
+function ue(e) {
+  return e.words.map(Tt).join("");
 }
-function ae(e) {
+function fe(e) {
   return e.words.join("_");
 }
-function vt(e, t = {}) {
-  var r, n;
-  const o = [e.namespace, ...e.path], i = e.safe || gt(e.input) ? "GET" : "POST", s = ((n = (r = t.http) == null ? void 0 : r.verb) == null ? void 0 : n[e.id]) ?? i, a = "/" + o.map((m) => ie(m)).join("/"), f = o.map((m) => ae(m)).join("_"), c = o.map((m) => ae(m)).slice(0, -1).join("."), u = se(o[o.length - 2] ?? o[0]), p = se(o[o.length - 1]), d = o.map((m) => ie(m));
+function Ct(e, t = {}) {
+  var n, r;
+  const o = [e.namespace, ...e.path], i = e.safe || _t(e.input) ? "GET" : "POST", s = ((r = (n = t.http) == null ? void 0 : n.verb) == null ? void 0 : r[e.id]) ?? i, a = "/" + o.map((m) => ce(m)).join("/"), f = o.map((m) => fe(m)).join("_"), c = o.map((m) => fe(m)).slice(0, -1).join("."), u = ue(o[o.length - 2] ?? o[0]), p = ue(o[o.length - 1]), d = o.map((m) => ce(m));
   return {
     http: { verb: s, route: a },
     mcp: { name: f },
@@ -1535,92 +1653,92 @@ function vt(e, t = {}) {
     cli: { path: d }
   };
 }
-function $t(e, t) {
+function xt(e, t) {
   return `x-${e}-${t}`;
 }
-function jt(e, t) {
+function St(e, t) {
   return `--${e}-${t}`;
 }
-function Nt(e, t) {
-  const r = (n) => n.toUpperCase().replace(/-/g, "_");
-  return e === "adhd" ? `APIGEN_${r(t)}` : `APIGEN_${r(e)}_${r(t)}`;
+function Mt(e, t) {
+  const n = (r) => r.toUpperCase().replace(/-/g, "_");
+  return e === "adhd" ? `APIGEN_${n(t)}` : `APIGEN_${n(e)}_${n(t)}`;
 }
-function Ot(e) {
+function Tt(e) {
   return e.length === 0 ? e : e[0].toUpperCase() + e.slice(1);
 }
 function V(e) {
   return e.anyOf ?? e.oneOf;
 }
-function At(e) {
+function Pt(e) {
   if (!e)
     return !1;
   if (e.type === "array" || e.type === "object")
     return !0;
   const t = V(e);
   if (t) {
-    const r = t.filter((n) => n.type !== "null");
-    return r.length > 0 && r.every((n) => n.type === "array" || n.type === "object");
+    const n = t.filter((r) => r.type !== "null");
+    return n.length > 0 && n.every((r) => r.type === "array" || r.type === "object");
   }
   return !1;
 }
-function _t(e) {
+function Dt(e) {
   if (!e)
     return !1;
   if (e.type === "boolean")
     return !0;
   const t = V(e);
   if (t) {
-    const r = t.filter((n) => n.type !== "null");
-    return r.length > 0 && r.every((n) => n.type === "boolean");
+    const n = t.filter((r) => r.type !== "null");
+    return n.length > 0 && n.every((r) => r.type === "boolean");
   }
   return !1;
 }
-function Et(e) {
+function Ut(e) {
   if (!e)
     return !1;
   if (e.type === "number" || e.type === "integer")
     return !0;
   const t = V(e);
   if (t) {
-    const r = t.filter((n) => n.type !== "null");
-    return r.length > 0 && r.every((n) => n.type === "number" || n.type === "integer");
+    const n = t.filter((r) => r.type !== "null");
+    return n.length > 0 && n.every((r) => r.type === "number" || r.type === "integer");
   }
   return !1;
 }
-function kt(e) {
+function Rt(e) {
   return e.replace(/[A-Z]/g, (t) => "-" + t.toLowerCase());
 }
-function It(e) {
+function Lt(e) {
   var o, i;
-  const t = (i = (o = e.input) == null ? void 0 : o.properties) == null ? void 0 : i.data, r = (t == null ? void 0 : t.properties) ?? {}, n = (t == null ? void 0 : t.required) ?? [];
-  return { props: r, required: n };
+  const t = (i = (o = e.input) == null ? void 0 : o.properties) == null ? void 0 : i.data, n = (t == null ? void 0 : t.properties) ?? {}, r = (t == null ? void 0 : t.required) ?? [];
+  return { props: n, required: r };
 }
-function ce(e) {
+function pe(e) {
   return typeof e.handler == "function";
 }
-function Ct(e) {
+function Bt(e) {
   var o;
-  const t = ((o = e.input) == null ? void 0 : o.properties) ?? {}, r = e["x-apigen-envelope"], n = [];
+  const t = ((o = e.input) == null ? void 0 : o.properties) ?? {}, n = e["x-apigen-envelope"], r = [];
   for (const i of Object.keys(t)) {
     if (i === "data")
       continue;
-    const s = (r == null ? void 0 : r[i]) ?? "adhd", a = $t(s, i);
-    n.push({
+    const s = (n == null ? void 0 : n[i]) ?? "adhd", a = xt(s, i);
+    r.push({
       field: i,
       pluginId: s,
       httpHeader: a,
       mcpMetaKey: a,
-      cliFlag: jt(s, i),
-      envVar: Nt(s, i)
+      cliFlag: St(s, i),
+      envVar: Mt(s, i)
     });
   }
-  return n;
+  return r;
 }
-function St(e, t) {
-  const r = /* @__PURE__ */ new Map(), { props: n } = It(e);
-  for (const [o, i] of Object.entries(n)) {
+function Ft(e, t) {
+  const n = /* @__PURE__ */ new Map(), { props: r } = Lt(e);
+  for (const [o, i] of Object.entries(r)) {
     let s = "string";
-    _t(i) ? s = "boolean" : (At(i) || Et(i)) && (s = "json"), r.set(kt(o), {
+    Dt(i) ? s = "boolean" : (Pt(i) || Ut(i)) && (s = "json"), n.set(Rt(o), {
       camelKey: o,
       kind: "domain",
       valueKind: s
@@ -1628,19 +1746,19 @@ function St(e, t) {
   }
   for (const o of t) {
     const i = o.cliFlag.replace(/^--/, "");
-    r.set(i, {
+    n.set(i, {
       camelKey: o.field,
       kind: "envelope",
       valueKind: "string",
       envVar: o.envVar
     });
   }
-  return r;
+  return n;
 }
-function rr(e) {
-  const { op: t, schema: r, transport: n, projection: o } = e, i = vt(t, o), s = r ? Ct(r) : [], a = r ? St(r, s) : /* @__PURE__ */ new Map(), f = r ? Ve(r).params : void 0, c = {
+function dn(e) {
+  const { op: t, schema: n, transport: r, projection: o } = e, i = Ct(t, o), s = n ? Bt(n) : [], a = n ? Ft(n, s) : /* @__PURE__ */ new Map(), f = n ? tt(n).params : void 0, c = {
     op: t,
-    transport: n,
+    transport: r,
     http: i.http,
     mcp: i.mcp,
     cli: i.cli,
@@ -1649,58 +1767,58 @@ function rr(e) {
     envelope: s,
     cliFlags: a,
     streaming: t.streaming,
-    isMount: ce(t)
+    isMount: pe(t)
   };
-  if (ce(t)) {
+  if (pe(t)) {
     const u = t.handler;
     c.mountHandler = async (p) => u(p);
   }
   return c;
 }
-function nr(e) {
+function yn(e) {
   const t = e.usePlugins;
   return Array.isArray(t) ? t : [];
 }
-function or(e) {
+function mn(e) {
   const t = e.useOptions;
   return t && typeof t == "object" ? t : {};
 }
-function xt(e) {
-  return async function(r, n) {
-    const o = Object.assign(r, { data: r.domainArgs });
-    return await e.layer(o, n);
+function qt(e) {
+  return async function(n, r) {
+    const o = Object.assign(n, { data: n.domainArgs });
+    return await e.layer(o, r);
   };
 }
-function ir(e, t) {
-  var n;
-  const r = [];
+function hn(e, t) {
+  var r;
+  const n = [];
   for (const o of t) {
-    const i = (n = o.capabilities) == null ? void 0 : n.layer;
-    i && r.push(xt(i));
+    const i = (r = o.capabilities) == null ? void 0 : r.layer;
+    i && n.push(qt(i));
   }
-  return r.push(Ye(e)), Me(r);
+  return n.push(st(e)), qe(n);
 }
-function Mt() {
+function Kt() {
   const e = /* @__PURE__ */ new Map();
   return {
     get: (t) => e.get(t),
-    set: (t, r) => {
-      e.set(t, r);
+    set: (t, n) => {
+      e.set(t, n);
     }
   };
 }
-const Tt = {
+const zt = {
   input: {
     type: "object",
     properties: { data: { type: "object", properties: {} } }
   },
   output: {}
 };
-async function sr(e, t, r, n) {
+async function gn(e, t, n, r) {
   const o = {
-    ...r,
+    ...n,
     operation: { id: e.op.id },
-    ctx: new xe()
+    ctx: new Fe()
   };
   if (e.isMount) {
     const i = e.mountHandler;
@@ -1710,58 +1828,58 @@ async function sr(e, t, r, n) {
       );
     const s = {
       operation: e.op,
-      data: r.domainArgs,
-      envelope: r.envelope,
-      ctx: Mt(),
+      data: n.domainArgs,
+      envelope: n.envelope,
+      ctx: Kt(),
       transport: e.transport,
-      signal: r.signal ?? new AbortController().signal
+      signal: n.signal ?? new AbortController().signal
     }, a = {
-      ...n,
+      ...r,
       fns: { [e.op.id]: () => i(s) },
-      schemas: { [e.op.id]: Tt }
+      schemas: { [e.op.id]: zt }
     };
     return t(e.op.id, o, a);
   }
-  return t(e.op.id, o, n);
+  return t(e.op.id, o, r);
 }
 export {
-  pt as BATCH_DEFAULT_CONCURRENCY,
-  lt as BATCH_MAX_CONCURRENCY,
-  Te as EventBus,
-  Gt as InstanceRegistry,
-  xe as LayerContext,
+  $t as BATCH_DEFAULT_CONCURRENCY,
+  At as BATCH_MAX_CONCURRENCY,
+  Ke as EventBus,
+  on as InstanceRegistry,
+  Fe as LayerContext,
   g as UnionCodecError,
-  Je as ValidateSchemasToken,
-  at as WELL_KNOWN_TS_CODECS,
-  xt as adaptCoreLayer,
-  ze as assertNoSelfSubscription,
-  Ue as buildContext,
-  Vt as buildFnTable,
-  Zt as buildMcpOutputSchema,
-  rr as buildOpPlan,
-  Qt as buildToolDescription,
-  zt as coerceQueryParams,
-  Qe as collectWithPhase,
-  Ht as createApiPackage,
-  Me as createInvoker,
-  qt as createLogger,
-  ir as createPackageInvoker,
-  Jt as createStream,
-  rt as createUnionCodec,
-  ke as dataParamNames,
-  Kt as defineMiddleware,
-  Ve as describeParams,
-  Se as dispatch,
-  sr as dispatchForPlan,
-  Yt as drainStream,
-  tr as invokeBatch,
-  Ze as isApiStream,
-  Ye as makeValidateLayer,
-  Ee as needsEnvelopeField,
-  or as readUseOptions,
-  nr as readUsePlugins,
-  Xt as tsHostBinding,
-  Wt as validateLayer,
-  De as wireObservers,
-  er as wrapMcpStructuredContent
+  it as ValidateSchemasToken,
+  gt as WELL_KNOWN_TS_CODECS,
+  qt as adaptCoreLayer,
+  et as assertNoSelfSubscription,
+  We as buildContext,
+  nn as buildFnTable,
+  fn as buildMcpOutputSchema,
+  dn as buildOpPlan,
+  un as buildToolDescription,
+  tn as coerceQueryParams,
+  ct as collectWithPhase,
+  Qt as createApiPackage,
+  qe as createInvoker,
+  en as createLogger,
+  hn as createPackageInvoker,
+  sn as createStream,
+  lt as createUnionCodec,
+  Ue as dataParamNames,
+  Xt as defineMiddleware,
+  tt as describeParams,
+  Be as dispatch,
+  gn as dispatchForPlan,
+  an as drainStream,
+  ln as invokeBatch,
+  ut as isApiStream,
+  st as makeValidateLayer,
+  De as needsEnvelopeField,
+  mn as readUseOptions,
+  yn as readUsePlugins,
+  cn as tsHostBinding,
+  rn as validateLayer,
+  He as wireObservers,
+  pn as wrapMcpStructuredContent
 };