@adhd/apigen-core-client 0.2.2 → 0.3.0

package/index.mjs

@@ -1,70 +1,70 @@
-import { Project as te, Scope as L } from "ts-morph";
-import Ne from "node:fs";
-import * as Oe from "node:path";
-import Y from "node:path";
-import { createParser as ke, createFormatter as Ee, SchemaGenerator as Ce, AnnotatedType as ne, StringType as re } from "ts-json-schema-generator";
-function oe(e) {
+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) {
   return {
     raw: e,
     words: e.split(/(?=[A-Z])|[-_]/).map((t) => t.toLowerCase()).filter(Boolean)
   };
 }
-function Ie(e, t, n = {}) {
+function Me(e, t, r = {}) {
   const o = e.split("/");
   if (o.length < 2 || o.some((l) => l.length === 0))
     throw new Error(
       `syntheticOp: id "${e}" must be "<namespace>/<path...>" with non-empty segments`
     );
-  const [r, ...i] = o, s = r.replace(/^_+/, ""), a = n.kind ?? "action", c = {
+  const [n, ...i] = o, s = n.replace(/^_+/, ""), a = r.kind ?? "action", c = {
     id: e,
     host: t.host,
-    namespace: oe(s),
-    path: i.map(oe),
+    namespace: le(s),
+    path: i.map(le),
     kind: a,
-    async: n.async ?? !1,
-    streaming: n.streaming ?? !1,
-    safe: n.safe ?? a === "query",
-    input: n.input ?? {},
-    output: n.output ?? {},
-    envelope: n.envelope ?? {},
-    typeText: n.typeText ?? null
+    async: r.async ?? !1,
+    streaming: r.streaming ?? !1,
+    safe: r.safe ?? a === "query",
+    input: r.input ?? {},
+    output: r.output ?? {},
+    envelope: r.envelope ?? {},
+    typeText: r.typeText ?? null
   };
-  return n.hasCtx !== void 0 && (c.hasCtx = n.hasCtx), n.transports !== void 0 && (c.transports = n.transports), c;
+  return r.hasCtx !== void 0 && (c.hasCtx = r.hasCtx), r.transports !== void 0 && (c.transports = r.transports), c;
 }
-const ge = Symbol.for("adhd.apigen.extraction-session");
-function de(e, t) {
-  const n = [
+const ve = Symbol.for("adhd.apigen.extraction-session");
+function ie(e, t) {
+  const r = [
     ...e.getImportDeclarations().map((o) => o.getModuleSpecifierSourceFile()),
     ...e.getExportDeclarations().map((o) => o.getModuleSpecifierSourceFile())
   ];
-  for (const o of n) {
+  for (const o of r) {
     if (!o)
       continue;
-    const r = o.getFilePath();
-    if (!r.includes("/node_modules/") && !t.has(r)) {
-      t.add(r);
+    const n = o.getFilePath();
+    if (!n.includes("/node_modules/") && !t.has(n)) {
+      t.add(n);
       try {
         o.refreshFromFileSystemSync();
       } catch {
       }
-      de(o, t);
+      ie(o, t);
     }
   }
 }
-function ye(e) {
+function xe(e) {
   try {
-    const t = Ne.statSync(e);
+    const t = Ee.statSync(e);
     return `${t.mtimeMs}:${t.size}`;
   } catch {
     return "nostat";
   }
 }
-const F = /* @__PURE__ */ new Map(), Z = /* @__PURE__ */ new Map();
-function Fe(e, t, n) {
-  const o = t ?? "", r = F.get(o);
-  let i = n;
-  if (r && r.fileVersions.size > 0) {
-    const c = [n], l = [...r.fileVersions.entries()].sort(
+const L = /* @__PURE__ */ new Map(), Y = /* @__PURE__ */ new Map();
+function Ve(e, t, r) {
+  const o = t ?? "", n = L.get(o);
+  let i = r;
+  if (n && n.fileVersions.size > 0) {
+    const c = [r], l = [...n.fileVersions.entries()].sort(
       ([u], [f]) => u.localeCompare(f)
     );
     for (const [u, f] of l)
@@ -72,74 +72,91 @@ function Fe(e, t, n) {
     i = c.join("|");
   }
   const s = `${e}\0${t ?? ""}`;
-  let a = Z.get(s);
-  return (!a || a.version !== i) && (a = { version: i, schemas: /* @__PURE__ */ new Map() }, Z.set(s, a)), a.schemas;
-}
-function Ft() {
-  F.clear(), Z.clear();
+  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;
+}
+function Dt(e) {
+  const t = Ke(), 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();
 }
-function he() {
+function we() {
   const e = {
     projectsBuilt: 0,
     generatorsBuilt: 0,
     schemaCacheHits: 0,
     schemaCacheMisses: 0
   }, t = /* @__PURE__ */ new Map();
-  let n = !1;
+  let r = !1;
   return {
-    [ge]: !0,
+    [ve]: !0,
     stats: e,
     schemaCache: /* @__PURE__ */ new Map(),
     aliasCache: /* @__PURE__ */ new WeakMap(),
     zodImportCache: /* @__PURE__ */ new WeakMap(),
     generatorCache: /* @__PURE__ */ new Map(),
-    projectFor(r) {
-      if (n)
+    projectFor(n) {
+      if (r)
         throw new Error("apigen-core: ExtractionSession used after dispose()");
-      const i = r ?? "", s = r ? this.statVersion(r) : "";
-      let a = F.get(i);
-      return a && a.tsconfigVersion !== s && (a = void 0), a || (a = { project: r ? new te({
-        tsConfigFilePath: r,
+      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 te({ skipAddingFilesFromTsConfig: !0 }), tsconfigVersion: s, fileVersions: /* @__PURE__ */ new Map() }, F.set(i, a), e.projectsBuilt++), a.project;
+      }) : new X({ skipAddingFilesFromTsConfig: !0 }), tsconfigVersion: s, fileVersions: /* @__PURE__ */ new Map() }, L.set(i, a), e.projectsBuilt++), a.project;
     },
-    sourceFileFor(r, i) {
-      const s = this.projectFor(i), a = F.get(i ?? ""), c = this.statVersion(r);
-      let l = s.getSourceFile(r);
-      if (l === void 0 ? l = s.addSourceFileAtPath(r) : a && a.fileVersions.get(r) !== c && l.refreshFromFileSystemSync(), a == null || a.fileVersions.set(r, c), a) {
-        const u = /* @__PURE__ */ new Set([r]);
-        de(l, u);
+    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)
-          f !== r && a.fileVersions.set(f, this.statVersion(f));
+          f !== n && a.fileVersions.set(f, this.statVersion(f));
       }
       return l;
     },
-    statVersion(r) {
-      let i = t.get(r);
-      return i === void 0 && (i = ye(r), t.set(r, i)), i;
+    statVersion(n) {
+      let i = t.get(n);
+      return i === void 0 && (i = xe(n), t.set(n, i)), i;
     },
     dispose() {
-      n = !0, this.schemaCache.clear(), this.generatorCache.clear(), t.clear();
+      r = !0, this.schemaCache.clear(), this.generatorCache.clear(), t.clear();
     }
   };
 }
-function Te(e) {
+function je(e) {
   const t = e;
-  if (t[ge] !== !0)
+  if (t[ve] !== !0)
     throw new Error(
       "apigen-core: unknown ExtractionSession implementation — create sessions with createExtractionSession()"
     );
   return t;
 }
-const K = "x-apigen-logical";
-function ie(e, t) {
-  const n = /* @__PURE__ */ new Set(), o = [e];
+const W = "x-apigen-logical";
+function fe(e, t) {
+  const r = /* @__PURE__ */ new Set(), o = [e];
   for (; o.length > 0; ) {
-    const r = o.pop();
-    if (!r || n.has(r))
+    const n = o.pop();
+    if (!n || r.has(n))
       continue;
-    n.add(r);
-    const i = r.$ref;
+    r.add(n);
+    const i = n.$ref;
     if (typeof i == "string") {
       if (t) {
         const f = t[i];
@@ -153,103 +170,103 @@ function ie(e, t) {
       }
       continue;
     }
-    const s = r.oneOf;
+    const s = n.oneOf;
     if (Array.isArray(s))
       for (const f of s)
         typeof f == "object" && f !== null && o.push(f);
-    const a = r.properties;
+    const a = n.properties;
     if (a)
       for (const f of Object.values(a))
         o.push(f);
-    const c = r.items;
+    const c = n.items;
     if (Array.isArray(c))
       for (const f of c)
         typeof f == "object" && f !== null && o.push(f);
     else
       typeof c == "object" && c !== null && o.push(c);
-    const l = r.additionalProperties;
+    const l = n.additionalProperties;
     typeof l == "object" && l !== null && o.push(l);
-    const u = r.propertyNames;
+    const u = n.propertyNames;
     typeof u == "object" && u !== null && o.push(u);
   }
 }
-const se = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
-function Re(e) {
+const pe = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
+function qe(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: n } = t;
-  return typeof n == "string" ? se.has(n) : Array.isArray(n) ? n.every((o) => se.has(o) || o === "null") : Array.isArray(t.enum) && t.enum.length > 0 ? t.enum.every((o) => ["string", "number", "boolean"].includes(typeof o)) : !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;
 }
-function _e(e) {
+function ze(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(
-    Re
+    qe
   );
 }
-function Rt(e) {
-  var n, o;
+function Bt(e) {
+  var r, o;
   const t = [];
-  for (const r of e) {
+  for (const n of e) {
     const i = {
-      ...(n = r.capabilities.layer) == null ? void 0 : n.envelopeFields,
-      ...(o = r.capabilities.envelope) == null ? void 0 : o.request
+      ...(r = n.capabilities.layer) == null ? void 0 : r.envelopeFields,
+      ...(o = n.capabilities.envelope) == null ? void 0 : o.request
     };
-    Object.keys(i).length > 0 && t.push({ id: r.id, envelope: i });
+    Object.keys(i).length > 0 && t.push({ id: n.id, envelope: i });
   }
   return t;
 }
-function Le(e) {
-  const t = {}, n = (o) => {
-    for (const r of ["definitions", "$defs"]) {
-      const i = o[r];
+function De(e) {
+  const t = {}, r = (o) => {
+    for (const n of ["definitions", "$defs"]) {
+      const i = o[n];
       if (i)
         for (const [s, a] of Object.entries(i)) {
-          const c = s.startsWith("#/") ? s : `#/${r}/${s}`;
+          const c = s.startsWith("#/") ? s : `#/${n}/${s}`;
           t[c] = a;
         }
     }
   };
   for (const o of Object.values(e.schemas))
-    n(o.input), n(o.output);
+    r(o.input), r(o.output);
   if (Object.keys(t).length !== 0)
-    for (const [o, r] of Object.entries(e.schemas))
+    for (const [o, n] of Object.entries(e.schemas))
       try {
-        ie(r.input, t), ie(r.output, t);
+        fe(n.input, t), fe(n.output, t);
       } catch (i) {
         throw new Error(
           `[apigen-core-client] Schema validation failed for function "${o}": ${i.message}`
         );
       }
 }
-function Me(e, t) {
-  const n = [
+function Be(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).")
   ];
-  return e.length > 0 && n.push(
+  return e.length > 0 && r.push(
     `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.`
-  ), n.join(" ");
+  ), r.join(" ");
 }
-function _t(e, t, n) {
-  Le(e);
+function Wt(e, t, r) {
+  De(e);
   const o = {};
-  for (const [r, i] of Object.entries(e.schemas)) {
-    const s = (n == null ? void 0 : n[r]) ?? {}, a = i.input.properties ?? {}, c = i.input.required ?? [], l = {}, u = [], f = {};
-    for (const b of t)
-      if (b.envelope && s[b.id] !== !1)
-        for (const [y, h] of Object.entries(b.envelope))
-          l[y] = h, f[y] = b.id, u.includes(y) || u.push(y);
+  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 = {
       type: "object",
       properties: a,
       additionalProperties: !1,
       ...c.length > 0 ? { required: c } : {}
-    }, T = i.safe === !0 || _e(i.input), d = i.input.definitions, m = i.input.$defs;
-    o[r] = {
+    }, S = i.safe === !0 || ze(i.input), T = i.input.definitions, m = i.input.$defs;
+    o[n] = {
       input: {
         type: "object",
         properties: { ...l, data: p },
@@ -261,17 +278,17 @@ function _t(e, t, n) {
         // field or the "data" wrapper — no silently-ignored junk params.
         additionalProperties: !1,
         // BUG-APIGEN-020: document the envelope/data calling convention inline.
-        description: Me(
+        description: Be(
           Object.keys(l),
           Object.keys(a).length > 0
         ),
-        ...d ? { definitions: d } : {},
+        ...T ? { definitions: T } : {},
         ...m ? { $defs: m } : {}
       },
       output: i.output,
       // Carry the ctx-param flag through to dispatch (BUG-APIGEN-001).
       ...i.hasCtx ? { hasCtx: !0 } : {},
-      "x-apigen-safe": T,
+      "x-apigen-safe": S,
       // 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
@@ -281,8 +298,8 @@ function _t(e, t, n) {
   }
   return o;
 }
-const Ve = 8;
-function qe(e, t) {
+const We = 8;
+function Ue(e, t) {
   try {
     return t ? e.getText(t) : e.getText();
   } catch {
@@ -293,12 +310,12 @@ function qe(e, t) {
     }
   }
 }
-let ze = 0;
-async function Ke(e, t, n, o) {
-  const r = `__ApigenProbe_${process.pid}_${ze++}`;
+let Ge = 0;
+async function Ze(e, t, r, o) {
+  const n = `__ApigenProbe_${process.pid}_${Ge++}`;
   let i;
   try {
-    i = t.addTypeAlias({ name: r, type: n });
+    i = t.addTypeAlias({ name: n, type: r });
     const s = i.getType();
     return await o(s);
   } catch {
@@ -310,8 +327,8 @@ async function Ke(e, t, n, o) {
     }
   }
 }
-async function be(e, t, n) {
-  if (n > Ve)
+async function Ae(e, t, r) {
+  if (r > We)
     return {};
   if (e.isString() || e.isStringLiteral())
     return e.isStringLiteral() ? { type: "string", enum: [e.getLiteralValue()] } : { type: "string" };
@@ -336,12 +353,12 @@ async function be(e, t, n) {
         enum: o.map((c) => c.getLiteralValue())
       };
     const s = await Promise.all(
-      o.map((c) => be(c, t, n + 1))
-    ), a = D(s);
+      o.map((c) => Ae(c, t, r + 1))
+    ), a = U(s);
     return {
       oneOf: s,
       ...a ? { discriminator: a } : {},
-      [K]: "union"
+      [W]: "union"
     };
   }
   if (e.isArray()) {
@@ -349,34 +366,34 @@ async function be(e, t, n) {
     return { type: "array", items: o ? await t(o.getText()) : {} };
   }
   if (e.isTuple()) {
-    const o = e.getTupleElements(), r = await Promise.all(
+    const o = e.getTupleElements(), n = await Promise.all(
       o.map((i) => t(i.getText()))
     );
     return {
       type: "array",
-      items: r,
-      minItems: r.length,
-      maxItems: r.length
+      items: n,
+      minItems: n.length,
+      maxItems: n.length
     };
   }
   if (e.isObject()) {
-    const o = e.getStringIndexType(), r = e.getNumberIndexType(), i = o ?? r, s = e.getProperties();
+    const o = e.getStringIndexType(), n = e.getNumberIndexType(), i = o ?? n, s = e.getProperties();
     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 T;
+      let S;
       if (p)
         try {
-          T = l.getTypeAtLocation(p);
+          S = l.getTypeAtLocation(p);
         } catch {
-          T = void 0;
+          S = void 0;
         }
-      if (T !== void 0 && T.getCallSignatures().length > 0)
+      if (S !== void 0 && S.getCallSignatures().length > 0)
         continue;
-      const d = T !== void 0 ? qe(T, p) : void 0;
-      a[u] = d !== void 0 ? await t(d) : {}, l.isOptional() || c.push(u);
+      const T = S !== void 0 ? Ue(S, p) : void 0;
+      a[u] = T !== void 0 ? await t(T) : {}, l.isOptional() || c.push(u);
     }
     return Object.keys(a).length > 0 ? {
       type: "object",
@@ -388,23 +405,23 @@ async function be(e, t, n) {
   }
   return {};
 }
-function D(e) {
+function U(e) {
   if (e.length < 2)
     return;
   const t = [];
   for (const o of e) {
     if (o.type !== "object")
       return;
-    const r = o.properties;
-    if (!r || typeof r != "object")
+    const n = o.properties;
+    if (!n || typeof n != "object")
       return;
-    t.push(r);
+    t.push(n);
   }
-  const n = Object.keys(t[0]).filter(
-    (o) => t.every((r) => Object.prototype.hasOwnProperty.call(r, o))
+  const r = Object.keys(t[0]).filter(
+    (o) => t.every((n) => Object.prototype.hasOwnProperty.call(n, o))
   );
-  for (const o of n) {
-    const r = [];
+  for (const o of r) {
+    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;
@@ -412,17 +429,17 @@ function D(e) {
         i = !1;
         break;
       }
-      r.push(String(u[0]));
+      n.push(String(u[0]));
     }
-    if (!i || new Set(r).size !== r.length)
+    if (!i || new Set(n).size !== n.length)
       continue;
     const s = {};
-    return r.forEach((a, c) => {
+    return n.forEach((a, c) => {
       s[a] = `#/oneOf/${c}`;
     }), { propertyName: o, mapping: s };
   }
 }
-function q(e, t, n) {
+function D(e, t, r) {
   if (t > 6)
     return {};
   const o = e.trim();
@@ -436,13 +453,13 @@ function q(e, t, n) {
     return { type: "null" };
   if (o === "undefined")
     return { type: "null" };
-  const r = H[o];
-  if (r !== void 0)
-    return r;
-  if (n != null && n.size) {
-    const i = n.get(o);
+  const n = ee[o];
+  if (n !== void 0)
+    return n;
+  if (r != null && r.size) {
+    const i = r.get(o);
     if (i !== void 0) {
-      const s = H[i];
+      const s = ee[i];
       if (s !== void 0)
         return s;
     }
@@ -450,59 +467,59 @@ function q(e, t, n) {
   if (o.endsWith("[]"))
     return {
       type: "array",
-      items: q(o.slice(0, -2), t + 1, n)
+      items: D(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) => q(c, t + 1, n)), a = D(s);
+    const s = i.map((c) => D(c, t + 1, r)), a = U(s);
     return {
       oneOf: s,
       ...a ? { discriminator: a } : {},
-      [K]: "union"
+      [W]: "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("?", "")] = q(l, t + 1, n));
+      c && l && (s[c.replace("?", "")] = D(l, t + 1, r));
     }
     return { type: "object", properties: s };
   }
   return {};
 }
-function Se(e) {
+function $e(e) {
   const t = [];
-  let n = 0, o = 0;
+  let r = 0, o = 0;
   for (let i = 0; i < e.length; i++) {
     const s = e[i];
-    s === "<" || s === "[" || s === "{" || s === "(" ? n++ : s === ">" || s === "]" || s === "}" || s === ")" ? n-- : s === "," && n === 0 && (t.push(e.slice(o, i).trim()), o = i + 1);
+    s === "<" || s === "[" || s === "{" || s === "(" ? r++ : s === ">" || s === "]" || s === "}" || s === ")" ? r-- : s === "," && r === 0 && (t.push(e.slice(o, i).trim()), o = i + 1);
   }
-  const r = e.slice(o).trim();
-  return r.length > 0 && t.push(r), t;
+  const n = e.slice(o).trim();
+  return n.length > 0 && t.push(n), t;
 }
-function De(e) {
+function He(e) {
   const t = /^(?:Readonly)?Map<(.+)>$/.exec(e);
   return t ? t[1] : void 0;
 }
-function Be(e) {
+function Je(e) {
   const t = /^(?:Readonly)?Set<(.+)>$/.exec(e);
   return t ? t[1] : void 0;
 }
-function We(e) {
+function Qe(e) {
   let t = e.trim();
   if (t.startsWith("readonly ") && (t = t.slice(9).trim()), !t.startsWith("[") || !t.endsWith("]"))
     return;
-  const n = t.slice(1, -1).trim();
-  if (n.length !== 0)
-    return Se(n);
+  const r = t.slice(1, -1).trim();
+  if (r.length !== 0)
+    return $e(r);
 }
-async function Ue(e, t) {
-  const n = e.trim(), o = De(n);
+async function Xe(e, t) {
+  const r = e.trim(), o = He(r);
   if (o !== void 0) {
-    const s = Se(o);
+    const s = $e(o);
     if (s.length === 2) {
       const [a, c] = await Promise.all([
         t(s[0]),
@@ -519,10 +536,10 @@ async function Ue(e, t) {
       };
     }
   }
-  const r = Be(n);
-  if (r !== void 0)
-    return { type: "array", items: await t(r), uniqueItems: !0 };
-  const i = We(n);
+  const n = Je(r);
+  if (n !== void 0)
+    return { type: "array", items: await t(n), uniqueItems: !0 };
+  const i = Qe(r);
   if (i !== void 0) {
     const s = await Promise.all(i.map((a) => t(a)));
     return {
@@ -533,9 +550,9 @@ async function Ue(e, t) {
     };
   }
 }
-const xe = {
+const Ne = {
   "decimal.js": "Decimal"
-}, H = {
+}, ee = {
   Date: { type: "string", format: "date-time" },
   bigint: { type: "string", format: "int64" },
   Uint8Array: { type: "string", format: "byte" },
@@ -543,16 +560,16 @@ const xe = {
   URL: { type: "string", format: "uri" },
   RegExp: { type: "string", format: "regex" },
   Decimal: { type: "string", format: "decimal" }
-}, ae = {
+}, me = {
   Uint8Array: "byte",
   Buffer: "byte",
   Decimal: "decimal"
 };
-function ce(e) {
-  var n;
+function ge(e) {
+  var r;
   const t = /* @__PURE__ */ new Map();
   for (const o of e.getImportDeclarations()) {
-    const r = o.getModuleSpecifierValue(), i = xe[r];
+    const n = o.getModuleSpecifierValue(), i = Ne[n];
     if (!i)
       continue;
     const s = o.getDefaultImport();
@@ -561,47 +578,47 @@ function ce(e) {
       a !== i && t.set(a, i);
     }
     for (const a of o.getNamedImports()) {
-      const c = ((n = a.getAliasNode()) == null ? void 0 : n.getText()) ?? a.getName();
+      const c = ((r = a.getAliasNode()) == null ? void 0 : r.getText()) ?? a.getName();
       c !== i && t.set(c, i);
     }
   }
   return t;
 }
-function Ge(e, t) {
-  return (n) => {
-    n.addNodeParser({
+function Ye(e, t) {
+  return (r) => {
+    r.addNodeParser({
       supportsNode(o) {
         var i, s, a;
         if (o.kind !== t)
           return !1;
-        const r = ((i = o.typeName) == null ? void 0 : i.escapedText) ?? ((a = (s = o.typeName) == null ? void 0 : s.right) == null ? void 0 : a.escapedText);
-        return r !== void 0 && Object.prototype.hasOwnProperty.call(ae, r);
+        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);
       },
       createType(o) {
         var i, s, a;
-        const r = ((i = o.typeName) == null ? void 0 : i.escapedText) ?? ((a = (s = o.typeName) == null ? void 0 : s.right) == null ? void 0 : a.escapedText);
-        return new ne(
-          new re(),
-          { format: ae[r] },
+        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] },
           !1
         );
       }
-    }), n.addNodeParser({
+    }), r.addNodeParser({
       supportsNode(o) {
         return o.kind === e;
       },
       createType() {
-        return new ne(new re(), { format: "int64" }, !1);
+        return new ce(new ue(), { format: "int64" }, !1);
       }
     });
   };
 }
 let C;
-function Ze() {
+function et() {
   if (C)
     return C;
   try {
-    const e = Y.dirname(
+    const e = oe.dirname(
       require.resolve("ts-json-schema-generator/package.json")
     );
     C = require(require.resolve("typescript", {
@@ -613,177 +630,177 @@ function Ze() {
   return C;
 }
 const k = /* @__PURE__ */ new Map();
-function He() {
+function tt() {
   const e = process.env.APIGEN_PROGRAM_CACHE, t = e === void 0 ? NaN : Number(e);
   return Number.isFinite(t) && t >= 0 ? t : 8;
 }
-function Qe(e) {
+function nt(e) {
   const t = k.get(e);
   return t && (k.delete(e), k.set(e, t)), t;
 }
-function Je(e, t) {
-  const n = He();
-  if (n !== 0)
-    for (k.delete(e), k.set(e, t); k.size > n; ) {
+function rt(e, t) {
+  const r = tt();
+  if (r !== 0)
+    for (k.delete(e), k.set(e, t); k.size > r; ) {
       const o = k.keys().next().value;
       k.delete(o);
     }
 }
-function Xe(e, t) {
+function ot(e, t) {
   return `${e}\0${t ?? ""}`;
 }
-const Ye = /* @__PURE__ */ new Set(["zod", /^zod\/./]);
-function et(e) {
+const it = /* @__PURE__ */ new Set(["zod", /^zod\/./]);
+function st(e) {
   for (const t of e.getImportDeclarations()) {
-    const n = t.getModuleSpecifierValue();
-    for (const o of Ye)
+    const r = t.getModuleSpecifierValue();
+    for (const o of it)
       if (typeof o == "string") {
-        if (n === o)
+        if (r === o)
           return !0;
-      } else if (o.test(n))
+      } else if (o.test(r))
         return !0;
   }
   return !1;
 }
-function tt(e) {
+function at(e) {
   for (const t of ["$defs", "definitions"]) {
-    const n = e[t];
-    if (!n || typeof n != "object")
+    const r = e[t];
+    if (!r || typeof r != "object")
       continue;
-    const o = Object.keys(n);
+    const o = Object.keys(r);
     if (o.length === 0)
       continue;
-    const r = new Set(o.filter((i) => /zod/i.test(i)));
-    for (const [i, s] of Object.entries(n)) {
-      if (r.has(i) || typeof s != "object" || s === null)
+    const n = new Set(o.filter((i) => /zod/i.test(i)));
+    for (const [i, s] of Object.entries(r)) {
+      if (n.has(i) || typeof s != "object" || s === null)
         continue;
       const a = s, c = typeof a.$ref == "string" ? a.$ref : "";
       if (c) {
-        for (const l of r)
+        for (const l of n)
           if (c.includes(l)) {
-            r.add(i);
+            n.add(i);
             break;
           }
       }
     }
-    for (const i of r)
-      delete n[i];
+    for (const i of n)
+      delete r[i];
   }
-  Q(e);
+  te(e);
 }
-function Q(e, t) {
+function te(e, t) {
   if (!e || typeof e != "object")
     return;
-  const n = t ?? /* @__PURE__ */ new WeakSet();
-  if (!n.has(e)) {
-    n.add(e);
+  const r = t ?? /* @__PURE__ */ new WeakSet();
+  if (!r.has(e)) {
+    r.add(e);
     for (const o of Object.keys(e))
       if (o === "$ref" && typeof e[o] == "string") {
-        const r = e[o];
-        /zod/i.test(r) && delete e[o];
+        const n = e[o];
+        /zod/i.test(n) && delete e[o];
       }
     for (const [, o] of Object.entries(e))
       if (typeof o == "object" && o !== null)
         if (Array.isArray(o))
-          for (const r of o)
-            typeof r == "object" && r !== null && Q(r, n);
+          for (const n of o)
+            typeof n == "object" && n !== null && te(n, r);
         else
-          Q(o, n);
+          te(o, r);
   }
 }
-function nt(e) {
+function ct(e) {
   const t = /* @__PURE__ */ new Set();
   for (const o of ["$defs", "definitions"]) {
-    const r = e[o];
-    if (r && typeof r == "object")
-      for (const i of Object.keys(r))
+    const n = e[o];
+    if (n && typeof n == "object")
+      for (const i of Object.keys(n))
         t.add(i);
   }
-  const n = J(e, t);
-  if (n.length > 0)
+  const r = ne(e, t);
+  if (r.length > 0)
     throw new Error(
-      `[apigen-core-client] Generated schema contains ${n.length} unresolvable $ref(s): ${n.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.`
+      `[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 J(e, t) {
+function ne(e, t) {
   if (!e || typeof e != "object")
     return [];
-  const n = [];
-  for (const [o, r] of Object.entries(e))
-    if (o === "$ref" && typeof r == "string") {
-      const i = r.match(/#\/(?:\$defs|definitions)\/(.+)$/);
-      i && !t.has(i[1]) && n.push(r);
-    } else if (typeof r == "object" && r !== null)
-      if (Array.isArray(r))
-        for (const i of r)
-          typeof i == "object" && i !== null && n.push(
-            ...J(i, t)
+  const r = [];
+  for (const [o, n] of Object.entries(e))
+    if (o === "$ref" && typeof n == "string") {
+      const i = n.match(/#\/(?:\$defs|definitions)\/(.+)$/);
+      i && !t.has(i[1]) && r.push(n);
+    } else if (typeof n == "object" && n !== null)
+      if (Array.isArray(n))
+        for (const i of n)
+          typeof i == "object" && i !== null && r.push(
+            ...ne(i, t)
           );
       else
-        n.push(
-          ...J(r, t)
+        r.push(
+          ...ne(n, t)
         );
-  return n;
+  return r;
 }
-function rt(e) {
+function ut(e) {
   const t = e.anyOf;
   if (!Array.isArray(t) || t.length < 2)
     return e;
-  const n = t, o = D(n), r = { ...e };
-  return delete r.anyOf, {
-    ...r,
-    oneOf: n,
+  const r = t, o = U(r), n = { ...e };
+  return delete n.anyOf, {
+    ...n,
+    oneOf: r,
     ...o ? { discriminator: o } : {},
-    [K]: r[K] ?? "union"
+    [W]: n[W] ?? "union"
   };
 }
-function ot(e, t, n) {
-  const { DEFAULT_CONFIG: o } = require("ts-json-schema-generator/dist/src/Config.js"), r = { ...o, ...e }, i = r.path, s = Xe(i, r.tsconfig);
+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);
   let a;
-  a = n ? n.statVersion(i) : ye(i);
+  a = r ? r.statVersion(i) : xe(i);
   let c;
   if (s !== void 0) {
-    const u = (n == null ? void 0 : n.generatorCache.get(s)) ?? Qe(s);
+    const u = (r == null ? void 0 : r.generatorCache.get(s)) ?? nt(s);
     u && u.version === a && (c = u.gen);
   }
   if (!c) {
-    const { createProgram: u } = require("ts-json-schema-generator/dist/factory/program.js"), f = Ze(), p = Ge(
+    const { createProgram: u } = require("ts-json-schema-generator/dist/factory/program.js"), f = et(), p = Ye(
       f.SyntaxKind.BigIntKeyword,
       f.SyntaxKind.TypeReference
-    ), T = u(r), d = ke(
-      T,
-      r,
+    ), S = u(n), T = Re(
+      S,
+      n,
       p
-    ), m = Ee(r);
-    if (c = new Ce(
+    ), m = Le(n);
+    if (c = new _e(
+      S,
       T,
-      d,
       m,
-      r
-    ), n && n.stats.generatorsBuilt++, s !== void 0 && a !== void 0) {
-      const b = { version: a, gen: c };
-      Je(s, b), n == null || n.generatorCache.set(s, b);
+      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 l = c.createSchema(r.type);
-  return tt(l), nt(l), l;
-}
-function it(e, t) {
-  let n = e.trim();
-  if (n = we(n), t != null && t.size) {
-    const r = t.get(n);
-    if (r !== void 0)
-      return r;
+  const l = c.createSchema(n.type);
+  return at(l), ct(l), l;
+}
+function ft(e, t) {
+  let r = e.trim();
+  if (r = Oe(r), t != null && t.size) {
+    const n = t.get(r);
+    if (n !== void 0)
+      return n;
   }
-  const o = n.match(/^ReadonlyArray<(.+)>$/);
-  for (o && (n = `${o[1].trim()}[]`); n.startsWith("readonly "); )
-    n = n.slice(9).trim();
-  return n;
+  const o = r.match(/^ReadonlyArray<(.+)>$/);
+  for (o && (r = `${o[1].trim()}[]`); r.startsWith("readonly "); )
+    r = r.slice(9).trim();
+  return r;
 }
-function ve(e) {
+function Pe(e) {
   return e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-const st = Object.entries(xe).map(([e, t]) => ({
+const pt = Object.entries(Ne).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
@@ -791,86 +808,86 @@ const st = Object.entries(xe).map(([e, t]) => ({
   // …) is matched generically (`\w+`) rather than anchored to one spelling —
   // see the doc comment above for why.
   pattern: new RegExp(
-    `import\\(["'][^"']*${ve(e)}[^"']*["']\\)\\.\\w+`,
+    `import\\(["'][^"']*${Pe(e)}[^"']*["']\\)\\.\\w+`,
     "g"
   ),
   key: t
 }));
-function we(e) {
+function Oe(e) {
   let t = e;
-  for (const { pattern: n, key: o } of st)
-    t = t.replace(n, o);
+  for (const { pattern: r, key: o } of pt)
+    t = t.replace(r, o);
   return t;
 }
-function at(e, t) {
-  let n = we(e);
-  for (const [o, r] of t)
-    n = n.replace(
-      new RegExp(`\\b${ve(o)}\\b`, "g"),
-      r
+function mt(e, t) {
+  let r = Oe(e);
+  for (const [o, n] of t)
+    r = r.replace(
+      new RegExp(`\\b${Pe(o)}\\b`, "g"),
+      n
     );
-  return n;
+  return r;
 }
-async function A(e, t, n, o, r, i) {
-  const s = t.getFilePath(), a = `${s}\0${o ?? ""}\0${n}`, c = i ?? /* @__PURE__ */ new Set();
+async function N(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 (!r) {
-    const d = new Set(c);
-    return d.add(a), ue(
+  if (!n) {
+    const T = new Set(c);
+    return T.add(a), de(
       e,
       t,
-      n,
+      r,
       o,
       void 0,
-      d
+      T
     );
   }
-  const l = r.schemaCache.get(a);
+  const l = n.schemaCache.get(a);
   if (l !== void 0)
-    return r.stats.schemaCacheHits++, l;
-  const u = Fe(
+    return n.stats.schemaCacheHits++, l;
+  const u = Ve(
     s,
     o,
-    r.statVersion(s)
-  ), f = u.get(n);
+    n.statVersion(s)
+  ), f = u.get(r);
   if (f !== void 0)
-    return r.stats.schemaCacheHits++, r.schemaCache.set(a, Promise.resolve(f)), f;
-  r.stats.schemaCacheMisses++;
+    return n.stats.schemaCacheHits++, n.schemaCache.set(a, Promise.resolve(f)), f;
+  n.stats.schemaCacheMisses++;
   const p = new Set(c);
   p.add(a);
-  const T = ue(
+  const S = de(
     e,
     t,
-    n,
-    o,
     r,
+    o,
+    n,
     p
-  ).then((d) => (u.set(n, d), d)).catch((d) => {
-    throw r.schemaCache.delete(a), d;
+  ).then((T) => (u.set(r, T), T)).catch((T) => {
+    throw n.schemaCache.delete(a), T;
   });
-  return r.schemaCache.set(a, T), T;
+  return n.schemaCache.set(a, S), S;
 }
-async function ue(e, t, n, o, r, i) {
-  if (["void", "undefined", "null", "Promise<void>"].includes(n))
+async function de(e, t, r, o, n, i) {
+  if (["void", "undefined", "null", "Promise<void>"].includes(r))
     return { type: "null" };
   let s;
-  if (r) {
-    const p = r.aliasCache.get(t);
-    s = p ?? ce(t), p || r.aliasCache.set(t, s);
+  if (n) {
+    const p = n.aliasCache.get(t);
+    s = p ?? ge(t), p || n.aliasCache.set(t, s);
   } else
-    s = ce(t);
-  const a = it(n, s), c = H[a];
+    s = ge(t);
+  const a = ft(r, s), c = ee[a];
   if (c !== void 0)
     return c;
-  const l = await Ue(
+  const l = await Xe(
     a,
-    (p) => A(e, t, p, o, r, i)
+    (p) => N(e, t, p, o, n, i)
   );
   if (l !== void 0)
     return l;
-  const u = (r == null ? void 0 : r.zodImportCache.get(t)) ?? et(t);
-  if (r && r.zodImportCache.set(t, u), !u)
+  const u = (n == null ? void 0 : n.zodImportCache.get(t)) ?? st(t);
+  if (n && n.zodImportCache.set(t, u), !u)
     try {
       const p = {
         path: t.getFilePath(),
@@ -899,18 +916,18 @@ async function ue(e, t, n, o, r, i) {
         // dereference/hoist pass and is tracked separately, unresolved, in
         // BUG-APIGEN-026's BACKLOG entry.
         topRef: !1
-      }, T = ot(p, !0, r);
-      return rt(T);
+      }, S = lt(p, !0, n);
+      return ut(S);
     } catch {
     }
   try {
-    const p = await Ke(
+    const p = await Ze(
       e,
       t,
       a,
-      (T) => be(
-        T,
-        (d) => A(e, t, d, o, r, i),
+      (S) => Ae(
+        S,
+        (T) => N(e, t, T, o, n, i),
         0
       )
     );
@@ -918,20 +935,20 @@ async function ue(e, t, n, o, r, i) {
       return p;
   } catch {
   }
-  const f = at(a, s);
-  return q(f, 0, s);
+  const f = mt(a, s);
+  return D(f, 0, s);
 }
-function ee(e, t, n) {
+function se(e, t, r) {
   if (e != null && e.hasInitializer()) {
     const o = e.getInitializer();
     if (o)
       return o.getText();
   }
-  return ct(n, t);
+  return gt(r, t);
 }
-function ct(e, t) {
+function gt(e, t) {
   var s;
-  const n = e, o = ((s = n == null ? void 0 : n.getJsDocs) == null ? void 0 : s.call(n)) ?? [], r = t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), i = new RegExp(`\\[\\s*${r}\\s*=\\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")
@@ -941,10 +958,10 @@ function ct(e, t) {
         return l[1].trim();
     }
 }
-function ut(e) {
-  const t = e.trim(), n = t.match(/^(['"`])([\s\S]*)\1$/);
-  if (n)
-    return n[2];
+function dt(e) {
+  const t = e.trim(), r = t.match(/^(['"`])([\s\S]*)\1$/);
+  if (r)
+    return r[2];
   if (t === "true")
     return !0;
   if (t === "false")
@@ -961,125 +978,160 @@ function ut(e) {
     }
   }
 }
-function lt(e, t) {
-  const n = ut(t);
-  if (n === void 0)
+function yt(e, t) {
+  const r = dt(t);
+  if (r === void 0)
     return;
-  e.default = n;
-  const o = typeof n == "string" ? n : JSON.stringify(n), r = typeof e.description == "string" ? e.description : void 0;
-  e.description = r ? `${r} (default: ${o})` : `(default: ${o})`;
+  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})`;
 }
-async function Lt(e) {
-  const t = e.session === void 0, n = Te(e.session ?? he());
+function G(e) {
   try {
-    return await ft(e, n);
+    if (!e || e.getKind() !== ae.TypeReference)
+      return;
+    const t = e;
+    if (t.getTypeArguments().length > 0)
+      return;
+    const r = t.getTypeName();
+    if (r.getKind() !== ae.Identifier)
+      return;
+    const n = r.getSymbol();
+    if (!n)
+      return;
+    const i = n.getDeclarations().find((u) => u.getKindName() === "TypeAliasDeclaration");
+    if (!i)
+      return;
+    const s = i, a = s.getType();
+    if (!(a.isString() || a.isNumber() || a.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();
+        }
+    return;
+  } catch {
+    return;
+  }
+}
+async function Ut(e) {
+  const t = e.session === void 0, r = je(e.session ?? we());
+  try {
+    return await ht(e, r);
   } finally {
-    t && n.dispose();
+    t && r.dispose();
   }
 }
-async function ft(e, t) {
+async function ht(e, t) {
   const {
-    sourceFile: n,
+    sourceFile: r,
     namespace: o = "",
-    dropFileSegment: r = !1,
+    dropFileSegment: n = !1,
     tsconfig: i
-  } = e, s = t.projectFor(i), a = t.sourceFileFor(n, i), c = Y.basename(n), l = N(gt(c)), u = r ? null : l, f = N(o), p = [];
-  for (const [m, b] of a.getExportedDeclarations()) {
-    if (m === "default" || V(m))
+  } = 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))
       continue;
-    const y = yt(b);
+    const y = xt(h);
     if (y) {
-      const S = y.getSignature(), v = le(S, y), w = S.getReturnType().getText();
+      const g = y.getSignature(), w = he(g, y), v = g.getReturnType().getText(), A = I(g);
       p.push(
-        await M(
+        await K(
           s,
           a,
           f,
           u,
           m,
-          v,
           w,
+          v,
           y.isAsync(),
           i,
-          t
+          t,
+          A
         )
       );
       continue;
     }
-    const h = b.find(
-      (S) => S.getKindName() === "VariableDeclaration"
+    const d = h.find(
+      (g) => g.getKindName() === "VariableDeclaration"
     );
-    if (!h)
+    if (!d)
       continue;
-    const g = h.getInitializer(), x = g == null ? void 0 : g.getKindName();
-    if (g && ["ArrowFunction", "FunctionExpression"].includes(x ?? "")) {
-      const v = h.getType().getCallSignatures();
-      if (v.length === 0)
+    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)
         continue;
-      const w = v[0], $ = fe(
-        w,
-        h,
-        h.getVariableStatement()
-      ), j = w.getReturnType().getText(), P = g.isAsync();
+      const v = w[0], A = Te(
+        v,
+        d,
+        d.getVariableStatement()
+      ), j = v.getReturnType().getText(), $ = I(v), F = b.isAsync();
       p.push(
-        await M(
+        await K(
           s,
           a,
           f,
           u,
           m,
-          $,
+          A,
           j,
-          P,
+          F,
           i,
-          t
+          t,
+          $
         )
       );
     } else if (x === "ObjectLiteralExpression") {
-      const S = h.getType();
-      for (const v of S.getProperties()) {
-        const w = v.getName();
-        if (V(w))
+      const g = d.getType();
+      for (const w of g.getProperties()) {
+        const v = w.getName();
+        if (q(v))
           continue;
-        const j = v.getTypeAtLocation(h).getCallSignatures();
+        const j = w.getTypeAtLocation(d).getCallSignatures();
         if (j.length === 0)
           continue;
-        const P = j[0], B = fe(
-          P,
-          h,
-          h.getVariableStatement()
-        ), R = P.getReturnType().getText(), _ = [
+        const $ = j[0], F = Te(
+          $,
+          d,
+          d.getVariableStatement()
+        ), _ = $.getReturnType().getText(), M = I($), Z = [
           ...u ? [u] : [],
-          N(m),
-          N(w)
+          P(m),
+          P(v)
         ];
         p.push(
-          await z(
+          await B(
             s,
             a,
             f,
+            Z,
+            v,
+            F,
             _,
-            w,
-            B,
-            R,
             !1,
             i,
-            t
+            t,
+            M
           )
         );
       }
     } else {
-      const S = h.getType(), v = S.getText();
-      if (E(S, h)) {
-        const w = await A(
+      const g = d.getType(), w = g.getText();
+      if (E(g, d)) {
+        const v = await N(
           s,
           a,
-          v,
+          w,
           i,
           t
         );
         p.push(
-          mt(f, u, m, w)
+          St(f, u, m, v)
         );
       } else
         console.warn(
@@ -1087,130 +1139,134 @@ async function ft(e, t) {
         );
     }
   }
-  const T = a.getDefaultExportSymbol();
-  if (T) {
-    const m = a.getExportAssignment((b) => !b.isExportEquals());
+  const S = a.getDefaultExportSymbol();
+  if (S) {
+    const m = a.getExportAssignment((h) => !h.isExportEquals());
     if (m) {
-      const b = m.getExpression(), y = b.getKindName();
+      const h = m.getExpression(), y = h.getKindName();
       if (["ArrowFunction", "FunctionExpression"].includes(y)) {
-        const g = b.getType().getCallSignatures();
-        if (g.length > 0) {
-          const x = g[0], S = W(x, m), v = x.getReturnType().getText(), w = b.isAsync();
+        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 M(
+            await K(
               s,
               a,
               f,
               u,
               "default",
-              S,
-              v,
+              g,
               w,
+              A,
               i,
-              t
+              t,
+              v
             )
           );
         }
       } else {
-        const h = b.getType();
-        for (const g of h.getProperties()) {
-          const x = g.getName();
-          if (V(x))
+        const d = h.getType();
+        for (const b of d.getProperties()) {
+          const x = b.getName();
+          if (q(x))
             continue;
-          const v = g.getTypeAtLocation(m).getCallSignatures();
-          if (v.length === 0)
+          const w = b.getTypeAtLocation(m).getCallSignatures();
+          if (w.length === 0)
             continue;
-          const w = v[0], $ = W(w, m), j = w.getReturnType().getText(), P = [
+          const v = w[0], A = H(v, m), j = v.getReturnType().getText(), $ = I(v), F = [
             ...u ? [u] : [],
-            N("default"),
-            N(x)
+            P("default"),
+            P(x)
           ];
           p.push(
-            await z(
+            await B(
               s,
               a,
               f,
-              P,
+              F,
               x,
-              $,
+              A,
               j,
               !1,
               i,
-              t
+              t,
+              $
             )
           );
         }
       }
     } else {
-      const b = T.getDeclarations();
-      for (const y of b) {
+      const h = S.getDeclarations();
+      for (const y of h) {
         if (y.getKindName() !== "FunctionDeclaration")
           continue;
-        const h = y, g = h.getName(), x = g && g.length > 0 ? g : "default", S = h.getSignature(), v = le(S, h), w = S.getReturnType().getText();
+        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 M(
+          await K(
             s,
             a,
             f,
             u,
             x,
-            v,
             w,
-            h.isAsync(),
+            v,
+            d.isAsync(),
             i,
-            t
+            t,
+            A
           )
         );
       }
     }
   }
-  const d = dt(a);
-  if (d.length > 0)
-    for (const { name: m, sig: b } of d) {
-      if (V(m))
+  const T = vt(a);
+  if (T.length > 0)
+    for (const { name: m, sig: h } of T) {
+      if (q(m))
         continue;
-      const y = W(b), h = b.getReturnType().getText(), g = [
+      const y = H(h), d = h.getReturnType().getText(), b = I(h), x = [
         ...u ? [u] : [],
-        N(m)
+        P(m)
       ];
       p.push(
-        await z(
+        await B(
           s,
           a,
           f,
-          g,
+          x,
           m,
           y,
-          h,
+          d,
           !1,
           i,
-          t
+          t,
+          b
         )
       );
     }
   return p;
 }
-function pt(e, t, n, o) {
-  const r = /* @__PURE__ */ new Set(), i = (s) => {
+function Tt(e, t, r, o) {
+  const n = /* @__PURE__ */ new Set(), i = (s) => {
     if (Array.isArray(s))
       return s.map(i);
-    if (!s || typeof s != "object" || r.has(s))
+    if (!s || typeof s != "object" || n.has(s))
       return s;
-    r.add(s);
+    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 [T, d] of Object.entries(
+          for (const [S, T] of Object.entries(
             u
           )) {
-            const m = i(d), b = p[T];
-            if (b !== void 0 && JSON.stringify(b) !== JSON.stringify(m))
+            const m = i(T), h = p[S];
+            if (h !== void 0 && JSON.stringify(h) !== JSON.stringify(m))
               throw new Error(
-                `[apigen-core-client] Function "${n}": param "${o}" contributes a "${f}.${T}" 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}.${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.`
               );
-            p[T] = m;
+            p[S] = m;
           }
           continue;
         }
@@ -1218,76 +1274,93 @@ function pt(e, t, n, o) {
       }
       return c;
     } finally {
-      r.delete(s);
+      n.delete(s);
     }
   };
   return i(e);
 }
-async function M(e, t, n, o, r, i, s, a, c, l) {
-  const u = N(r);
-  return z(
+function ye(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) {
+  var t;
+  try {
+    return G((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(
     e,
     t,
-    n,
-    o ? [o, u] : [u],
     r,
+    o ? [o, f] : [f],
+    n,
     i,
     s,
     a,
     c,
-    l
+    l,
+    u
   );
 }
-async function z(e, t, n, o, r, i, s, a, c, l) {
-  const u = i.length > 0 && i[0].name === "ctx", f = i.filter((g) => g.name !== "ctx"), p = f.filter((g) => !g.optional).map((g) => g.name), T = {}, d = {
+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 = {
     definitions: {},
     $defs: {}
   };
-  for (const g of f) {
-    const x = await A(e, t, g.type, c, l), S = pt(x, d, r, g.name);
-    g.defaultValue !== void 0 && lt(S, g.defaultValue), T[g.name] = S;
+  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;
   }
-  const m = s.replace(/^Promise<(.+)>$/, "$1").trim(), b = await A(
+  const h = s.replace(/^Promise<(.+)>$/, "$1").trim(), y = await N(
     e,
     t,
-    m,
+    h,
     c,
     l
-  ), y = {
+  ), d = u ? { ...y } : y;
+  ye(d, u);
+  const b = {
     type: "object",
     properties: T,
-    required: p,
+    required: S,
     // 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(d.definitions).length > 0 ? { definitions: d.definitions } : {},
-    ...Object.keys(d.$defs).length > 0 ? { $defs: d.$defs } : {}
+    ...Object.keys(m.definitions).length > 0 ? { definitions: m.definitions } : {},
+    ...Object.keys(m.$defs).length > 0 ? { $defs: m.$defs } : {}
   };
   return {
-    id: je(n, o),
+    id: ke(r, o),
     host: "ts",
-    namespace: n,
+    namespace: r,
     path: o,
     kind: "action",
     async: a,
     streaming: !1,
     safe: !1,
     // action → false per §4
-    input: y,
-    output: b,
+    input: b,
+    output: d,
     envelope: {},
     typeText: {
       lang: "ts",
-      input: ht(i),
-      output: m
+      input: wt(i),
+      output: h
     },
-    ...u ? { hasCtx: !0 } : {}
+    ...f ? { hasCtx: !0 } : {}
   };
 }
-function mt(e, t, n, o) {
-  const r = N(n), i = t ? [t, r] : [r];
+function St(e, t, r, o) {
+  const n = P(r), i = t ? [t, n] : [n];
   return {
-    id: je(e, i),
+    id: ke(e, i),
     host: "ts",
     namespace: e,
     path: i,
@@ -1302,10 +1375,10 @@ function mt(e, t, n, o) {
     typeText: null
   };
 }
-function je(e, t) {
+function ke(e, t) {
   return (e.raw ? [e, ...t] : t).map((o) => o.words.join("-")).join("/");
 }
-function $e(e) {
+function Fe(e) {
   return e.split(/[-_.]+/).flatMap(
     (t) => (
       // Then split PascalCase / camelCase transitions
@@ -1313,24 +1386,24 @@ function $e(e) {
     )
   ).map((t) => t.toLowerCase()).filter(Boolean);
 }
-function N(e) {
-  return { raw: e, words: $e(e) };
+function P(e) {
+  return { raw: e, words: Fe(e) };
 }
-function gt(e) {
+function bt(e) {
   return e.replace(/\.[^.]+$/, "").replace(/[._]+/g, "-");
 }
-function dt(e) {
+function vt(e) {
   const t = [];
-  for (const n of e.getStatements()) {
-    if (n.getKindName() !== "ExpressionStatement")
+  for (const r of e.getStatements()) {
+    if (r.getKindName() !== "ExpressionStatement")
       continue;
-    const o = n.getExpression();
+    const o = r.getExpression();
     if (o.getKindName() !== "BinaryExpression")
       continue;
-    const r = o;
-    if (r.getLeft().getText().trim() !== "module.exports" || r.getOperatorToken().getKindName() !== "EqualsToken")
+    const n = o;
+    if (n.getLeft().getText().trim() !== "module.exports" || n.getOperatorToken().getKindName() !== "EqualsToken")
       continue;
-    const s = r.getRight(), a = s.getType();
+    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] });
@@ -1338,163 +1411,183 @@ function dt(e) {
   }
   return t;
 }
-function yt(e) {
+function xt(e) {
   let t;
-  for (const n of e) {
-    if (n.getKindName() !== "FunctionDeclaration")
+  for (const r of e) {
+    if (r.getKindName() !== "FunctionDeclaration")
       continue;
-    const o = n;
+    const o = r;
     if (t || (t = o), o.getBody())
       return o;
   }
   return t;
 }
-function le(e, t) {
-  return e.getParameters().map((n) => {
+function he(e, t) {
+  return e.getParameters().map((r) => {
     var s;
-    const o = n.getDeclarations(), r = o.length > 0 && o[0].getKindName() === "Parameter" ? o[0] : null, i = n.isOptional() || ((r == null ? void 0 : r.hasInitializer()) ?? !1) || (((s = r == null ? void 0 : r.hasQuestionToken) == null ? void 0 : s.call(r)) ?? !1);
+    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);
     return {
-      name: n.getName(),
-      type: n.getTypeAtLocation(e.getDeclaration()).getText(),
+      name: r.getName(),
+      type: r.getTypeAtLocation(e.getDeclaration()).getText(),
       optional: i,
-      defaultValue: ee(r, n.getName(), t)
+      defaultValue: se(n, r.getName(), t),
+      format: G(n == null ? void 0 : n.getTypeNode())
     };
   });
 }
-function fe(e, t, n) {
+function Te(e, t, r) {
   return e.getParameters().map((o) => {
     var a;
-    const r = o.getDeclarations(), i = r.length > 0 && r[0].getKindName() === "Parameter" ? r[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);
+    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);
     return {
       name: o.getName(),
       type: o.getTypeAtLocation(t).getText(),
       optional: s,
-      defaultValue: ee(
+      defaultValue: se(
         i,
         o.getName(),
-        n ?? t
-      )
+        r ?? t
+      ),
+      format: G(i == null ? void 0 : i.getTypeNode())
     };
   });
 }
-function W(e, t) {
-  return e.getParameters().map((n) => {
+function H(e, t) {
+  return e.getParameters().map((r) => {
     var s, a, c;
-    const o = n.getDeclarations(), r = o.length > 0 && o[0].getKindName() === "Parameter" ? o[0] : null, i = n.isOptional() || ((r == null ? void 0 : r.hasInitializer()) ?? !1) || (((s = r == null ? void 0 : r.hasQuestionToken) == null ? void 0 : s.call(r)) ?? !1);
+    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);
     return {
-      name: n.getName(),
-      type: r ? r.getType().getText() : ((c = (a = n.getValueDeclaration()) == null ? void 0 : a.getType()) == null ? void 0 : c.getText()) ?? "unknown",
+      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: ee(r, n.getName(), t)
+      defaultValue: se(n, r.getName(), t),
+      format: G(n == null ? void 0 : n.getTypeNode())
     };
   });
 }
-function ht(e) {
-  const t = e.filter((n) => n.name !== "ctx");
-  return t.length === 0 ? "()" : "(" + t.map((n) => `${n.name}${n.optional ? "?" : ""}: ${n.type}`).join(", ") + ")";
+function wt(e) {
+  const t = e.filter((r) => r.name !== "ctx");
+  return t.length === 0 ? "()" : "(" + t.map((r) => `${r.name}${r.optional ? "?" : ""}: ${r.type}`).join(", ") + ")";
 }
-function V(e) {
+function q(e) {
   return !!(e === "__samples__" || e.startsWith("__"));
 }
-function E(e, t, n = /* @__PURE__ */ new Set()) {
+function E(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, n) : !1;
+    return o ? E(o, t, r) : !1;
   }
   if (e.isTuple())
-    return e.getTupleElements().every((o) => E(o, t, n));
+    return e.getTupleElements().every((o) => E(o, t, r));
   if (e.isUnion())
-    return e.getUnionTypes().every((o) => E(o, t, n));
+    return e.getUnionTypes().every((o) => E(o, t, r));
   if (e.isIntersection())
-    return e.getIntersectionTypes().every((o) => E(o, t, n));
+    return e.getIntersectionTypes().every((o) => E(o, t, r));
   if (e.isObject()) {
     const o = e.getText(t);
-    if (n.has(o))
+    if (r.has(o))
       return !0;
-    n.add(o);
-    const r = e.getStringIndexType(), i = e.getNumberIndexType();
-    if (r || i)
-      return [r, i].every(
-        (a) => !a || E(a, t, n)
+    r.add(o);
+    const n = e.getStringIndexType(), i = e.getNumberIndexType();
+    if (n || i)
+      return [n, i].every(
+        (a) => !a || E(a, t, r)
       );
     const s = e.getProperties();
     return s.length === 0 ? !0 : s.every((a) => {
       const c = a.getTypeAtLocation(t);
-      return E(c, t, n);
+      return E(c, t, r);
     });
   }
   return !1;
 }
-async function Mt(e) {
-  const t = e.session === void 0, n = Te(e.session ?? he());
+function jt(e, t) {
+  return async (r) => {
+    let o = () => t(r);
+    for (let n = e.length - 1; n >= 0; n--) {
+      const i = e[n], s = o;
+      o = () => i(r, s);
+    }
+    return o();
+  };
+}
+function At(e, t) {
+  return jt(e, t);
+}
+function Gt(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);
+}
+async function Zt(e) {
+  const t = e.session === void 0, r = je(e.session ?? we());
   try {
-    return await Tt(e, n);
+    return await $t(e, r);
   } finally {
-    t && n.dispose();
+    t && r.dispose();
   }
 }
-async function Tt(e, t) {
+async function $t(e, t) {
   const {
-    sourceFile: n,
+    sourceFile: r,
     namespace: o = "",
-    tsconfig: r,
+    tsconfig: n,
     includeInstances: i = !1
-  } = e, s = t.projectFor(r), a = t.sourceFileFor(n, r), c = Y.basename(n), l = I(St(c)), u = I(o), f = [];
-  for (const [p, T] of a.getExportedDeclarations()) {
-    const d = T.find(
+  } = 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"
     );
-    if (!d)
+    if (!T)
       continue;
-    const m = p === "default" ? d.getName() : p;
-    if (!m || G(m))
+    const m = p === "default" ? T.getName() : p;
+    if (!m || Q(m))
       continue;
-    const b = I(m);
-    for (const y of d.getStaticMethods()) {
-      const h = y.getName();
-      if (G(h))
+    const h = R(m);
+    for (const y of T.getStaticMethods()) {
+      const d = y.getName();
+      if (Q(d))
         continue;
-      const g = y.getScope();
-      if (g === L.Private || g === L.Protected)
+      const b = y.getScope();
+      if (b === V.Private || b === V.Protected)
         continue;
-      const x = y.getSignature(), S = U(x, y), v = x.getReturnType().getText(), w = y.isAsync(), $ = [l, b, I(h)];
+      const x = y.getSignature(), g = J(x, y), w = x.getReturnType().getText(), v = y.isAsync(), A = [l, h, R(d)];
       f.push(
-        await bt(
+        await Nt(
           s,
           a,
           u,
-          $,
-          S,
-          v,
+          A,
+          g,
           w,
-          r,
+          v,
+          n,
           t
         )
       );
     }
     if (i) {
       {
-        const h = d.getConstructors()[0] ?? null;
-        let g = [];
-        if (h) {
-          const j = h.getSignature();
-          g = U(j, h);
+        const d = T.getConstructors()[0] ?? null;
+        let b = [];
+        if (d) {
+          const j = d.getSignature();
+          b = J(j, d);
         }
-        const x = [l, b], S = X(u, x), v = g.filter((j) => j.name !== "ctx"), w = v.filter((j) => !j.optional).map((j) => j.name), $ = {};
-        for (const j of v)
-          $[j.name] = await A(
+        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(
             s,
             a,
             j.type,
-            r,
+            n,
             t
           );
         f.push({
-          id: S,
+          id: g,
           host: "ts",
           namespace: u,
           path: x,
@@ -1502,7 +1595,7 @@ async function Tt(e, t) {
           async: !1,
           streaming: !1,
           safe: !1,
-          input: { type: "object", properties: $, required: w },
+          input: { type: "object", properties: A, required: v },
           output: {
             type: "object",
             properties: { instanceId: { type: "string" } },
@@ -1511,45 +1604,45 @@ async function Tt(e, t) {
           envelope: {},
           typeText: {
             lang: "ts",
-            input: xt(g),
+            input: Ot(b),
             output: "{ instanceId: string }"
           }
         });
       }
-      for (const y of d.getInstanceMethods()) {
-        const h = y.getName();
-        if (G(h))
+      for (const y of T.getInstanceMethods()) {
+        const d = y.getName();
+        if (Q(d))
           continue;
-        const g = y.getScope();
-        if (g === L.Private || g === L.Protected)
+        const b = y.getScope();
+        if (b === V.Private || b === V.Protected)
           continue;
-        const x = y.getSignature(), S = U(x, y), v = x.getReturnType().getText(), w = y.isAsync(), $ = [l, b, I(h)], j = X(u, $), P = S.filter((O) => O.name !== "ctx"), B = P.filter((O) => !O.optional).map((O) => O.name), R = {};
-        for (const O of P)
-          R[O.name] = await A(
+        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(
             s,
             a,
             O.type,
-            r,
+            n,
             t
           );
-        const _ = v.replace(/^Promise<(.+)>$/, "$1").trim(), Pe = await A(
+        const M = w.replace(/^Promise<(.+)>$/, "$1").trim(), Z = await N(
           s,
           a,
-          _,
-          r,
+          M,
+          n,
           t
         );
         f.push({
           id: j,
           host: "ts",
           namespace: u,
-          path: $,
+          path: A,
           kind: "instance-method",
-          async: w,
+          async: v,
           streaming: !1,
           safe: !1,
-          input: { type: "object", properties: R, required: B },
-          output: Pe,
+          input: { type: "object", properties: _, required: F },
+          output: Z,
           envelope: {
             type: "object",
             properties: { instanceId: { type: "string" } },
@@ -1557,8 +1650,8 @@ async function Tt(e, t) {
           },
           typeText: {
             lang: "ts",
-            input: Ae(S),
-            output: _
+            input: Ie(g),
+            output: M
           }
         });
       }
@@ -1566,17 +1659,17 @@ async function Tt(e, t) {
   }
   return f;
 }
-async function bt(e, t, n, o, r, i, s, a, c) {
-  const l = r.filter((m) => m.name !== "ctx"), u = l.filter((m) => !m.optional).map((m) => m.name), 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 A(
+    f[m.name] = await N(
       e,
       t,
       m.type,
       a,
       c
     );
-  const p = i.replace(/^Promise<(.+)>$/, "$1").trim(), T = await A(
+  const p = i.replace(/^Promise<(.+)>$/, "$1").trim(), S = await N(
     e,
     t,
     p,
@@ -1584,9 +1677,9 @@ async function bt(e, t, n, o, r, i, s, a, c) {
     c
   );
   return {
-    id: X(n, o),
+    id: re(r, o),
     host: "ts",
-    namespace: n,
+    namespace: r,
     path: o,
     kind: "action",
     async: s,
@@ -1594,46 +1687,46 @@ async function bt(e, t, n, o, r, i, s, a, c) {
     safe: !1,
     // action → false per §4
     input: { type: "object", properties: f, required: u },
-    output: T,
+    output: S,
     envelope: {},
     typeText: {
       lang: "ts",
-      input: Ae(r),
+      input: Ie(n),
       output: p
     }
   };
 }
-function X(e, t) {
+function re(e, t) {
   return (e.raw ? [e, ...t] : t).map((o) => o.words.join("-")).join("/");
 }
-function I(e) {
-  return { raw: e, words: $e(e) };
+function R(e) {
+  return { raw: e, words: Fe(e) };
 }
-function St(e) {
+function Pt(e) {
   return e.replace(/\.[^.]+$/, "").replace(/[._]+/g, "-");
 }
-function U(e, t) {
-  return e.getParameters().map((n) => {
+function J(e, t) {
+  return e.getParameters().map((r) => {
     var s;
-    const o = n.getDeclarations(), r = o.length > 0 && o[0].getKindName() === "Parameter" ? o[0] : null, i = n.isOptional() || ((r == null ? void 0 : r.hasInitializer()) ?? !1) || (((s = r == null ? void 0 : r.hasQuestionToken) == null ? void 0 : s.call(r)) ?? !1);
+    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);
     return {
-      name: n.getName(),
-      type: n.getTypeAtLocation(t).getText(),
+      name: r.getName(),
+      type: r.getTypeAtLocation(t).getText(),
       optional: i
     };
   });
 }
-function Ae(e) {
-  const t = e.filter((n) => n.name !== "ctx");
-  return t.length === 0 ? "()" : "(" + t.map((n) => `${n.name}${n.optional ? "?" : ""}: ${n.type}`).join(", ") + ")";
+function Ie(e) {
+  const t = e.filter((r) => r.name !== "ctx");
+  return t.length === 0 ? "()" : "(" + t.map((r) => `${r.name}${r.optional ? "?" : ""}: ${r.type}`).join(", ") + ")";
 }
-function xt(e) {
+function Ot(e) {
   return e.length === 0 ? "()" : "(" + e.map((t) => `${t.name}${t.optional ? "?" : ""}: ${t.type}`).join(", ") + ")";
 }
-function G(e) {
+function Q(e) {
   return !!(e === "__samples__" || e.startsWith("__") || e.startsWith("_"));
 }
-const vt = /* @__PURE__ */ new Map([
+const kt = /* @__PURE__ */ new Map([
   // TypeScript variants
   [".ts", "ts"],
   [".tsx", "ts"],
@@ -1648,21 +1741,21 @@ const vt = /* @__PURE__ */ new Map([
   // Java / Kotlin (both are JVM host languages for the purposes of routing)
   [".java", "java"]
 ]);
-function wt(e) {
-  const t = Oe.extname(e).toLowerCase();
-  return vt.get(t);
+function Ft(e) {
+  const t = Ce.extname(e).toLowerCase();
+  return kt.get(t);
 }
-function jt(e) {
+function It(e) {
   return e.language ?? "ts";
 }
-function $t(e, t) {
-  const n = wt(t);
-  return n === void 0 ? !1 : n === jt(e);
+function Et(e, t) {
+  const r = Ft(t);
+  return r === void 0 ? !1 : r === It(e);
 }
-function Vt(e, t) {
-  return t.filter((n) => $t(e, n));
+function Ht(e, t) {
+  return t.filter((r) => Et(e, r));
 }
-function At(e) {
+function Ct(e) {
   return {
     oneOf: [
       {
@@ -1696,27 +1789,27 @@ function At(e) {
     ]
   };
 }
-function Pt(e) {
+function Rt(e) {
   return {
     operationConst: e.id,
     itemsSchema: e.input,
-    resultSchema: At(e.output)
+    resultSchema: Ct(e.output)
   };
 }
-function Nt(e, t = {}) {
-  const n = new Set(t.exclude ?? []), o = /* @__PURE__ */ new Map();
-  for (const r of e) {
-    if (n.has(r.id))
+function Lt(e, t = {}) {
+  const r = new Set(t.exclude ?? []), o = /* @__PURE__ */ new Map();
+  for (const n of e) {
+    if (r.has(n.id))
       continue;
-    const i = o.get(r.kind);
-    i ? i.push(r) : o.set(r.kind, [r]);
+    const i = o.get(n.kind);
+    i ? i.push(n) : o.set(n.kind, [n]);
   }
   return o;
 }
-function pe(e) {
+function Se(e) {
   return { type: "string", enum: [e] };
 }
-function me(e, t) {
+function be(e, t) {
   return {
     type: "object",
     required: ["operation", "items"],
@@ -1734,39 +1827,39 @@ function me(e, t) {
     additionalProperties: !0
   };
 }
-function Ot(e) {
+function _t(e) {
   if (e.length === 0)
     throw new Error("buildBatchKindSchema: at least one operation is required");
-  const t = e.map(Pt);
+  const t = e.map(Rt);
   if (e.length === 1) {
-    const [r] = e, [i] = t;
+    const [n] = e, [i] = t;
     return {
-      input: me(i, pe(r.id)),
+      input: be(i, Se(n.id)),
       output: { type: "array", items: i.resultSchema }
     };
   }
-  const n = e.map(
-    (r, i) => me(t[i], pe(r.id))
-  ), o = D(
-    n
+  const r = e.map(
+    (n, i) => be(t[i], Se(n.id))
+  ), o = U(
+    r
   );
   return {
     input: {
-      oneOf: n,
+      oneOf: r,
       ...o ? { discriminator: o } : {}
     },
     output: {
-      oneOf: t.map((r) => ({ type: "array", items: r.resultSchema }))
+      oneOf: t.map((n) => ({ type: "array", items: n.resultSchema }))
     },
     ...o ? { discriminator: o } : {}
   };
 }
-function qt(e, t = {}) {
-  const n = Nt(e.operations, t), o = [];
-  for (const [r, i] of n) {
-    const { input: s, output: a } = Ot(i), c = Ie(`_batch/${r}`, e, {
-      kind: r,
-      safe: r === "query",
+function Jt(e, t = {}) {
+  const r = Lt(e.operations, t), o = [];
+  for (const [n, i] of r) {
+    const { input: s, output: a } = _t(i), c = Me(`_batch/${n}`, e, {
+      kind: n,
+      safe: n === "query",
       input: s,
       output: a
     });
@@ -1778,21 +1871,25 @@ function qt(e, t = {}) {
   return o;
 }
 export {
-  Ot as buildBatchKindSchema,
-  qt as buildBatchMountedOperations,
-  Ft as clearPersistentProjectCache,
-  _t as composeSchemas,
-  he as createExtractionSession,
-  Pt as deriveBatchOperationBranch,
-  jt as effectiveLanguage,
-  Lt as extract,
-  Mt as extractClasses,
-  Nt as groupBatchableOperationsByKind,
-  _e as isPrimitiveOnlyInputSchema,
-  wt as languageOfSource,
-  $t as pluginConsumesSource,
-  Rt as pluginsToEnvelopeMiddlewares,
-  Vt as sourcesForPlugin,
-  Ie as syntheticOp,
-  $e as tokenize
+  _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
 };