@adhd/apigen-core-client 0.3.0 → 0.3.1

package/index.mjs

@@ -1,25 +1,24 @@
-import { Project as X, SyntaxKind as ae, Scope as V } from "ts-morph";
-import Ee from "node:fs";
-import * as Ce from "node:path";
-import oe from "node:path";
-import { createParser as Re, createFormatter as Le, SchemaGenerator as _e, AnnotatedType as ce, StringType as ue } from "ts-json-schema-generator";
-function le(e) {
+import De from "node:fs";
+import { createRequire as qe } from "node:module";
+import * as Be from "node:path";
+import ce from "node:path";
+function ge(e) {
   return {
     raw: e,
     words: e.split(/(?=[A-Z])|[-_]/).map((t) => t.toLowerCase()).filter(Boolean)
   };
 }
-function Me(e, t, r = {}) {
+function We(e, t, r = {}) {
   const o = e.split("/");
-  if (o.length < 2 || o.some((l) => l.length === 0))
+  if (o.length < 2 || o.some((u) => u.length === 0))
     throw new Error(
       `syntheticOp: id "${e}" must be "<namespace>/<path...>" with non-empty segments`
     );
   const [n, ...i] = o, s = n.replace(/^_+/, ""), a = r.kind ?? "action", c = {
     id: e,
     host: t.host,
-    namespace: le(s),
-    path: i.map(le),
+    namespace: ge(s),
+    path: i.map(ge),
     kind: a,
     async: r.async ?? !1,
     streaming: r.streaming ?? !1,
@@ -31,8 +30,13 @@ function Me(e, t, r = {}) {
   };
   return r.hasCtx !== void 0 && (c.hasCtx = r.hasCtx), r.transports !== void 0 && (c.transports = r.transports), c;
 }
-const ve = Symbol.for("adhd.apigen.extraction-session");
-function ie(e, t) {
+const N = qe(import.meta.url);
+let z;
+function Ne() {
+  return z || (z = N("ts-morph").Project, z);
+}
+const Oe = Symbol.for("adhd.apigen.extraction-session");
+function ue(e, t) {
   const r = [
     ...e.getImportDeclarations().map((o) => o.getModuleSpecifierSourceFile()),
     ...e.getExportDeclarations().map((o) => o.getModuleSpecifierSourceFile())
@@ -47,55 +51,59 @@ function ie(e, t) {
         o.refreshFromFileSystemSync();
       } catch {
       }
-      ie(o, t);
+      ue(o, t);
     }
   }
 }
-function xe(e) {
+function ke(e) {
   try {
-    const t = Ee.statSync(e);
+    const t = De.statSync(e);
     return `${t.mtimeMs}:${t.size}`;
   } catch {
     return "nostat";
   }
 }
-const L = /* @__PURE__ */ new Map(), Y = /* @__PURE__ */ new Map();
-function Ve(e, t, r) {
-  const o = t ?? "", n = L.get(o);
+const M = /* @__PURE__ */ new Map(), ne = /* @__PURE__ */ new Map();
+function Ue(e, t, r) {
+  const o = t ?? "", n = M.get(o);
   let i = r;
   if (n && n.fileVersions.size > 0) {
-    const c = [r], l = [...n.fileVersions.entries()].sort(
-      ([u], [f]) => u.localeCompare(f)
+    const c = [r], u = [...n.fileVersions.entries()].sort(
+      ([l], [f]) => l.localeCompare(f)
     );
-    for (const [u, f] of l)
-      u !== e && c.push(`${u}:${f}`);
+    for (const [l, f] of u)
+      l !== e && c.push(`${l}:${f}`);
     i = c.join("|");
   }
   const s = `${e}\0${t ?? ""}`;
-  let a = Y.get(s);
-  return (!a || a.version !== i) && (a = { version: i, schemas: /* @__PURE__ */ new Map() }, Y.set(s, a)), a.schemas;
-}
-function zt() {
-  L.clear(), Y.clear(), z = void 0;
-}
-let z;
-function Ke() {
-  return z || (z = new X({
-    skipAddingFilesFromTsConfig: !0,
-    compilerOptions: { noLib: !0 }
-  })), z;
+  let a = ne.get(s);
+  return (!a || a.version !== i) && (a = { version: i, schemas: /* @__PURE__ */ new Map() }, ne.set(s, a)), a.schemas;
+}
+function Qt() {
+  M.clear(), ne.clear(), G = void 0;
+}
+let G;
+function Ge() {
+  if (!G) {
+    const e = Ne();
+    G = new e({
+      skipAddingFilesFromTsConfig: !0,
+      compilerOptions: { noLib: !0 }
+    });
+  }
+  return G;
 }
-function Dt(e) {
-  const t = Ke(), r = t.getSourceFile(e), o = r ?? t.addSourceFileAtPath(e);
+function Xt(e) {
+  const t = Ge(), r = t.getSourceFile(e), o = r ?? t.addSourceFileAtPath(e);
   if (r)
     try {
       r.refreshFromFileSystemSync();
     } catch {
     }
   const n = /* @__PURE__ */ new Set([e]);
-  return ie(o, n), [...n].sort();
+  return ue(o, n), [...n].sort();
 }
-function we() {
+function Ee() {
   const e = {
     projectsBuilt: 0,
     generatorsBuilt: 0,
@@ -104,7 +112,7 @@ function we() {
   }, t = /* @__PURE__ */ new Map();
   let r = !1;
   return {
-    [ve]: !0,
+    [Oe]: !0,
     stats: e,
     schemaCache: /* @__PURE__ */ new Map(),
     aliasCache: /* @__PURE__ */ new WeakMap(),
@@ -114,42 +122,46 @@ function we() {
       if (r)
         throw new Error("apigen-core: ExtractionSession used after dispose()");
       const i = n ?? "", s = n ? this.statVersion(n) : "";
-      let a = L.get(i);
-      return a && a.tsconfigVersion !== s && (a = void 0), a || (a = { project: n ? new X({
-        tsConfigFilePath: n,
-        skipAddingFilesFromTsConfig: !0
-      }) : new X({ skipAddingFilesFromTsConfig: !0 }), tsconfigVersion: s, fileVersions: /* @__PURE__ */ new Map() }, L.set(i, a), e.projectsBuilt++), a.project;
+      let a = M.get(i);
+      if (a && a.tsconfigVersion !== s && (a = void 0), !a) {
+        const c = Ne();
+        a = { project: n ? new c({
+          tsConfigFilePath: n,
+          skipAddingFilesFromTsConfig: !0
+        }) : new c({ skipAddingFilesFromTsConfig: !0 }), tsconfigVersion: s, fileVersions: /* @__PURE__ */ new Map() }, M.set(i, a), e.projectsBuilt++;
+      }
+      return a.project;
     },
     sourceFileFor(n, i) {
-      const s = this.projectFor(i), a = L.get(i ?? ""), c = this.statVersion(n);
-      let l = s.getSourceFile(n);
-      if (l === void 0 ? l = s.addSourceFileAtPath(n) : a && a.fileVersions.get(n) !== c && l.refreshFromFileSystemSync(), a == null || a.fileVersions.set(n, c), a) {
-        const u = /* @__PURE__ */ new Set([n]);
-        ie(l, u);
-        for (const f of u)
+      const s = this.projectFor(i), a = M.get(i ?? ""), c = this.statVersion(n);
+      let u = s.getSourceFile(n);
+      if (u === void 0 ? u = s.addSourceFileAtPath(n) : a && a.fileVersions.get(n) !== c && u.refreshFromFileSystemSync(), a == null || a.fileVersions.set(n, c), a) {
+        const l = /* @__PURE__ */ new Set([n]);
+        ue(u, l);
+        for (const f of l)
           f !== n && a.fileVersions.set(f, this.statVersion(f));
       }
-      return l;
+      return u;
     },
     statVersion(n) {
       let i = t.get(n);
-      return i === void 0 && (i = xe(n), t.set(n, i)), i;
+      return i === void 0 && (i = ke(n), t.set(n, i)), i;
     },
     dispose() {
       r = !0, this.schemaCache.clear(), this.generatorCache.clear(), t.clear();
     }
   };
 }
-function je(e) {
+function Ie(e) {
   const t = e;
-  if (t[ve] !== !0)
+  if (t[Oe] !== !0)
     throw new Error(
       "apigen-core: unknown ExtractionSession implementation — create sessions with createExtractionSession()"
     );
   return t;
 }
-const W = "x-apigen-logical";
-function fe(e, t) {
+const Z = "x-apigen-logical";
+function ye(e, t) {
   const r = /* @__PURE__ */ new Set(), o = [e];
   for (; o.length > 0; ) {
     const n = o.pop();
@@ -161,9 +173,9 @@ function fe(e, t) {
       if (t) {
         const f = t[i];
         if (!f) {
-          const p = Object.keys(t).join(", ") || "(none)";
+          const m = Object.keys(t).join(", ") || "(none)";
           throw new Error(
-            `[apigen-logical] $ref "${i}" cannot be resolved. Available $defs: ${p}`
+            `[apigen-logical] $ref "${i}" cannot be resolved. Available $defs: ${m}`
           );
         }
         o.push(f);
@@ -184,31 +196,31 @@ function fe(e, t) {
         typeof f == "object" && f !== null && o.push(f);
     else
       typeof c == "object" && c !== null && o.push(c);
-    const l = n.additionalProperties;
-    typeof l == "object" && l !== null && o.push(l);
-    const u = n.propertyNames;
+    const u = n.additionalProperties;
     typeof u == "object" && u !== null && o.push(u);
+    const l = n.propertyNames;
+    typeof l == "object" && l !== null && o.push(l);
   }
 }
-const pe = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
-function qe(e) {
+const he = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
+function He(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" ? pe.has(r) : Array.isArray(r) ? r.every((o) => pe.has(o) || o === "null") : Array.isArray(t.enum) && t.enum.length > 0 ? t.enum.every((o) => ["string", "number", "boolean"].includes(typeof o)) : !1;
+  return typeof r == "string" ? he.has(r) : Array.isArray(r) ? r.every((o) => he.has(o) || o === "null") : Array.isArray(t.enum) && t.enum.length > 0 ? t.enum.every((o) => ["string", "number", "boolean"].includes(typeof o)) : !1;
 }
-function ze(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(
-    qe
+    He
   );
 }
-function Bt(e) {
+function Yt(e) {
   var r, o;
   const t = [];
   for (const n of e) {
@@ -220,7 +232,7 @@ function Bt(e) {
   }
   return t;
 }
-function De(e) {
+function Ze(e) {
   const t = {}, r = (o) => {
     for (const n of ["definitions", "$defs"]) {
       const i = o[n];
@@ -236,14 +248,14 @@ function De(e) {
   if (Object.keys(t).length !== 0)
     for (const [o, n] of Object.entries(e.schemas))
       try {
-        fe(n.input, t), fe(n.output, t);
+        ye(n.input, t), ye(n.output, t);
       } catch (i) {
         throw new Error(
           `[apigen-core-client] Schema validation failed for function "${o}": ${i.message}`
         );
       }
 }
-function Be(e, t) {
+function Qe(e, t) {
   const r = [
     'apigen calling convention: all domain parameters go inside a "data" envelope — e.g. { "data": { ... } }' + (t ? "." : " (an empty object for this zero-parameter tool).")
   ];
@@ -251,44 +263,44 @@ function Be(e, t) {
     `Field(s) ${e.map((o) => `"${o}"`).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(" ");
 }
-function Wt(e, t, r) {
-  De(e);
+function en(e, t, r) {
+  Ze(e);
   const o = {};
   for (const [n, i] of Object.entries(e.schemas)) {
-    const s = (r == null ? void 0 : r[n]) ?? {}, a = i.input.properties ?? {}, c = i.input.required ?? [], l = {}, u = [], f = {};
-    for (const h of t)
-      if (h.envelope && s[h.id] !== !1)
-        for (const [y, d] of Object.entries(h.envelope))
-          l[y] = d, f[y] = h.id, u.includes(y) || u.push(y);
-    const p = {
+    const s = (r == null ? void 0 : r[n]) ?? {}, a = i.input.properties ?? {}, c = i.input.required ?? [], u = {}, l = [], f = {};
+    for (const g of t)
+      if (g.envelope && s[g.id] !== !1)
+        for (const [x, p] of Object.entries(g.envelope))
+          u[x] = p, f[x] = g.id, l.includes(x) || l.push(x);
+    const m = {
       type: "object",
       properties: a,
       additionalProperties: !1,
       ...c.length > 0 ? { required: c } : {}
-    }, S = i.safe === !0 || ze(i.input), T = i.input.definitions, m = i.input.$defs;
+    }, h = i.safe === !0 || Je(i.input), y = i.input.definitions, d = i.input.$defs;
     o[n] = {
       input: {
         type: "object",
-        properties: { ...l, data: p },
+        properties: { ...u, data: m },
         required: [
-          ...u,
+          ...l,
           ...c.length > 0 ? ["data"] : []
         ],
         // BUG-APIGEN-017: reject any property that isn't a declared envelope
         // field or the "data" wrapper — no silently-ignored junk params.
         additionalProperties: !1,
         // BUG-APIGEN-020: document the envelope/data calling convention inline.
-        description: Be(
-          Object.keys(l),
+        description: Qe(
+          Object.keys(u),
           Object.keys(a).length > 0
         ),
-        ...T ? { definitions: T } : {},
-        ...m ? { $defs: m } : {}
+        ...y ? { definitions: y } : {},
+        ...d ? { $defs: d } : {}
       },
       output: i.output,
       // Carry the ctx-param flag through to dispatch (BUG-APIGEN-001).
       ...i.hasCtx ? { hasCtx: !0 } : {},
-      "x-apigen-safe": S,
+      "x-apigen-safe": h,
       // DEBT-APIGEN-ENVELOPE-CAPABILITY-UNWIRED-001: field → pluginId map,
       // read by `op-plan.ts`'s `computeEnvelopeFields`. Omitted (not an empty
       // object) when no middleware contributed an envelope field, matching
@@ -298,8 +310,8 @@ function Wt(e, t, r) {
   }
   return o;
 }
-const We = 8;
-function Ue(e, t) {
+const Xe = 8;
+function Ye(e, t) {
   try {
     return t ? e.getText(t) : e.getText();
   } catch {
@@ -310,9 +322,9 @@ function Ue(e, t) {
     }
   }
 }
-let Ge = 0;
-async function Ze(e, t, r, o) {
-  const n = `__ApigenProbe_${process.pid}_${Ge++}`;
+let et = 0;
+async function tt(e, t, r, o) {
+  const n = `__ApigenProbe_${process.pid}_${et++}`;
   let i;
   try {
     i = t.addTypeAlias({ name: n, type: r });
@@ -327,8 +339,8 @@ async function Ze(e, t, r, o) {
     }
   }
 }
-async function Ae(e, t, r) {
-  if (r > We)
+async function Fe(e, t, r) {
+  if (r > Xe)
     return {};
   if (e.isString() || e.isStringLiteral())
     return e.isStringLiteral() ? { type: "string", enum: [e.getLiteralValue()] } : { type: "string" };
@@ -353,12 +365,12 @@ async function Ae(e, t, r) {
         enum: o.map((c) => c.getLiteralValue())
       };
     const s = await Promise.all(
-      o.map((c) => Ae(c, t, r + 1))
-    ), a = U(s);
+      o.map((c) => Fe(c, t, r + 1))
+    ), a = Q(s);
     return {
       oneOf: s,
       ...a ? { discriminator: a } : {},
-      [W]: "union"
+      [Z]: "union"
     };
   }
   if (e.isArray()) {
@@ -381,31 +393,51 @@ async function Ae(e, t, r) {
     if (i && s.length === 0)
       return { type: "object", additionalProperties: await t(i.getText()) };
     const a = {}, c = [];
-    for (const l of s) {
-      const u = l.getName(), p = l.getDeclarations()[0];
-      let S;
-      if (p)
+    for (const u of s) {
+      const l = u.getName(), m = u.getDeclarations()[0];
+      let h;
+      if (m)
         try {
-          S = l.getTypeAtLocation(p);
+          h = u.getTypeAtLocation(m);
         } catch {
-          S = void 0;
+          h = void 0;
         }
-      if (S !== void 0 && S.getCallSignatures().length > 0)
+      if (h !== void 0 && h.getCallSignatures().length > 0)
         continue;
-      const T = S !== void 0 ? Ue(S, p) : void 0;
-      a[u] = T !== void 0 ? await t(T) : {}, l.isOptional() || c.push(u);
+      const y = h !== void 0 ? Ye(h, m) : void 0;
+      a[l] = y !== void 0 ? await t(y) : {}, u.isOptional() || c.push(l);
     }
-    return Object.keys(a).length > 0 ? {
-      type: "object",
-      properties: a,
-      // Match ts-json-schema-generator's own convention: omit `required`
-      // entirely when no property is required, rather than emitting `[]`.
-      ...c.length > 0 ? { required: c } : {}
-    } : {};
+    if (Object.keys(a).length > 0) {
+      const u = i ? await t(i.getText()) : !1;
+      return {
+        type: "object",
+        properties: a,
+        // Match ts-json-schema-generator's own convention: omit `required`
+        // entirely when no property is required, rather than emitting `[]`.
+        ...c.length > 0 ? { required: c } : {},
+        // BUG-APIGEN-017 (nested case): mirror compose-schemas.ts's top-level
+        // additionalProperties:false so Ajv rejects unknown keys on THIS
+        // interface-derived nested object too, not only at the envelope/data
+        // wrapper. Without this, an unrecognized key nested inside a domain
+        // param object (e.g. a typo'd flag on a query-options interface)
+        // validates successfully and is then silently discarded by
+        // `decodeNode`'s object branch (runtime.ts) instead of erroring —
+        // confirmed as BUG-BACKLOG-QUERY-001's actual mechanism: `full`/
+        // `view`-shaped optional keys on a nested options object were
+        // accepted-and-ignored rather than rejected.
+        // Index-signature aware: an interface WITH a string/number index
+        // signature legitimately accepts extra keys, so closing it with a
+        // hardcoded `false` would reject valid input. `indexValue ? <resolved>
+        // : false` keeps the BUG-APIGEN-017 closure above as the default and
+        // only opens the schema where the TYPE itself declares it open.
+        additionalProperties: u
+      };
+    }
+    return {};
   }
   return {};
 }
-function U(e) {
+function Q(e) {
   if (e.length < 2)
     return;
   const t = [];
@@ -424,12 +456,12 @@ function U(e) {
     const n = [];
     let i = !0;
     for (const a of t) {
-      const c = a[o], l = c && (c.type === "string" || c.type === "number"), u = c == null ? void 0 : c.enum;
-      if (!l || !Array.isArray(u) || u.length !== 1) {
+      const c = a[o], u = c && (c.type === "string" || c.type === "number"), l = c == null ? void 0 : c.enum;
+      if (!u || !Array.isArray(l) || l.length !== 1) {
         i = !1;
         break;
       }
-      n.push(String(u[0]));
+      n.push(String(l[0]));
     }
     if (!i || new Set(n).size !== n.length)
       continue;
@@ -439,7 +471,7 @@ function U(e) {
     }), { propertyName: o, mapping: s };
   }
 }
-function D(e, t, r) {
+function H(e, t, r) {
   if (t > 6)
     return {};
   const o = e.trim();
@@ -453,13 +485,13 @@ function D(e, t, r) {
     return { type: "null" };
   if (o === "undefined")
     return { type: "null" };
-  const n = ee[o];
+  const n = re[o];
   if (n !== void 0)
     return n;
   if (r != null && r.size) {
     const i = r.get(o);
     if (i !== void 0) {
-      const s = ee[i];
+      const s = re[i];
       if (s !== void 0)
         return s;
     }
@@ -467,30 +499,30 @@ function D(e, t, r) {
   if (o.endsWith("[]"))
     return {
       type: "array",
-      items: D(o.slice(0, -2), t + 1, r)
+      items: H(o.slice(0, -2), t + 1, r)
     };
   if (o.includes("|")) {
     const i = o.split("|").map((c) => c.trim());
     if (i.every((c) => c.startsWith("'")))
       return { type: "string", enum: i.map((c) => c.replace(/'/g, "")) };
-    const s = i.map((c) => D(c, t + 1, r)), a = U(s);
+    const s = i.map((c) => H(c, t + 1, r)), a = Q(s);
     return {
       oneOf: s,
       ...a ? { discriminator: a } : {},
-      [W]: "union"
+      [Z]: "union"
     };
   }
   if (o.startsWith("{") && o.endsWith("}")) {
     const i = o.slice(1, -1).trim(), s = {};
     for (const a of i.split(";").filter(Boolean)) {
-      const [c, l] = a.split(":").map((u) => u.trim());
-      c && l && (s[c.replace("?", "")] = D(l, t + 1, r));
+      const [c, u] = a.split(":").map((l) => l.trim());
+      c && u && (s[c.replace("?", "")] = H(u, t + 1, r));
     }
     return { type: "object", properties: s };
   }
   return {};
 }
-function $e(e) {
+function Ce(e) {
   const t = [];
   let r = 0, o = 0;
   for (let i = 0; i < e.length; i++) {
@@ -500,26 +532,26 @@ function $e(e) {
   const n = e.slice(o).trim();
   return n.length > 0 && t.push(n), t;
 }
-function He(e) {
+function nt(e) {
   const t = /^(?:Readonly)?Map<(.+)>$/.exec(e);
   return t ? t[1] : void 0;
 }
-function Je(e) {
+function rt(e) {
   const t = /^(?:Readonly)?Set<(.+)>$/.exec(e);
   return t ? t[1] : void 0;
 }
-function Qe(e) {
+function ot(e) {
   let t = e.trim();
   if (t.startsWith("readonly ") && (t = t.slice(9).trim()), !t.startsWith("[") || !t.endsWith("]"))
     return;
   const r = t.slice(1, -1).trim();
   if (r.length !== 0)
-    return $e(r);
+    return Ce(r);
 }
-async function Xe(e, t) {
-  const r = e.trim(), o = He(r);
+async function it(e, t) {
+  const r = e.trim(), o = nt(r);
   if (o !== void 0) {
-    const s = $e(o);
+    const s = Ce(o);
     if (s.length === 2) {
       const [a, c] = await Promise.all([
         t(s[0]),
@@ -536,10 +568,10 @@ async function Xe(e, t) {
       };
     }
   }
-  const n = Je(r);
+  const n = rt(r);
   if (n !== void 0)
     return { type: "array", items: await t(n), uniqueItems: !0 };
-  const i = Qe(r);
+  const i = ot(r);
   if (i !== void 0) {
     const s = await Promise.all(i.map((a) => t(a)));
     return {
@@ -550,9 +582,9 @@ async function Xe(e, t) {
     };
   }
 }
-const Ne = {
+const Re = {
   "decimal.js": "Decimal"
-}, ee = {
+}, re = {
   Date: { type: "string", format: "date-time" },
   bigint: { type: "string", format: "int64" },
   Uint8Array: { type: "string", format: "byte" },
@@ -560,16 +592,16 @@ const Ne = {
   URL: { type: "string", format: "uri" },
   RegExp: { type: "string", format: "regex" },
   Decimal: { type: "string", format: "decimal" }
-}, me = {
+}, Te = {
   Uint8Array: "byte",
   Buffer: "byte",
   Decimal: "decimal"
 };
-function ge(e) {
+function Se(e) {
   var r;
   const t = /* @__PURE__ */ new Map();
   for (const o of e.getImportDeclarations()) {
-    const n = o.getModuleSpecifierValue(), i = Ne[n];
+    const n = o.getModuleSpecifierValue(), i = Re[n];
     if (!i)
       continue;
     const s = o.getDefaultImport();
@@ -584,7 +616,7 @@ function ge(e) {
   }
   return t;
 }
-function Ye(e, t) {
+function st(e, t) {
   return (r) => {
     r.addNodeParser({
       supportsNode(o) {
@@ -592,14 +624,14 @@ function Ye(e, t) {
         if (o.kind !== t)
           return !1;
         const n = ((i = o.typeName) == null ? void 0 : i.escapedText) ?? ((a = (s = o.typeName) == null ? void 0 : s.right) == null ? void 0 : a.escapedText);
-        return n !== void 0 && Object.prototype.hasOwnProperty.call(me, n);
+        return n !== void 0 && Object.prototype.hasOwnProperty.call(Te, n);
       },
       createType(o) {
-        var i, s, a;
-        const n = ((i = o.typeName) == null ? void 0 : i.escapedText) ?? ((a = (s = o.typeName) == null ? void 0 : s.right) == null ? void 0 : a.escapedText);
-        return new ce(
-          new ue(),
-          { format: me[n] },
+        var a, c, u;
+        const n = ((a = o.typeName) == null ? void 0 : a.escapedText) ?? ((u = (c = o.typeName) == null ? void 0 : c.right) == null ? void 0 : u.escapedText), { AnnotatedType: i, StringType: s } = oe();
+        return new i(
+          new s(),
+          { format: Te[n] },
           !1
         );
       }
@@ -608,52 +640,57 @@ function Ye(e, t) {
         return o.kind === e;
       },
       createType() {
-        return new ce(new ue(), { format: "int64" }, !1);
+        const { AnnotatedType: o, StringType: n } = oe();
+        return new o(new n(), { format: "int64" }, !1);
       }
     });
   };
 }
-let C;
-function et() {
-  if (C)
-    return C;
+let D;
+function oe() {
+  return D || (D = N("ts-json-schema-generator"), D);
+}
+let _;
+function at() {
+  if (_)
+    return _;
   try {
-    const e = oe.dirname(
-      require.resolve("ts-json-schema-generator/package.json")
+    const e = ce.dirname(
+      N.resolve("ts-json-schema-generator/package.json")
     );
-    C = require(require.resolve("typescript", {
+    _ = N(N.resolve("typescript", {
       paths: [e]
     }));
   } catch {
-    C = require("typescript");
+    _ = N("typescript");
   }
-  return C;
+  return _;
 }
-const k = /* @__PURE__ */ new Map();
-function tt() {
+const I = /* @__PURE__ */ new Map();
+function ct() {
   const e = process.env.APIGEN_PROGRAM_CACHE, t = e === void 0 ? NaN : Number(e);
   return Number.isFinite(t) && t >= 0 ? t : 8;
 }
-function nt(e) {
-  const t = k.get(e);
-  return t && (k.delete(e), k.set(e, t)), t;
+function ut(e) {
+  const t = I.get(e);
+  return t && (I.delete(e), I.set(e, t)), t;
 }
-function rt(e, t) {
-  const r = tt();
+function lt(e, t) {
+  const r = ct();
   if (r !== 0)
-    for (k.delete(e), k.set(e, t); k.size > r; ) {
-      const o = k.keys().next().value;
-      k.delete(o);
+    for (I.delete(e), I.set(e, t); I.size > r; ) {
+      const o = I.keys().next().value;
+      I.delete(o);
     }
 }
-function ot(e, t) {
+function ft(e, t) {
   return `${e}\0${t ?? ""}`;
 }
-const it = /* @__PURE__ */ new Set(["zod", /^zod\/./]);
-function st(e) {
+const pt = /* @__PURE__ */ new Set(["zod", /^zod\/./]);
+function mt(e) {
   for (const t of e.getImportDeclarations()) {
     const r = t.getModuleSpecifierValue();
-    for (const o of it)
+    for (const o of pt)
       if (typeof o == "string") {
         if (r === o)
           return !0;
@@ -662,7 +699,7 @@ function st(e) {
   }
   return !1;
 }
-function at(e) {
+function dt(e) {
   for (const t of ["$defs", "definitions"]) {
     const r = e[t];
     if (!r || typeof r != "object")
@@ -676,8 +713,8 @@ function at(e) {
         continue;
       const a = s, c = typeof a.$ref == "string" ? a.$ref : "";
       if (c) {
-        for (const l of n)
-          if (c.includes(l)) {
+        for (const u of n)
+          if (c.includes(u)) {
             n.add(i);
             break;
           }
@@ -686,9 +723,9 @@ function at(e) {
     for (const i of n)
       delete r[i];
   }
-  te(e);
+  ie(e);
 }
-function te(e, t) {
+function ie(e, t) {
   if (!e || typeof e != "object")
     return;
   const r = t ?? /* @__PURE__ */ new WeakSet();
@@ -703,12 +740,12 @@ function te(e, t) {
       if (typeof o == "object" && o !== null)
         if (Array.isArray(o))
           for (const n of o)
-            typeof n == "object" && n !== null && te(n, r);
+            typeof n == "object" && n !== null && ie(n, r);
         else
-          te(o, r);
+          ie(o, r);
   }
 }
-function ct(e) {
+function gt(e) {
   const t = /* @__PURE__ */ new Set();
   for (const o of ["$defs", "definitions"]) {
     const n = e[o];
@@ -716,13 +753,13 @@ function ct(e) {
       for (const i of Object.keys(n))
         t.add(i);
   }
-  const r = ne(e, t);
+  const r = se(e, t);
   if (r.length > 0)
     throw new Error(
       `[apigen-core-client] Generated schema contains ${r.length} unresolvable $ref(s): ${r.join(", ")}. This usually means zod-internal definitions were stripped but $ref references to them remain. Check the source file's imports or the ts-json-schema-generator output.`
     );
 }
-function ne(e, t) {
+function se(e, t) {
   if (!e || typeof e != "object")
     return [];
   const r = [];
@@ -734,60 +771,60 @@ function ne(e, t) {
       if (Array.isArray(n))
         for (const i of n)
           typeof i == "object" && i !== null && r.push(
-            ...ne(i, t)
+            ...se(i, t)
           );
       else
         r.push(
-          ...ne(n, t)
+          ...se(n, t)
         );
   return r;
 }
-function ut(e) {
+function yt(e) {
   const t = e.anyOf;
   if (!Array.isArray(t) || t.length < 2)
     return e;
-  const r = t, o = U(r), n = { ...e };
+  const r = t, o = Q(r), n = { ...e };
   return delete n.anyOf, {
     ...n,
     oneOf: r,
     ...o ? { discriminator: o } : {},
-    [W]: n[W] ?? "union"
+    [Z]: n[Z] ?? "union"
   };
 }
-function lt(e, t, r) {
-  const { DEFAULT_CONFIG: o } = require("ts-json-schema-generator/dist/src/Config.js"), n = { ...o, ...e }, i = n.path, s = ot(i, n.tsconfig);
+function ht(e, t, r) {
+  const { DEFAULT_CONFIG: o } = N("ts-json-schema-generator/dist/src/Config.js"), n = { ...o, ...e }, i = n.path, s = ft(i, n.tsconfig);
   let a;
-  a = r ? r.statVersion(i) : xe(i);
+  a = r ? r.statVersion(i) : ke(i);
   let c;
   if (s !== void 0) {
-    const u = (r == null ? void 0 : r.generatorCache.get(s)) ?? nt(s);
-    u && u.version === a && (c = u.gen);
+    const l = (r == null ? void 0 : r.generatorCache.get(s)) ?? ut(s);
+    l && l.version === a && (c = l.gen);
   }
   if (!c) {
-    const { createProgram: u } = require("ts-json-schema-generator/dist/factory/program.js"), f = et(), p = Ye(
-      f.SyntaxKind.BigIntKeyword,
-      f.SyntaxKind.TypeReference
-    ), S = u(n), T = Re(
-      S,
+    const { createProgram: l } = N("ts-json-schema-generator/dist/factory/program.js"), { createParser: f, createFormatter: m, SchemaGenerator: h } = oe(), y = at(), d = st(
+      y.SyntaxKind.BigIntKeyword,
+      y.SyntaxKind.TypeReference
+    ), g = l(n), x = f(
+      g,
       n,
-      p
-    ), m = Le(n);
-    if (c = new _e(
-      S,
-      T,
-      m,
+      d
+    ), p = m(n);
+    if (c = new h(
+      g,
+      x,
+      p,
       n
     ), r && r.stats.generatorsBuilt++, s !== void 0 && a !== void 0) {
-      const h = { version: a, gen: c };
-      rt(s, h), r == null || r.generatorCache.set(s, h);
+      const T = { version: a, gen: c };
+      lt(s, T), r == null || r.generatorCache.set(s, T);
     }
   }
-  const l = c.createSchema(n.type);
-  return at(l), ct(l), l;
+  const u = c.createSchema(n.type);
+  return dt(u), gt(u), u;
 }
-function ft(e, t) {
+function Tt(e, t) {
   let r = e.trim();
-  if (r = Oe(r), t != null && t.size) {
+  if (r = Le(r), t != null && t.size) {
     const n = t.get(r);
     if (n !== void 0)
       return n;
@@ -797,10 +834,10 @@ function ft(e, t) {
     r = r.slice(9).trim();
   return r;
 }
-function Pe(e) {
+function _e(e) {
   return e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-const pt = Object.entries(Ne).map(([e, t]) => ({
+const St = Object.entries(Re).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
@@ -808,88 +845,88 @@ const pt = Object.entries(Ne).map(([e, t]) => ({
   // …) is matched generically (`\w+`) rather than anchored to one spelling —
   // see the doc comment above for why.
   pattern: new RegExp(
-    `import\\(["'][^"']*${Pe(e)}[^"']*["']\\)\\.\\w+`,
+    `import\\(["'][^"']*${_e(e)}[^"']*["']\\)\\.\\w+`,
     "g"
   ),
   key: t
 }));
-function Oe(e) {
+function Le(e) {
   let t = e;
-  for (const { pattern: r, key: o } of pt)
+  for (const { pattern: r, key: o } of St)
     t = t.replace(r, o);
   return t;
 }
-function mt(e, t) {
-  let r = Oe(e);
+function bt(e, t) {
+  let r = Le(e);
   for (const [o, n] of t)
     r = r.replace(
-      new RegExp(`\\b${Pe(o)}\\b`, "g"),
+      new RegExp(`\\b${_e(o)}\\b`, "g"),
       n
     );
   return r;
 }
-async function N(e, t, r, o, n, i) {
+async function O(e, t, r, o, n, i) {
   const s = t.getFilePath(), a = `${s}\0${o ?? ""}\0${r}`, c = i ?? /* @__PURE__ */ new Set();
   if (c.has(a))
     return {};
   if (!n) {
-    const T = new Set(c);
-    return T.add(a), de(
+    const y = new Set(c);
+    return y.add(a), be(
       e,
       t,
       r,
       o,
       void 0,
-      T
+      y
     );
   }
-  const l = n.schemaCache.get(a);
-  if (l !== void 0)
-    return n.stats.schemaCacheHits++, l;
-  const u = Ve(
+  const u = n.schemaCache.get(a);
+  if (u !== void 0)
+    return n.stats.schemaCacheHits++, u;
+  const l = Ue(
     s,
     o,
     n.statVersion(s)
-  ), f = u.get(r);
+  ), f = l.get(r);
   if (f !== void 0)
     return n.stats.schemaCacheHits++, n.schemaCache.set(a, Promise.resolve(f)), f;
   n.stats.schemaCacheMisses++;
-  const p = new Set(c);
-  p.add(a);
-  const S = de(
+  const m = new Set(c);
+  m.add(a);
+  const h = be(
     e,
     t,
     r,
     o,
     n,
-    p
-  ).then((T) => (u.set(r, T), T)).catch((T) => {
-    throw n.schemaCache.delete(a), T;
+    m
+  ).then((y) => (l.set(r, y), y)).catch((y) => {
+    throw n.schemaCache.delete(a), y;
   });
-  return n.schemaCache.set(a, S), S;
+  return n.schemaCache.set(a, h), h;
 }
-async function de(e, t, r, o, n, i) {
+async function be(e, t, r, o, n, i) {
   if (["void", "undefined", "null", "Promise<void>"].includes(r))
     return { type: "null" };
   let s;
   if (n) {
-    const p = n.aliasCache.get(t);
-    s = p ?? ge(t), p || n.aliasCache.set(t, s);
+    const m = n.aliasCache.get(t);
+    s = m ?? Se(t), m || n.aliasCache.set(t, s);
   } else
-    s = ge(t);
-  const a = ft(r, s), c = ee[a];
+    s = Se(t);
+  const a = Tt(r, s), c = re[a];
   if (c !== void 0)
     return c;
-  const l = await Xe(
+  const u = await it(
     a,
-    (p) => N(e, t, p, o, n, i)
+    (m) => O(e, t, m, o, n, i)
   );
-  if (l !== void 0)
-    return l;
-  const u = (n == null ? void 0 : n.zodImportCache.get(t)) ?? st(t);
-  if (n && n.zodImportCache.set(t, u), !u)
+  if (u !== void 0)
+    return u;
+  const l = (n == null ? void 0 : n.zodImportCache.get(t)) ?? mt(t);
+  if (n && n.zodImportCache.set(t, l), !l)
     try {
-      const p = {
+      const m = {
         path: t.getFilePath(),
         type: a,
         skipTypeCheck: !0,
@@ -916,49 +953,49 @@ async function de(e, t, r, o, n, i) {
         // dereference/hoist pass and is tracked separately, unresolved, in
         // BUG-APIGEN-026's BACKLOG entry.
         topRef: !1
-      }, S = lt(p, !0, n);
-      return ut(S);
+      }, h = ht(m, !0, n);
+      return yt(h);
     } catch {
     }
   try {
-    const p = await Ze(
+    const m = await tt(
       e,
       t,
       a,
-      (S) => Ae(
-        S,
-        (T) => N(e, t, T, o, n, i),
+      (h) => Fe(
+        h,
+        (y) => O(e, t, y, o, n, i),
         0
       )
     );
-    if (p !== void 0)
-      return p;
+    if (m !== void 0)
+      return m;
   } catch {
   }
-  const f = mt(a, s);
-  return D(f, 0, s);
+  const f = bt(a, s);
+  return H(f, 0, s);
 }
-function se(e, t, r) {
+function le(e, t, r) {
   if (e != null && e.hasInitializer()) {
     const o = e.getInitializer();
     if (o)
       return o.getText();
   }
-  return gt(r, t);
+  return vt(r, t);
 }
-function gt(e, t) {
+function vt(e, t) {
   var s;
   const r = e, o = ((s = r == null ? void 0 : r.getJsDocs) == null ? void 0 : s.call(r)) ?? [], n = t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), i = new RegExp(`\\[\\s*${n}\\s*=\\s*([^\\]]+)\\]`);
   for (const a of o)
     for (const c of a.getTags()) {
       if (c.getTagName() !== "param")
         continue;
-      const l = c.getText().match(i);
-      if (l)
-        return l[1].trim();
+      const u = c.getText().match(i);
+      if (u)
+        return u[1].trim();
     }
 }
-function dt(e) {
+function xt(e) {
   const t = e.trim(), r = t.match(/^(['"`])([\s\S]*)\1$/);
   if (r)
     return r[2];
@@ -978,77 +1015,125 @@ function dt(e) {
     }
   }
 }
-function yt(e, t) {
-  const r = dt(t);
+function wt(e, t) {
+  const r = xt(t);
   if (r === void 0)
     return;
   e.default = r;
   const o = typeof r == "string" ? r : JSON.stringify(r), n = typeof e.description == "string" ? e.description : void 0;
   e.description = n ? `${n} (default: ${o})` : `(default: ${o})`;
 }
-function G(e) {
+let q;
+function jt() {
+  return q || (q = N("ts-morph").SyntaxKind, q);
+}
+function X(e) {
   try {
-    if (!e || e.getKind() !== ae.TypeReference)
+    if (!e)
       return;
-    const t = e;
-    if (t.getTypeArguments().length > 0)
+    const t = jt();
+    if (e.getKind() !== t.TypeReference)
       return;
-    const r = t.getTypeName();
-    if (r.getKind() !== ae.Identifier)
+    const r = e;
+    if (r.getTypeArguments().length > 0)
       return;
-    const n = r.getSymbol();
-    if (!n)
+    const o = r.getTypeName();
+    if (o.getKind() !== t.Identifier)
       return;
-    const i = n.getDeclarations().find((u) => u.getKindName() === "TypeAliasDeclaration");
+    const i = o.getSymbol();
     if (!i)
       return;
-    const s = i, a = s.getType();
-    if (!(a.isString() || a.isNumber() || a.isBoolean()))
+    const s = i.getDeclarations().find((f) => f.getKindName() === "TypeAliasDeclaration");
+    if (!s)
+      return;
+    const a = s, c = a.getType();
+    if (!(c.isString() || c.isNumber() || c.isBoolean()))
       return;
-    const l = s.getJsDocs();
-    for (const u of l)
-      for (const f of u.getTags())
-        if (f.getTagName() === "format") {
-          const p = f.getCommentText();
-          if (p !== void 0)
-            return p.trim();
+    const l = a.getJsDocs();
+    for (const f of l)
+      for (const m of f.getTags())
+        if (m.getTagName() === "format") {
+          const h = m.getCommentText();
+          if (h !== void 0)
+            return h.trim();
         }
     return;
   } catch {
     return;
   }
 }
-async function Ut(e) {
-  const t = e.session === void 0, r = je(e.session ?? we());
+const At = /* @__PURE__ */ new Set([
+  "AsyncGenerator",
+  "AsyncIterableIterator",
+  "AsyncIterable",
+  "Generator",
+  "IterableIterator",
+  "Iterable",
+  // Project-specific: `@adhd/apigen-engine-runtime`'s `ApiStream<T>` — a type
+  // alias for `AsyncIterable<T>` (see that package's `stream.ts`). Aliases
+  // used directly (not structurally decomposed) are NOT expanded by
+  // `getText()`, so this wrapper never surfaces as `AsyncIterable<T>` and
+  // must be recognized by its own name.
+  "ApiStream"
+]);
+function $t(e) {
+  const t = [];
+  let r = 0, o = "";
+  for (const n of e)
+    n === "<" || n === "(" || n === "[" || n === "{" ? r++ : (n === ">" || n === ")" || n === "]" || n === "}") && r--, n === "," && r === 0 ? (t.push(o.trim()), o = "") : o += n;
+  return o.trim().length > 0 && t.push(o.trim()), t;
+}
+function fe(e) {
+  const t = e.trim(), r = t.indexOf("<");
+  if (r === -1 || !t.endsWith(">"))
+    return null;
+  const o = t.slice(0, r), n = o.includes(".") ? o.slice(o.lastIndexOf(".") + 1) : o;
+  if (!At.has(n))
+    return null;
+  let i = 0;
+  for (let c = r; c < t.length; c++) {
+    const u = t[c];
+    if (u === "<")
+      i++;
+    else if (u === ">" && (i--, i === 0 && c !== t.length - 1))
+      return null;
+  }
+  if (i !== 0)
+    return null;
+  const s = t.slice(r + 1, -1), a = $t(s);
+  return a.length > 0 ? a[0] : null;
+}
+async function tn(e) {
+  const t = e.session === void 0, r = Ie(e.session ?? Ee());
   try {
-    return await ht(e, r);
+    return await Pt(e, r);
   } finally {
     t && r.dispose();
   }
 }
-async function ht(e, t) {
+async function Pt(e, t) {
   const {
     sourceFile: r,
     namespace: o = "",
     dropFileSegment: n = !1,
     tsconfig: i
-  } = e, s = t.projectFor(i), a = t.sourceFileFor(r, i), c = oe.basename(r), l = P(bt(c)), u = n ? null : l, f = P(o), p = [];
-  for (const [m, h] of a.getExportedDeclarations()) {
-    if (m === "default" || q(m))
+  } = e, s = t.projectFor(i), a = t.sourceFileFor(r, i), c = ce.basename(r), u = k(Ot(c)), l = n ? null : u, f = k(o), m = [];
+  for (const [d, g] of a.getExportedDeclarations()) {
+    if (d === "default" || W(d))
       continue;
-    const y = xt(h);
-    if (y) {
-      const g = y.getSignature(), w = he(g, y), v = g.getReturnType().getText(), A = I(g);
-      p.push(
-        await K(
+    const x = Et(g);
+    if (x) {
+      const S = x.getSignature(), j = we(S, x), b = S.getReturnType().getText(), A = C(S);
+      m.push(
+        await B(
           s,
           a,
           f,
-          u,
-          m,
-          w,
-          v,
-          y.isAsync(),
+          l,
+          d,
+          j,
+          b,
+          x.isAsync(),
           i,
           t,
           A
@@ -1056,161 +1141,161 @@ async function ht(e, t) {
       );
       continue;
     }
-    const d = h.find(
-      (g) => g.getKindName() === "VariableDeclaration"
+    const p = g.find(
+      (S) => S.getKindName() === "VariableDeclaration"
     );
-    if (!d)
+    if (!p)
       continue;
-    const b = d.getInitializer(), x = b == null ? void 0 : b.getKindName();
-    if (b && ["ArrowFunction", "FunctionExpression"].includes(x ?? "")) {
-      const w = d.getType().getCallSignatures();
-      if (w.length === 0)
+    const T = p.getInitializer(), w = T == null ? void 0 : T.getKindName();
+    if (T && ["ArrowFunction", "FunctionExpression"].includes(w ?? "")) {
+      const j = p.getType().getCallSignatures();
+      if (j.length === 0)
         continue;
-      const v = w[0], A = Te(
-        v,
-        d,
-        d.getVariableStatement()
-      ), j = v.getReturnType().getText(), $ = I(v), F = b.isAsync();
-      p.push(
-        await K(
+      const b = j[0], A = je(
+        b,
+        p,
+        p.getVariableStatement()
+      ), $ = b.getReturnType().getText(), v = C(b), P = T.isAsync();
+      m.push(
+        await B(
           s,
           a,
           f,
-          u,
-          m,
+          l,
+          d,
           A,
-          j,
-          F,
+          $,
+          P,
           i,
           t,
-          $
+          v
         )
       );
-    } else if (x === "ObjectLiteralExpression") {
-      const g = d.getType();
-      for (const w of g.getProperties()) {
-        const v = w.getName();
-        if (q(v))
+    } else if (w === "ObjectLiteralExpression") {
+      const S = p.getType();
+      for (const j of S.getProperties()) {
+        const b = j.getName();
+        if (W(b))
           continue;
-        const j = w.getTypeAtLocation(d).getCallSignatures();
-        if (j.length === 0)
+        const $ = j.getTypeAtLocation(p).getCallSignatures();
+        if ($.length === 0)
           continue;
-        const $ = j[0], F = Te(
-          $,
-          d,
-          d.getVariableStatement()
-        ), _ = $.getReturnType().getText(), M = I($), Z = [
-          ...u ? [u] : [],
-          P(m),
-          P(v)
+        const v = $[0], P = je(
+          v,
+          p,
+          p.getVariableStatement()
+        ), F = v.getReturnType().getText(), K = C(v), V = [
+          ...l ? [l] : [],
+          k(d),
+          k(b)
         ];
-        p.push(
-          await B(
+        m.push(
+          await J(
             s,
             a,
             f,
-            Z,
-            v,
+            V,
+            b,
+            P,
             F,
-            _,
             !1,
             i,
             t,
-            M
+            K
           )
         );
       }
     } else {
-      const g = d.getType(), w = g.getText();
-      if (E(g, d)) {
-        const v = await N(
+      const S = p.getType(), j = S.getText();
+      if (R(S, p)) {
+        const b = await O(
           s,
           a,
-          w,
+          j,
           i,
           t
         );
-        p.push(
-          St(f, u, m, v)
+        m.push(
+          Nt(f, l, d, b)
         );
       } else
         console.warn(
-          `[apigen-core] Skipping non-callable, non-serializable export: ${m}`
+          `[apigen-core] Skipping non-callable, non-serializable export: ${d}`
         );
     }
   }
-  const S = a.getDefaultExportSymbol();
-  if (S) {
-    const m = a.getExportAssignment((h) => !h.isExportEquals());
-    if (m) {
-      const h = m.getExpression(), y = h.getKindName();
-      if (["ArrowFunction", "FunctionExpression"].includes(y)) {
-        const b = h.getType().getCallSignatures();
-        if (b.length > 0) {
-          const x = b[0], g = H(x, m), w = x.getReturnType().getText(), v = I(x), A = h.isAsync();
-          p.push(
-            await K(
+  const h = a.getDefaultExportSymbol();
+  if (h) {
+    const d = a.getExportAssignment((g) => !g.isExportEquals());
+    if (d) {
+      const g = d.getExpression(), x = g.getKindName();
+      if (["ArrowFunction", "FunctionExpression"].includes(x)) {
+        const T = g.getType().getCallSignatures();
+        if (T.length > 0) {
+          const w = T[0], S = Y(w, d), j = w.getReturnType().getText(), b = C(w), A = g.isAsync();
+          m.push(
+            await B(
               s,
               a,
               f,
-              u,
+              l,
               "default",
-              g,
-              w,
+              S,
+              j,
               A,
               i,
               t,
-              v
+              b
             )
           );
         }
       } else {
-        const d = h.getType();
-        for (const b of d.getProperties()) {
-          const x = b.getName();
-          if (q(x))
+        const p = g.getType();
+        for (const T of p.getProperties()) {
+          const w = T.getName();
+          if (W(w))
             continue;
-          const w = b.getTypeAtLocation(m).getCallSignatures();
-          if (w.length === 0)
+          const j = T.getTypeAtLocation(d).getCallSignatures();
+          if (j.length === 0)
             continue;
-          const v = w[0], A = H(v, m), j = v.getReturnType().getText(), $ = I(v), F = [
-            ...u ? [u] : [],
-            P("default"),
-            P(x)
+          const b = j[0], A = Y(b, d), $ = b.getReturnType().getText(), v = C(b), P = [
+            ...l ? [l] : [],
+            k("default"),
+            k(w)
           ];
-          p.push(
-            await B(
+          m.push(
+            await J(
               s,
               a,
               f,
-              F,
-              x,
+              P,
+              w,
               A,
-              j,
+              $,
               !1,
               i,
               t,
-              $
+              v
             )
           );
         }
       }
     } else {
-      const h = S.getDeclarations();
-      for (const y of h) {
-        if (y.getKindName() !== "FunctionDeclaration")
+      const g = h.getDeclarations();
+      for (const x of g) {
+        if (x.getKindName() !== "FunctionDeclaration")
           continue;
-        const d = y, b = d.getName(), x = b && b.length > 0 ? b : "default", g = d.getSignature(), w = he(g, d), v = g.getReturnType().getText(), A = I(g);
-        p.push(
-          await K(
+        const p = x, T = p.getName(), w = T && T.length > 0 ? T : "default", S = p.getSignature(), j = we(S, p), b = S.getReturnType().getText(), A = C(S);
+        m.push(
+          await B(
             s,
             a,
             f,
-            u,
-            x,
+            l,
             w,
-            v,
-            d.isAsync(),
+            j,
+            b,
+            p.isAsync(),
             i,
             t,
             A
@@ -1219,34 +1304,34 @@ async function ht(e, t) {
       }
     }
   }
-  const T = vt(a);
-  if (T.length > 0)
-    for (const { name: m, sig: h } of T) {
-      if (q(m))
+  const y = kt(a);
+  if (y.length > 0)
+    for (const { name: d, sig: g } of y) {
+      if (W(d))
         continue;
-      const y = H(h), d = h.getReturnType().getText(), b = I(h), x = [
-        ...u ? [u] : [],
-        P(m)
+      const x = Y(g), p = g.getReturnType().getText(), T = C(g), w = [
+        ...l ? [l] : [],
+        k(d)
       ];
-      p.push(
-        await B(
+      m.push(
+        await J(
           s,
           a,
           f,
-          x,
-          m,
-          y,
+          w,
           d,
+          x,
+          p,
           !1,
           i,
           t,
-          b
+          T
         )
       );
     }
-  return p;
+  return m;
 }
-function Tt(e, t, r, o) {
+function ve(e, t, r, o) {
   const n = /* @__PURE__ */ new Set(), i = (s) => {
     if (Array.isArray(s))
       return s.map(i);
@@ -1255,22 +1340,22 @@ function Tt(e, t, r, o) {
     n.add(s);
     try {
       const a = s, c = {};
-      for (const [l, u] of Object.entries(a)) {
-        if (l === "definitions" || l === "$defs") {
-          const f = l, p = t[f];
-          for (const [S, T] of Object.entries(
-            u
+      for (const [u, l] of Object.entries(a)) {
+        if (u === "definitions" || u === "$defs") {
+          const f = u, m = t[f];
+          for (const [h, y] of Object.entries(
+            l
           )) {
-            const m = i(T), h = p[S];
-            if (h !== void 0 && JSON.stringify(h) !== JSON.stringify(m))
+            const d = i(y), g = m[h];
+            if (g !== void 0 && JSON.stringify(g) !== JSON.stringify(d))
               throw new Error(
-                `[apigen-core-client] Function "${r}": param "${o}" contributes a "${f}.${S}" definition that conflicts with an identically-named definition already hoisted from another param/output in the same function. Two structurally different types share the same generated definition key, so apigen cannot safely merge them into one function-level schema.`
+                `[apigen-core-client] Function "${r}": param "${o}" contributes a "${f}.${h}" definition that conflicts with an identically-named definition already hoisted from another param/output in the same function. Two structurally different types share the same generated definition key, so apigen cannot safely merge them into one function-level schema.`
               );
-            p[S] = m;
+            m[h] = d;
           }
           continue;
         }
-        c[l] = i(u);
+        c[u] = i(l);
       }
       return c;
     } finally {
@@ -1279,23 +1364,23 @@ function Tt(e, t, r, o) {
   };
   return i(e);
 }
-function ye(e, t) {
+function xe(e, t) {
   if (!t || e.format !== void 0 || "$ref" in e || "properties" in e || "items" in e)
     return;
   const r = e.type;
   (r === "string" || r === "number" || r === "integer" || r === "boolean") && (e.format = t);
 }
-function I(e) {
+function C(e) {
   var t;
   try {
-    return G((t = e.getDeclaration()) == null ? void 0 : t.getReturnTypeNode());
+    return X((t = e.getDeclaration()) == null ? void 0 : t.getReturnTypeNode());
   } catch {
     return;
   }
 }
-async function K(e, t, r, o, n, i, s, a, c, l, u) {
-  const f = P(n);
-  return B(
+async function B(e, t, r, o, n, i, s, a, c, u, l) {
+  const f = k(n);
+  return J(
     e,
     t,
     r,
@@ -1305,62 +1390,76 @@ async function K(e, t, r, o, n, i, s, a, c, l, u) {
     s,
     a,
     c,
-    l,
-    u
+    u,
+    l
   );
 }
-async function B(e, t, r, o, n, i, s, a, c, l, u) {
-  const f = i.length > 0 && i[0].name === "ctx", p = i.filter((g) => g.name !== "ctx"), S = p.filter((g) => !g.optional).map((g) => g.name), T = {}, m = {
+async function J(e, t, r, o, n, i, s, a, c, u, l) {
+  const f = i.length > 0 && i[0].name === "ctx", m = i.filter((v) => v.name !== "ctx"), h = m.filter((v) => !v.optional).map((v) => v.name), y = {}, d = {
     definitions: {},
     $defs: {}
   };
-  for (const g of p) {
-    const w = await N(e, t, g.type, c, l), v = Tt(w, m, n, g.name);
-    g.defaultValue !== void 0 && yt(v, g.defaultValue), ye(v, g.format), T[g.name] = v;
+  for (const v of m) {
+    const P = await O(e, t, v.type, c, u), F = ve(P, d, n, v.name);
+    v.defaultValue !== void 0 && wt(F, v.defaultValue), xe(F, v.format), y[v.name] = F;
   }
-  const h = s.replace(/^Promise<(.+)>$/, "$1").trim(), y = await N(
+  const g = s.replace(/^Promise<(.+)>$/, "$1").trim(), x = fe(g), p = x !== null, T = p ? x : g, w = await O(
     e,
     t,
-    h,
+    T,
     c,
-    l
-  ), d = u ? { ...y } : y;
-  ye(d, u);
-  const b = {
+    u
+  ), S = {
+    definitions: {},
+    $defs: {}
+  }, j = ve(
+    w,
+    S,
+    n,
+    "<return>"
+  ), b = l ? { ...j } : j;
+  xe(b, l), Object.keys(S.definitions).length > 0 && (b.definitions = {
+    ...b.definitions,
+    ...S.definitions
+  }), Object.keys(S.$defs).length > 0 && (b.$defs = {
+    ...b.$defs,
+    ...S.$defs
+  });
+  const A = {
     type: "object",
-    properties: T,
-    required: S,
+    properties: y,
+    required: h,
     // BUG-APIGEN-029: hoisted definitions from param fragments — see
     // hoistNestedDefs. Only attached when non-empty so the common
     // (no-recursive-type) case's schema shape is unchanged.
-    ...Object.keys(m.definitions).length > 0 ? { definitions: m.definitions } : {},
-    ...Object.keys(m.$defs).length > 0 ? { $defs: m.$defs } : {}
+    ...Object.keys(d.definitions).length > 0 ? { definitions: d.definitions } : {},
+    ...Object.keys(d.$defs).length > 0 ? { $defs: d.$defs } : {}
   };
   return {
-    id: ke(r, o),
+    id: Me(r, o),
     host: "ts",
     namespace: r,
     path: o,
     kind: "action",
     async: a,
-    streaming: !1,
+    streaming: p,
     safe: !1,
     // action → false per §4
-    input: b,
-    output: d,
+    input: A,
+    output: b,
     envelope: {},
     typeText: {
       lang: "ts",
-      input: wt(i),
-      output: h
+      input: It(i),
+      output: T
     },
     ...f ? { hasCtx: !0 } : {}
   };
 }
-function St(e, t, r, o) {
-  const n = P(r), i = t ? [t, n] : [n];
+function Nt(e, t, r, o) {
+  const n = k(r), i = t ? [t, n] : [n];
   return {
-    id: ke(e, i),
+    id: Me(e, i),
     host: "ts",
     namespace: e,
     path: i,
@@ -1375,10 +1474,10 @@ function St(e, t, r, o) {
     typeText: null
   };
 }
-function ke(e, t) {
+function Me(e, t) {
   return (e.raw ? [e, ...t] : t).map((o) => o.words.join("-")).join("/");
 }
-function Fe(e) {
+function Ke(e) {
   return e.split(/[-_.]+/).flatMap(
     (t) => (
       // Then split PascalCase / camelCase transitions
@@ -1386,13 +1485,13 @@ function Fe(e) {
     )
   ).map((t) => t.toLowerCase()).filter(Boolean);
 }
-function P(e) {
-  return { raw: e, words: Fe(e) };
+function k(e) {
+  return { raw: e, words: Ke(e) };
 }
-function bt(e) {
+function Ot(e) {
   return e.replace(/\.[^.]+$/, "").replace(/[._]+/g, "-");
 }
-function vt(e) {
+function kt(e) {
   const t = [];
   for (const r of e.getStatements()) {
     if (r.getKindName() !== "ExpressionStatement")
@@ -1405,13 +1504,13 @@ function vt(e) {
       continue;
     const s = n.getRight(), a = s.getType();
     for (const c of a.getProperties()) {
-      const u = c.getTypeAtLocation(s).getCallSignatures();
-      u.length !== 0 && t.push({ name: c.getName(), sig: u[0] });
+      const l = c.getTypeAtLocation(s).getCallSignatures();
+      l.length !== 0 && t.push({ name: c.getName(), sig: l[0] });
     }
   }
   return t;
 }
-function xt(e) {
+function Et(e) {
   let t;
   for (const r of e) {
     if (r.getKindName() !== "FunctionDeclaration")
@@ -1422,7 +1521,7 @@ function xt(e) {
   }
   return t;
 }
-function he(e, t) {
+function we(e, t) {
   return e.getParameters().map((r) => {
     var s;
     const o = r.getDeclarations(), n = o.length > 0 && o[0].getKindName() === "Parameter" ? o[0] : null, i = r.isOptional() || ((n == null ? void 0 : n.hasInitializer()) ?? !1) || (((s = n == null ? void 0 : n.hasQuestionToken) == null ? void 0 : s.call(n)) ?? !1);
@@ -1430,12 +1529,12 @@ function he(e, t) {
       name: r.getName(),
       type: r.getTypeAtLocation(e.getDeclaration()).getText(),
       optional: i,
-      defaultValue: se(n, r.getName(), t),
-      format: G(n == null ? void 0 : n.getTypeNode())
+      defaultValue: le(n, r.getName(), t),
+      format: X(n == null ? void 0 : n.getTypeNode())
     };
   });
 }
-function Te(e, t, r) {
+function je(e, t, r) {
   return e.getParameters().map((o) => {
     var a;
     const n = o.getDeclarations(), i = n.length > 0 && n[0].getKindName() === "Parameter" ? n[0] : null, s = o.isOptional() || ((i == null ? void 0 : i.hasInitializer()) ?? !1) || (((a = i == null ? void 0 : i.hasQuestionToken) == null ? void 0 : a.call(i)) ?? !1);
@@ -1443,16 +1542,16 @@ function Te(e, t, r) {
       name: o.getName(),
       type: o.getTypeAtLocation(t).getText(),
       optional: s,
-      defaultValue: se(
+      defaultValue: le(
         i,
         o.getName(),
         r ?? t
       ),
-      format: G(i == null ? void 0 : i.getTypeNode())
+      format: X(i == null ? void 0 : i.getTypeNode())
     };
   });
 }
-function H(e, t) {
+function Y(e, t) {
   return e.getParameters().map((r) => {
     var s, a, c;
     const o = r.getDeclarations(), n = o.length > 0 && o[0].getKindName() === "Parameter" ? o[0] : null, i = r.isOptional() || ((n == null ? void 0 : n.hasInitializer()) ?? !1) || (((s = n == null ? void 0 : n.hasQuestionToken) == null ? void 0 : s.call(n)) ?? !1);
@@ -1460,33 +1559,33 @@ function H(e, t) {
       name: r.getName(),
       type: n ? n.getType().getText() : ((c = (a = r.getValueDeclaration()) == null ? void 0 : a.getType()) == null ? void 0 : c.getText()) ?? "unknown",
       optional: i,
-      defaultValue: se(n, r.getName(), t),
-      format: G(n == null ? void 0 : n.getTypeNode())
+      defaultValue: le(n, r.getName(), t),
+      format: X(n == null ? void 0 : n.getTypeNode())
     };
   });
 }
-function wt(e) {
+function It(e) {
   const t = e.filter((r) => r.name !== "ctx");
   return t.length === 0 ? "()" : "(" + t.map((r) => `${r.name}${r.optional ? "?" : ""}: ${r.type}`).join(", ") + ")";
 }
-function q(e) {
+function W(e) {
   return !!(e === "__samples__" || e.startsWith("__"));
 }
-function E(e, t, r = /* @__PURE__ */ new Set()) {
+function R(e, t, r = /* @__PURE__ */ new Set()) {
   if (e.getCallSignatures().length > 0 || e.getConstructSignatures().length > 0)
     return !1;
   if (e.isString() || e.isNumber() || e.isBoolean() || e.isNull() || e.isUndefined() || e.isStringLiteral() || e.isNumberLiteral() || e.isBooleanLiteral() || e.isEnumLiteral())
     return !0;
   if (e.isArray() || e.isReadonlyArray()) {
     const o = e.getArrayElementType();
-    return o ? E(o, t, r) : !1;
+    return o ? R(o, t, r) : !1;
   }
   if (e.isTuple())
-    return e.getTupleElements().every((o) => E(o, t, r));
+    return e.getTupleElements().every((o) => R(o, t, r));
   if (e.isUnion())
-    return e.getUnionTypes().every((o) => E(o, t, r));
+    return e.getUnionTypes().every((o) => R(o, t, r));
   if (e.isIntersection())
-    return e.getIntersectionTypes().every((o) => E(o, t, r));
+    return e.getIntersectionTypes().every((o) => R(o, t, r));
   if (e.isObject()) {
     const o = e.getText(t);
     if (r.has(o))
@@ -1495,17 +1594,17 @@ function E(e, t, r = /* @__PURE__ */ new Set()) {
     const n = e.getStringIndexType(), i = e.getNumberIndexType();
     if (n || i)
       return [n, i].every(
-        (a) => !a || E(a, t, r)
+        (a) => !a || R(a, t, r)
       );
     const s = e.getProperties();
     return s.length === 0 ? !0 : s.every((a) => {
       const c = a.getTypeAtLocation(t);
-      return E(c, t, r);
+      return R(c, t, r);
     });
   }
   return !1;
 }
-function jt(e, t) {
+function Ft(e, t) {
   return async (r) => {
     let o = () => t(r);
     for (let n = e.length - 1; n >= 0; n--) {
@@ -1515,55 +1614,59 @@ function jt(e, t) {
     return o();
   };
 }
-function At(e, t) {
-  return jt(e, t);
+function Ct(e, t) {
+  return Ft(e, t);
 }
-function Gt(e, t, r = {}) {
+function nn(e, t, r = {}) {
   const o = e.map((n) => n.capabilities.extractLayer).filter((n) => !!n).map((n) => n.createLayer ? n.createLayer(r) : n.layer).filter((n) => !!n);
-  return At(o, t);
+  return Ct(o, t);
+}
+let U;
+function Rt() {
+  return U || (U = N("ts-morph").Scope, U);
 }
-async function Zt(e) {
-  const t = e.session === void 0, r = je(e.session ?? we());
+async function rn(e) {
+  const t = e.session === void 0, r = Ie(e.session ?? Ee());
   try {
-    return await $t(e, r);
+    return await _t(e, r);
   } finally {
     t && r.dispose();
   }
 }
-async function $t(e, t) {
+async function _t(e, t) {
   const {
     sourceFile: r,
     namespace: o = "",
     tsconfig: n,
     includeInstances: i = !1
-  } = e, s = t.projectFor(n), a = t.sourceFileFor(r, n), c = oe.basename(r), l = R(Pt(c)), u = R(o), f = [];
-  for (const [p, S] of a.getExportedDeclarations()) {
-    const T = S.find(
-      (y) => y.getKindName() === "ClassDeclaration"
+  } = e, s = t.projectFor(n), a = t.sourceFileFor(r, n), c = ce.basename(r), u = L(Mt(c)), l = L(o), f = [];
+  for (const [m, h] of a.getExportedDeclarations()) {
+    const y = h.find(
+      (p) => p.getKindName() === "ClassDeclaration"
     );
-    if (!T)
+    if (!y)
       continue;
-    const m = p === "default" ? T.getName() : p;
-    if (!m || Q(m))
+    const d = m === "default" ? y.getName() : m;
+    if (!d || te(d))
       continue;
-    const h = R(m);
-    for (const y of T.getStaticMethods()) {
-      const d = y.getName();
-      if (Q(d))
+    const g = L(d), x = Rt();
+    for (const p of y.getStaticMethods()) {
+      const T = p.getName();
+      if (te(T))
         continue;
-      const b = y.getScope();
-      if (b === V.Private || b === V.Protected)
+      const w = p.getScope();
+      if (w === x.Private || w === x.Protected)
         continue;
-      const x = y.getSignature(), g = J(x, y), w = x.getReturnType().getText(), v = y.isAsync(), A = [l, h, R(d)];
+      const S = p.getSignature(), j = ee(S, p), b = S.getReturnType().getText(), A = p.isAsync(), $ = [u, g, L(T)];
       f.push(
-        await Nt(
+        await Lt(
           s,
           a,
-          u,
+          l,
+          $,
+          j,
+          b,
           A,
-          g,
-          w,
-          v,
           n,
           t
         )
@@ -1571,31 +1674,31 @@ async function $t(e, t) {
     }
     if (i) {
       {
-        const d = T.getConstructors()[0] ?? null;
-        let b = [];
-        if (d) {
-          const j = d.getSignature();
-          b = J(j, d);
+        const T = y.getConstructors()[0] ?? null;
+        let w = [];
+        if (T) {
+          const v = T.getSignature();
+          w = ee(v, T);
         }
-        const x = [l, h], g = re(u, x), w = b.filter((j) => j.name !== "ctx"), v = w.filter((j) => !j.optional).map((j) => j.name), A = {};
-        for (const j of w)
-          A[j.name] = await N(
+        const S = [u, g], j = ae(l, S), b = w.filter((v) => v.name !== "ctx"), A = b.filter((v) => !v.optional).map((v) => v.name), $ = {};
+        for (const v of b)
+          $[v.name] = await O(
             s,
             a,
-            j.type,
+            v.type,
             n,
             t
           );
         f.push({
-          id: g,
+          id: j,
           host: "ts",
-          namespace: u,
-          path: x,
+          namespace: l,
+          path: S,
           kind: "constructor",
           async: !1,
           streaming: !1,
           safe: !1,
-          input: { type: "object", properties: A, required: v },
+          input: { type: "object", properties: $, required: A },
           output: {
             type: "object",
             properties: { instanceId: { type: "string" } },
@@ -1604,45 +1707,45 @@ async function $t(e, t) {
           envelope: {},
           typeText: {
             lang: "ts",
-            input: Ot(b),
+            input: Kt(w),
             output: "{ instanceId: string }"
           }
         });
       }
-      for (const y of T.getInstanceMethods()) {
-        const d = y.getName();
-        if (Q(d))
+      for (const p of y.getInstanceMethods()) {
+        const T = p.getName();
+        if (te(T))
           continue;
-        const b = y.getScope();
-        if (b === V.Private || b === V.Protected)
+        const w = p.getScope();
+        if (w === x.Private || w === x.Protected)
           continue;
-        const x = y.getSignature(), g = J(x, y), w = x.getReturnType().getText(), v = y.isAsync(), A = [l, h, R(d)], j = re(u, A), $ = g.filter((O) => O.name !== "ctx"), F = $.filter((O) => !O.optional).map((O) => O.name), _ = {};
-        for (const O of $)
-          _[O.name] = await N(
+        const S = p.getSignature(), j = ee(S, p), b = S.getReturnType().getText(), A = p.isAsync(), $ = [u, g, L(T)], v = ae(l, $), P = j.filter((E) => E.name !== "ctx"), F = P.filter((E) => !E.optional).map((E) => E.name), K = {};
+        for (const E of P)
+          K[E.name] = await O(
             s,
             a,
-            O.type,
+            E.type,
             n,
             t
           );
-        const M = w.replace(/^Promise<(.+)>$/, "$1").trim(), Z = await N(
+        const V = b.replace(/^Promise<(.+)>$/, "$1").trim(), pe = fe(V), me = pe !== null, de = me ? pe : V, ze = await O(
           s,
           a,
-          M,
+          de,
           n,
           t
         );
         f.push({
-          id: j,
+          id: v,
           host: "ts",
-          namespace: u,
-          path: A,
+          namespace: l,
+          path: $,
           kind: "instance-method",
-          async: v,
-          streaming: !1,
+          async: A,
+          streaming: me,
           safe: !1,
-          input: { type: "object", properties: _, required: F },
-          output: Z,
+          input: { type: "object", properties: K, required: F },
+          output: ze,
           envelope: {
             type: "object",
             properties: { instanceId: { type: "string" } },
@@ -1650,8 +1753,8 @@ async function $t(e, t) {
           },
           typeText: {
             lang: "ts",
-            input: Ie(g),
-            output: M
+            input: Ve(j),
+            output: de
           }
         });
       }
@@ -1659,53 +1762,53 @@ async function $t(e, t) {
   }
   return f;
 }
-async function Nt(e, t, r, o, n, i, s, a, c) {
-  const l = n.filter((m) => m.name !== "ctx"), u = l.filter((m) => !m.optional).map((m) => m.name), f = {};
-  for (const m of l)
-    f[m.name] = await N(
+async function Lt(e, t, r, o, n, i, s, a, c) {
+  const u = n.filter((p) => p.name !== "ctx"), l = u.filter((p) => !p.optional).map((p) => p.name), f = {};
+  for (const p of u)
+    f[p.name] = await O(
       e,
       t,
-      m.type,
+      p.type,
       a,
       c
     );
-  const p = i.replace(/^Promise<(.+)>$/, "$1").trim(), S = await N(
+  const m = i.replace(/^Promise<(.+)>$/, "$1").trim(), h = fe(m), y = h !== null, d = y ? h : m, g = await O(
     e,
     t,
-    p,
+    d,
     a,
     c
   );
   return {
-    id: re(r, o),
+    id: ae(r, o),
     host: "ts",
     namespace: r,
     path: o,
     kind: "action",
     async: s,
-    streaming: !1,
+    streaming: y,
     safe: !1,
     // action → false per §4
-    input: { type: "object", properties: f, required: u },
-    output: S,
+    input: { type: "object", properties: f, required: l },
+    output: g,
     envelope: {},
     typeText: {
       lang: "ts",
-      input: Ie(n),
-      output: p
+      input: Ve(n),
+      output: d
     }
   };
 }
-function re(e, t) {
+function ae(e, t) {
   return (e.raw ? [e, ...t] : t).map((o) => o.words.join("-")).join("/");
 }
-function R(e) {
-  return { raw: e, words: Fe(e) };
+function L(e) {
+  return { raw: e, words: Ke(e) };
 }
-function Pt(e) {
+function Mt(e) {
   return e.replace(/\.[^.]+$/, "").replace(/[._]+/g, "-");
 }
-function J(e, t) {
+function ee(e, t) {
   return e.getParameters().map((r) => {
     var s;
     const o = r.getDeclarations(), n = o.length > 0 && o[0].getKindName() === "Parameter" ? o[0] : null, i = r.isOptional() || ((n == null ? void 0 : n.hasInitializer()) ?? !1) || (((s = n == null ? void 0 : n.hasQuestionToken) == null ? void 0 : s.call(n)) ?? !1);
@@ -1716,17 +1819,17 @@ function J(e, t) {
     };
   });
 }
-function Ie(e) {
+function Ve(e) {
   const t = e.filter((r) => r.name !== "ctx");
   return t.length === 0 ? "()" : "(" + t.map((r) => `${r.name}${r.optional ? "?" : ""}: ${r.type}`).join(", ") + ")";
 }
-function Ot(e) {
+function Kt(e) {
   return e.length === 0 ? "()" : "(" + e.map((t) => `${t.name}${t.optional ? "?" : ""}: ${t.type}`).join(", ") + ")";
 }
-function Q(e) {
+function te(e) {
   return !!(e === "__samples__" || e.startsWith("__") || e.startsWith("_"));
 }
-const kt = /* @__PURE__ */ new Map([
+const Vt = /* @__PURE__ */ new Map([
   // TypeScript variants
   [".ts", "ts"],
   [".tsx", "ts"],
@@ -1741,21 +1844,21 @@ const kt = /* @__PURE__ */ new Map([
   // Java / Kotlin (both are JVM host languages for the purposes of routing)
   [".java", "java"]
 ]);
-function Ft(e) {
-  const t = Ce.extname(e).toLowerCase();
-  return kt.get(t);
+function zt(e) {
+  const t = Be.extname(e).toLowerCase();
+  return Vt.get(t);
 }
-function It(e) {
+function Dt(e) {
   return e.language ?? "ts";
 }
-function Et(e, t) {
-  const r = Ft(t);
-  return r === void 0 ? !1 : r === It(e);
+function qt(e, t) {
+  const r = zt(t);
+  return r === void 0 ? !1 : r === Dt(e);
 }
-function Ht(e, t) {
-  return t.filter((r) => Et(e, r));
+function on(e, t) {
+  return t.filter((r) => qt(e, r));
 }
-function Ct(e) {
+function Bt(e) {
   return {
     oneOf: [
       {
@@ -1789,14 +1892,14 @@ function Ct(e) {
     ]
   };
 }
-function Rt(e) {
+function Wt(e) {
   return {
     operationConst: e.id,
     itemsSchema: e.input,
-    resultSchema: Ct(e.output)
+    resultSchema: Bt(e.output)
   };
 }
-function Lt(e, t = {}) {
+function Ut(e, t = {}) {
   const r = new Set(t.exclude ?? []), o = /* @__PURE__ */ new Map();
   for (const n of e) {
     if (r.has(n.id))
@@ -1806,58 +1909,96 @@ function Lt(e, t = {}) {
   }
   return o;
 }
-function Se(e) {
+function Ae(e) {
   return { type: "string", enum: [e] };
 }
-function be(e, t) {
+function $e(e, t) {
   return {
     type: "object",
-    required: ["operation", "items"],
+    required: ["input"],
     properties: {
-      operation: t,
-      items: { type: "array", items: e.itemsSchema },
-      concurrency: { type: "number" },
-      mode: { type: "string", enum: ["parallel", "serial", "chained"] },
-      onItemError: { type: "string", enum: ["continue", "abort"] },
-      itemTimeoutMs: { type: "number" }
+      input: {
+        type: "object",
+        required: ["operation", "items"],
+        properties: {
+          operation: t,
+          items: { type: "array", items: e.itemsSchema },
+          concurrency: { type: "number" },
+          mode: { type: "string", enum: ["parallel", "serial", "chained"] },
+          onItemError: { type: "string", enum: ["continue", "abort"] },
+          itemTimeoutMs: { type: "number" }
+        },
+        // Additive-forward-compat (§7 open-question 3): a future `batchId`
+        // control-plane field must be addable without a breaking change, so
+        // this branch object must never be a closed schema.
+        additionalProperties: !0
+      }
     },
-    // Additive-forward-compat (§7 open-question 3): a future `batchId`
-    // control-plane field must be addable without a breaking change, so this
-    // branch object must never be a closed schema.
-    additionalProperties: !0
+    // The outer wrapper IS a closed shape — `input` is the only sanctioned
+    // top-level key for a `_batch/<kind>` mount call, mirroring
+    // `compose-schemas.ts`'s BUG-APIGEN-017 top-level `additionalProperties:
+    // false` for every extracted source op's envelope+data wrapper.
+    additionalProperties: !1
+  };
+}
+function Pe(e, t) {
+  const r = {}, o = {}, n = [
+    ["definitions", r],
+    ["$defs", o]
+  ];
+  for (const i of e) {
+    const s = t(i);
+    for (const [a, c] of n) {
+      const u = s[a];
+      if (u)
+        for (const [l, f] of Object.entries(u)) {
+          const m = c[l];
+          if (m !== void 0 && JSON.stringify(m) !== JSON.stringify(f))
+            throw new Error(
+              `[apigen-core-client] _batch mount: operation "${i.id}" contributes a "${a}.${l}" definition that conflicts with an identically-named definition already hoisted from another batched operation. Two structurally different types share the same generated definition key, so apigen cannot safely merge them into one _batch/<kind> schema.`
+            );
+          c[l] = f;
+        }
+    }
+  }
+  return {
+    ...Object.keys(r).length > 0 ? { definitions: r } : {},
+    ...Object.keys(o).length > 0 ? { $defs: o } : {}
   };
 }
-function _t(e) {
+function Gt(e) {
   if (e.length === 0)
     throw new Error("buildBatchKindSchema: at least one operation is required");
-  const t = e.map(Rt);
+  const t = e.map(Wt), r = Pe(e, (s) => s.input), o = Pe(e, (s) => s.output);
   if (e.length === 1) {
-    const [n] = e, [i] = t;
+    const [s] = e, [a] = t;
     return {
-      input: be(i, Se(n.id)),
-      output: { type: "array", items: i.resultSchema }
+      input: { ...$e(a, Ae(s.id)), ...r },
+      output: { type: "array", items: a.resultSchema, ...o }
     };
   }
-  const r = e.map(
-    (n, i) => be(t[i], Se(n.id))
-  ), o = U(
-    r
+  const n = e.map(
+    (s, a) => $e(t[a], Ae(s.id))
+  ), i = Q(
+    n
   );
   return {
     input: {
-      oneOf: r,
-      ...o ? { discriminator: o } : {}
+      oneOf: n,
+      ...i ? { discriminator: i } : {},
+      ...r
     },
     output: {
-      oneOf: t.map((n) => ({ type: "array", items: n.resultSchema }))
+      oneOf: t.map((s) => ({ type: "array", items: s.resultSchema })),
+      ...o
     },
-    ...o ? { discriminator: o } : {}
+    ...i ? { discriminator: i } : {}
   };
 }
-function Jt(e, t = {}) {
-  const r = Lt(e.operations, t), o = [];
+function sn(e, t = {}) {
+  const r = Ut(e.operations, t), o = [];
   for (const [n, i] of r) {
-    const { input: s, output: a } = _t(i), c = Me(`_batch/${n}`, e, {
+    const { input: s, output: a } = Gt(i), c = We(`_batch/${n}`, e, {
       kind: n,
       safe: n === "query",
       input: s,
@@ -1865,31 +2006,31 @@ function Jt(e, t = {}) {
     });
     o.push({
       ...c,
-      operationIds: i.map((l) => l.id)
+      operationIds: i.map((u) => u.id)
     });
   }
   return o;
 }
 export {
-  _t as buildBatchKindSchema,
-  Jt as buildBatchMountedOperations,
-  zt as clearPersistentProjectCache,
-  Dt as collectLocalImportPaths,
-  jt as composeOnion,
-  Wt as composeSchemas,
-  At as createExtractInvoker,
-  Gt as createExtractInvokerFromPlugins,
-  we as createExtractionSession,
-  Rt as deriveBatchOperationBranch,
-  It as effectiveLanguage,
-  Ut as extract,
-  Zt as extractClasses,
-  Lt as groupBatchableOperationsByKind,
-  ze as isPrimitiveOnlyInputSchema,
-  Ft as languageOfSource,
-  Et as pluginConsumesSource,
-  Bt as pluginsToEnvelopeMiddlewares,
-  Ht as sourcesForPlugin,
-  Me as syntheticOp,
-  Fe as tokenize
+  Gt as buildBatchKindSchema,
+  sn as buildBatchMountedOperations,
+  Qt as clearPersistentProjectCache,
+  Xt as collectLocalImportPaths,
+  Ft as composeOnion,
+  en as composeSchemas,
+  Ct as createExtractInvoker,
+  nn as createExtractInvokerFromPlugins,
+  Ee as createExtractionSession,
+  Wt as deriveBatchOperationBranch,
+  Dt as effectiveLanguage,
+  tn as extract,
+  rn as extractClasses,
+  Ut as groupBatchableOperationsByKind,
+  Je as isPrimitiveOnlyInputSchema,
+  zt as languageOfSource,
+  qt as pluginConsumesSource,
+  Yt as pluginsToEnvelopeMiddlewares,
+  on as sourcesForPlugin,
+  We as syntheticOp,
+  Ke as tokenize
 };