@adhd/apigen-core-client 0.1.1 → 0.1.3

package/index.mjs

@@ -3,7 +3,7 @@ import $e from "node:fs";
 import * as Ae from "node:path";
 import Q from "node:path";
 import { createParser as Pe, createFormatter as Ne, SchemaGenerator as Oe, AnnotatedType as ne, StringType as re } from "ts-json-schema-generator";
-const le = Symbol.for("adhd.apigen.extraction-session");
+const fe = Symbol.for("adhd.apigen.extraction-session");
 function pe(e, t) {
   const r = [
     ...e.getImportDeclarations().map((o) => o.getModuleSpecifierSourceFile()),
@@ -23,7 +23,7 @@ function pe(e, t) {
     }
   }
 }
-function me(e) {
+function ge(e) {
   try {
     const t = $e.statSync(e);
     return `${t.mtimeMs}:${t.size}`;
@@ -31,16 +31,16 @@ function me(e) {
     return "nostat";
   }
 }
-const I = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-function Ee(e, t, r) {
-  const o = t ?? "", n = I.get(o);
+const C = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
+function ke(e, t, r) {
+  const o = t ?? "", n = C.get(o);
   let i = r;
   if (n && n.fileVersions.size > 0) {
     const c = [r], u = [...n.fileVersions.entries()].sort(
-      ([f], [l]) => f.localeCompare(l)
+      ([l], [f]) => l.localeCompare(f)
     );
-    for (const [f, l] of u)
-      f !== e && c.push(`${f}:${l}`);
+    for (const [l, f] of u)
+      l !== e && c.push(`${l}:${f}`);
     i = c.join("|");
   }
   const s = `${e}\0${t ?? ""}`;
@@ -48,9 +48,9 @@ function Ee(e, t, r) {
   return (!a || a.version !== i) && (a = { version: i, schemas: /* @__PURE__ */ new Map() }, B.set(s, a)), a.schemas;
 }
 function At() {
-  I.clear(), B.clear();
+  C.clear(), B.clear();
 }
-function ge() {
+function me() {
   const e = {
     projectsBuilt: 0,
     generatorsBuilt: 0,
@@ -59,7 +59,7 @@ function ge() {
   }, t = /* @__PURE__ */ new Map();
   let r = !1;
   return {
-    [le]: !0,
+    [fe]: !0,
     stats: e,
     schemaCache: /* @__PURE__ */ new Map(),
     aliasCache: /* @__PURE__ */ new WeakMap(),
@@ -69,26 +69,26 @@ function ge() {
       if (r)
         throw new Error("apigen-core: ExtractionSession used after dispose()");
       const i = n ?? "", s = n ? this.statVersion(n) : "";
-      let a = I.get(i);
+      let a = C.get(i);
       return a && a.tsconfigVersion !== s && (a = void 0), a || (a = { project: n ? new te({
         tsConfigFilePath: n,
         skipAddingFilesFromTsConfig: !0
-      }) : new te({ skipAddingFilesFromTsConfig: !0 }), tsconfigVersion: s, fileVersions: /* @__PURE__ */ new Map() }, I.set(i, a), e.projectsBuilt++), a.project;
+      }) : new te({ skipAddingFilesFromTsConfig: !0 }), tsconfigVersion: s, fileVersions: /* @__PURE__ */ new Map() }, C.set(i, a), e.projectsBuilt++), a.project;
     },
     sourceFileFor(n, i) {
-      const s = this.projectFor(i), a = I.get(i ?? ""), c = this.statVersion(n);
+      const s = this.projectFor(i), a = C.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 f = /* @__PURE__ */ new Set([n]);
-        pe(u, f);
-        for (const l of f)
-          l !== n && a.fileVersions.set(l, this.statVersion(l));
+        const l = /* @__PURE__ */ new Set([n]);
+        pe(u, l);
+        for (const f of l)
+          f !== n && a.fileVersions.set(f, this.statVersion(f));
       }
       return u;
     },
     statVersion(n) {
       let i = t.get(n);
-      return i === void 0 && (i = me(n), t.set(n, i)), i;
+      return i === void 0 && (i = ge(n), t.set(n, i)), i;
     },
     dispose() {
       r = !0, this.schemaCache.clear(), this.generatorCache.clear(), t.clear();
@@ -97,7 +97,7 @@ function ge() {
 }
 function de(e) {
   const t = e;
-  if (t[le] !== !0)
+  if (t[fe] !== !0)
     throw new Error(
       "apigen-core: unknown ExtractionSession implementation — create sessions with createExtractionSession()"
     );
@@ -114,39 +114,39 @@ function oe(e, t) {
     const i = n.$ref;
     if (typeof i == "string") {
       if (t) {
-        const l = t[i];
-        if (!l) {
-          const g = Object.keys(t).join(", ") || "(none)";
+        const f = t[i];
+        if (!f) {
+          const d = Object.keys(t).join(", ") || "(none)";
           throw new Error(
-            `[apigen-logical] $ref "${i}" cannot be resolved. Available $defs: ${g}`
+            `[apigen-logical] $ref "${i}" cannot be resolved. Available $defs: ${d}`
           );
         }
-        o.push(l);
+        o.push(f);
       }
       continue;
     }
     const s = n.oneOf;
     if (Array.isArray(s))
-      for (const l of s)
-        typeof l == "object" && l !== null && o.push(l);
+      for (const f of s)
+        typeof f == "object" && f !== null && o.push(f);
     const a = n.properties;
     if (a)
-      for (const l of Object.values(a))
-        o.push(l);
+      for (const f of Object.values(a))
+        o.push(f);
     const c = n.items;
     if (Array.isArray(c))
-      for (const l of c)
-        typeof l == "object" && l !== null && o.push(l);
+      for (const f of c)
+        typeof f == "object" && f !== null && o.push(f);
     else
       typeof c == "object" && c !== null && o.push(c);
     const u = n.additionalProperties;
     typeof u == "object" && u !== null && o.push(u);
-    const f = n.propertyNames;
-    typeof f == "object" && f !== null && o.push(f);
+    const l = n.propertyNames;
+    typeof l == "object" && l !== null && o.push(l);
   }
 }
 const ie = /* @__PURE__ */ new Set(["string", "number", "boolean", "integer"]);
-function ke(e) {
+function Ee(e) {
   if (typeof e != "object" || e === null)
     return !1;
   const t = e;
@@ -155,15 +155,27 @@ function ke(e) {
   const { type: r } = t;
   return typeof r == "string" ? ie.has(r) : Array.isArray(r) ? r.every((o) => ie.has(o) || o === "null") : Array.isArray(t.enum) && t.enum.length > 0 ? t.enum.every((o) => ["string", "number", "boolean"].includes(typeof o)) : !1;
 }
-function Ce(e) {
+function Ie(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(
-    ke
+    Ee
   );
 }
-function Ie(e) {
+function Pt(e) {
+  var r, o;
+  const t = [];
+  for (const n of e) {
+    const i = {
+      ...(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: n.id, envelope: i });
+  }
+  return t;
+}
+function Ce(e) {
   const t = {}, r = (o) => {
     for (const n of ["definitions", "$defs"]) {
       const i = o[n];
@@ -191,30 +203,30 @@ function Fe(e, t) {
     'apigen calling convention: all domain parameters go inside a "data" envelope — e.g. { "data": { ... } }' + (t ? "." : " (an empty object for this zero-parameter tool).")
   ];
   return e.length > 0 && r.push(
-    `Field(s) ${e.map((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-naming's envelopeMetaKey/envelopeCliFlag/envelopeEnvVar for the HTTP-header / CLI-flag / env-var equivalents.`
+    `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 Pt(e, t, r) {
-  Ie(e);
+function Nt(e, t, r) {
+  Ce(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 ?? [], u = {}, f = [];
+    const s = (r == null ? void 0 : r[n]) ?? {}, a = i.input.properties ?? {}, c = i.input.required ?? [], u = {}, l = [], f = {};
     for (const y of t)
       if (y.envelope && s[y.id] !== !1)
-        for (const [h, T] of Object.entries(y.envelope))
-          u[h] = T, f.includes(h) || f.push(h);
-    const l = {
+        for (const [m, v] of Object.entries(y.envelope))
+          u[m] = v, f[m] = y.id, l.includes(m) || l.push(m);
+    const d = {
       type: "object",
       properties: a,
       additionalProperties: !1,
       ...c.length > 0 ? { required: c } : {}
-    }, g = i.safe === !0 || Ce(i.input), m = i.input.definitions, p = i.input.$defs;
+    }, g = i.safe === !0 || Ie(i.input), p = i.input.definitions, T = i.input.$defs;
     o[n] = {
       input: {
         type: "object",
-        properties: { ...u, data: l },
+        properties: { ...u, data: d },
         required: [
-          ...f,
+          ...l,
           ...c.length > 0 ? ["data"] : []
         ],
         // BUG-APIGEN-017: reject any property that isn't a declared envelope
@@ -225,13 +237,18 @@ function Pt(e, t, r) {
           Object.keys(u),
           Object.keys(a).length > 0
         ),
-        ...m ? { definitions: m } : {},
-        ...p ? { $defs: p } : {}
+        ...p ? { definitions: p } : {},
+        ...T ? { $defs: T } : {}
       },
       output: i.output,
       // Carry the ctx-param flag through to dispatch (BUG-APIGEN-001).
       ...i.hasCtx ? { hasCtx: !0 } : {},
-      "x-apigen-safe": g
+      "x-apigen-safe": g,
+      // 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
+      // `x-apigen-safe`'s own "absent means nothing to report" convention.
+      ...Object.keys(f).length > 0 ? { "x-apigen-envelope": f } : {}
     };
   }
   return o;
@@ -320,18 +337,18 @@ async function ye(e, t, r) {
       return { type: "object", additionalProperties: await t(i.getText()) };
     const a = {};
     for (const c of s) {
-      const u = c.getName(), l = c.getDeclarations()[0];
-      let g;
-      if (l)
+      const u = c.getName(), f = c.getDeclarations()[0];
+      let d;
+      if (f)
         try {
-          g = c.getTypeAtLocation(l);
+          d = c.getTypeAtLocation(f);
         } catch {
-          g = void 0;
+          d = void 0;
         }
-      if (g !== void 0 && g.getCallSignatures().length > 0)
+      if (d !== void 0 && d.getCallSignatures().length > 0)
         continue;
-      const m = g !== void 0 ? Le(g, l) : void 0;
-      a[u] = m !== void 0 ? await t(m) : {};
+      const g = d !== void 0 ? Le(d, f) : void 0;
+      a[u] = g !== void 0 ? await t(g) : {};
     }
     return Object.keys(a).length > 0 ? { type: "object", properties: a } : {};
   }
@@ -356,12 +373,12 @@ function J(e) {
     const n = [];
     let i = !0;
     for (const a of t) {
-      const c = a[o], u = c && (c.type === "string" || c.type === "number"), f = c == null ? void 0 : c.enum;
-      if (!u || !Array.isArray(f) || f.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(f[0]));
+      n.push(String(l[0]));
     }
     if (!i || new Set(n).size !== n.length)
       continue;
@@ -415,7 +432,7 @@ function M(e, t, r) {
   if (o.startsWith("{") && o.endsWith("}")) {
     const i = o.slice(1, -1).trim(), s = {};
     for (const a of i.split(";").filter(Boolean)) {
-      const [c, u] = a.split(":").map((f) => f.trim());
+      const [c, u] = a.split(":").map((l) => l.trim());
       c && u && (s[c.replace("?", "")] = M(u, t + 1, r));
     }
     return { type: "object", properties: s };
@@ -448,7 +465,7 @@ function Ke(e) {
   if (r.length !== 0)
     return he(r);
 }
-async function De(e, t) {
+async function qe(e, t) {
   const r = e.trim(), o = Ve(r);
   if (o !== void 0) {
     const s = he(o);
@@ -516,7 +533,7 @@ function ae(e) {
   }
   return t;
 }
-function qe(e, t) {
+function De(e, t) {
   return (r) => {
     r.addNodeParser({
       supportsNode(o) {
@@ -545,21 +562,21 @@ function qe(e, t) {
     });
   };
 }
-let k;
+let E;
 function We() {
-  if (k)
-    return k;
+  if (E)
+    return E;
   try {
     const e = Q.dirname(
       require.resolve("ts-json-schema-generator/package.json")
     );
-    k = require(require.resolve("typescript", {
+    E = require(require.resolve("typescript", {
       paths: [e]
     }));
   } catch {
-    k = require("typescript");
+    E = require("typescript");
   }
-  return k;
+  return E;
 }
 const O = /* @__PURE__ */ new Map();
 function Be() {
@@ -689,29 +706,29 @@ function Ye(e) {
 function et(e, t, r) {
   const { DEFAULT_CONFIG: o } = require("ts-json-schema-generator/dist/src/Config.js"), n = { ...o, ...e }, i = n.path, s = He(i, n.tsconfig);
   let a;
-  a = r ? r.statVersion(i) : me(i);
+  a = r ? r.statVersion(i) : ge(i);
   let c;
   if (s !== void 0) {
-    const f = (r == null ? void 0 : r.generatorCache.get(s)) ?? Ue(s);
-    f && f.version === a && (c = f.gen);
+    const l = (r == null ? void 0 : r.generatorCache.get(s)) ?? Ue(s);
+    l && l.version === a && (c = l.gen);
   }
   if (!c) {
-    const { createProgram: f } = require("ts-json-schema-generator/dist/factory/program.js"), l = We(), g = qe(
-      l.SyntaxKind.BigIntKeyword,
-      l.SyntaxKind.TypeReference
-    ), m = f(n), p = Pe(
-      m,
+    const { createProgram: l } = require("ts-json-schema-generator/dist/factory/program.js"), f = We(), d = De(
+      f.SyntaxKind.BigIntKeyword,
+      f.SyntaxKind.TypeReference
+    ), g = l(n), p = Pe(
+      g,
       n,
-      g
-    ), y = Ne(n);
+      d
+    ), T = Ne(n);
     if (c = new Oe(
-      m,
+      g,
       p,
-      y,
+      T,
       n
     ), r && r.stats.generatorsBuilt++, s !== void 0 && a !== void 0) {
-      const h = { version: a, gen: c };
-      Ge(s, h), r == null || r.generatorCache.set(s, h);
+      const y = { version: a, gen: c };
+      Ge(s, y), r == null || r.generatorCache.set(s, y);
     }
   }
   const u = c.createSchema(n.type);
@@ -778,50 +795,50 @@ async function A(e, t, r, o, n, i) {
   const u = n.schemaCache.get(a);
   if (u !== void 0)
     return n.stats.schemaCacheHits++, u;
-  const f = Ee(
+  const l = ke(
     s,
     o,
     n.statVersion(s)
-  ), l = f.get(r);
-  if (l !== void 0)
-    return n.stats.schemaCacheHits++, n.schemaCache.set(a, Promise.resolve(l)), l;
+  ), f = l.get(r);
+  if (f !== void 0)
+    return n.stats.schemaCacheHits++, n.schemaCache.set(a, Promise.resolve(f)), f;
   n.stats.schemaCacheMisses++;
-  const g = new Set(c);
-  g.add(a);
-  const m = ce(
+  const d = new Set(c);
+  d.add(a);
+  const g = ce(
     e,
     t,
     r,
     o,
     n,
-    g
-  ).then((p) => (f.set(r, p), p)).catch((p) => {
+    d
+  ).then((p) => (l.set(r, p), p)).catch((p) => {
     throw n.schemaCache.delete(a), p;
   });
-  return n.schemaCache.set(a, m), m;
+  return n.schemaCache.set(a, g), g;
 }
 async function ce(e, t, r, o, n, i) {
   if (["void", "undefined", "null", "Promise<void>"].includes(r))
     return { type: "null" };
   let s;
   if (n) {
-    const g = n.aliasCache.get(t);
-    s = g ?? ae(t), g || n.aliasCache.set(t, s);
+    const d = n.aliasCache.get(t);
+    s = d ?? ae(t), d || n.aliasCache.set(t, s);
   } else
     s = ae(t);
   const a = tt(r, s), c = U[a];
   if (c !== void 0)
     return c;
-  const u = await De(
+  const u = await qe(
     a,
-    (g) => A(e, t, g, o, n, i)
+    (d) => A(e, t, d, o, n, i)
   );
   if (u !== void 0)
     return u;
-  const f = (n == null ? void 0 : n.zodImportCache.get(t)) ?? Qe(t);
-  if (n && n.zodImportCache.set(t, f), !f)
+  const l = (n == null ? void 0 : n.zodImportCache.get(t)) ?? Qe(t);
+  if (n && n.zodImportCache.set(t, l), !l)
     try {
-      const g = {
+      const d = {
         path: t.getFilePath(),
         type: a,
         skipTypeCheck: !0,
@@ -848,27 +865,27 @@ async function ce(e, t, r, o, n, i) {
         // dereference/hoist pass and is tracked separately, unresolved, in
         // BUG-APIGEN-026's BACKLOG entry.
         topRef: !1
-      }, m = et(g, !0, n);
-      return Ye(m);
+      }, g = et(d, !0, n);
+      return Ye(g);
     } catch {
     }
   try {
-    const g = await Me(
+    const d = await Me(
       e,
       t,
       a,
-      (m) => ye(
-        m,
+      (g) => ye(
+        g,
         (p) => A(e, t, p, o, n, i),
         0
       )
     );
-    if (g !== void 0)
-      return g;
+    if (d !== void 0)
+      return d;
   } catch {
   }
-  const l = rt(a, s);
-  return M(l, 0, s);
+  const f = rt(a, s);
+  return M(f, 0, s);
 }
 function X(e, t, r) {
   if (e != null && e.hasInitializer()) {
@@ -918,8 +935,8 @@ function st(e, t) {
   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 Nt(e) {
-  const t = e.session === void 0, r = de(e.session ?? ge());
+async function Ot(e) {
+  const t = e.session === void 0, r = de(e.session ?? me());
   try {
     return await at(e, r);
   } finally {
@@ -927,77 +944,77 @@ async function Nt(e) {
   }
 }
 async function at(e, t) {
-  const { sourceFile: r, namespace: o = "", tsconfig: n } = e, i = t.projectFor(n), s = t.sourceFileFor(r, n), a = Q.basename(r), c = P(ft(a)), u = P(o), f = [];
-  for (const [m, p] of s.getExportedDeclarations()) {
-    if (m === "default" || _(m))
+  const { sourceFile: r, namespace: o = "", tsconfig: n } = e, i = t.projectFor(n), s = t.sourceFileFor(r, n), a = Q.basename(r), c = P(lt(a)), u = P(o), l = [];
+  for (const [g, p] of s.getExportedDeclarations()) {
+    if (g === "default" || _(g))
       continue;
-    const y = pt(p);
-    if (y) {
-      const d = y.getSignature(), S = ue(d, y), b = d.getReturnType().getText();
-      f.push(
+    const T = pt(p);
+    if (T) {
+      const h = T.getSignature(), S = ue(h, T), b = h.getReturnType().getText();
+      l.push(
         await L(
           i,
           s,
           u,
           c,
-          m,
+          g,
           S,
           b,
-          y.isAsync(),
+          T.isAsync(),
           n,
           t
         )
       );
       continue;
     }
-    const h = p.find(
-      (d) => d.getKindName() === "VariableDeclaration"
+    const y = p.find(
+      (h) => h.getKindName() === "VariableDeclaration"
     );
-    if (!h)
+    if (!y)
       continue;
-    const T = h.getInitializer(), x = T == null ? void 0 : T.getKindName();
-    if (T && ["ArrowFunction", "FunctionExpression"].includes(x ?? "")) {
-      const S = h.getType().getCallSignatures();
+    const m = y.getInitializer(), v = m == null ? void 0 : m.getKindName();
+    if (m && ["ArrowFunction", "FunctionExpression"].includes(v ?? "")) {
+      const S = y.getType().getCallSignatures();
       if (S.length === 0)
         continue;
-      const b = S[0], $ = fe(
+      const b = S[0], $ = le(
         b,
-        h,
-        h.getVariableStatement()
-      ), j = b.getReturnType().getText(), v = T.isAsync();
-      f.push(
+        y,
+        y.getVariableStatement()
+      ), j = b.getReturnType().getText(), x = m.isAsync();
+      l.push(
         await L(
           i,
           s,
           u,
           c,
-          m,
+          g,
           $,
           j,
-          v,
+          x,
           n,
           t
         )
       );
-    } else if (x === "ObjectLiteralExpression") {
-      const d = h.getType();
-      for (const S of d.getProperties()) {
+    } else if (v === "ObjectLiteralExpression") {
+      const h = y.getType();
+      for (const S of h.getProperties()) {
         const b = S.getName();
         if (_(b))
           continue;
-        const j = S.getTypeAtLocation(h).getCallSignatures();
+        const j = S.getTypeAtLocation(y).getCallSignatures();
         if (j.length === 0)
           continue;
-        const v = j[0], w = fe(
-          v,
-          h,
-          h.getVariableStatement()
-        ), F = v.getReturnType().getText(), K = [
+        const x = j[0], w = le(
+          x,
+          y,
+          y.getVariableStatement()
+        ), F = x.getReturnType().getText(), K = [
           c,
-          P(m),
+          P(g),
           P(b)
         ];
-        f.push(
+        l.push(
           await V(
             i,
             s,
@@ -1013,8 +1030,8 @@ async function at(e, t) {
         );
       }
     } else {
-      const d = h.getType(), S = d.getText();
-      if (E(d, h)) {
+      const h = y.getType(), S = h.getText();
+      if (k(h, y)) {
         const b = await A(
           i,
           s,
@@ -1022,32 +1039,32 @@ async function at(e, t) {
           n,
           t
         );
-        f.push(
-          ut(u, c, m, b)
+        l.push(
+          ut(u, c, g, b)
         );
       } else
         console.warn(
-          `[apigen-core] Skipping non-callable, non-serializable export: ${m}`
+          `[apigen-core] Skipping non-callable, non-serializable export: ${g}`
         );
     }
   }
-  const l = s.getDefaultExportSymbol();
-  if (l) {
-    const m = s.getExportAssignment((p) => !p.isExportEquals());
-    if (m) {
-      const p = m.getExpression(), y = p.getKindName();
-      if (["ArrowFunction", "FunctionExpression"].includes(y)) {
-        const T = p.getType().getCallSignatures();
-        if (T.length > 0) {
-          const x = T[0], d = D(x, m), S = x.getReturnType().getText(), b = p.isAsync();
-          f.push(
+  const f = s.getDefaultExportSymbol();
+  if (f) {
+    const g = s.getExportAssignment((p) => !p.isExportEquals());
+    if (g) {
+      const p = g.getExpression(), T = p.getKindName();
+      if (["ArrowFunction", "FunctionExpression"].includes(T)) {
+        const m = p.getType().getCallSignatures();
+        if (m.length > 0) {
+          const v = m[0], h = q(v, g), S = v.getReturnType().getText(), b = p.isAsync();
+          l.push(
             await L(
               i,
               s,
               u,
               c,
               "default",
-              d,
+              h,
               S,
               b,
               n,
@@ -1056,26 +1073,26 @@ async function at(e, t) {
           );
         }
       } else {
-        const h = p.getType();
-        for (const T of h.getProperties()) {
-          const x = T.getName();
-          if (_(x))
+        const y = p.getType();
+        for (const m of y.getProperties()) {
+          const v = m.getName();
+          if (_(v))
             continue;
-          const S = T.getTypeAtLocation(m).getCallSignatures();
+          const S = m.getTypeAtLocation(g).getCallSignatures();
           if (S.length === 0)
             continue;
-          const b = S[0], $ = D(b, m), j = b.getReturnType().getText(), v = [
+          const b = S[0], $ = q(b, g), j = b.getReturnType().getText(), x = [
             c,
             P("default"),
-            P(x)
+            P(v)
           ];
-          f.push(
+          l.push(
             await V(
               i,
               s,
               u,
-              v,
               x,
+              v,
               $,
               j,
               !1,
@@ -1086,21 +1103,21 @@ async function at(e, t) {
         }
       }
     } else {
-      const p = l.getDeclarations();
-      for (const y of p) {
-        if (y.getKindName() !== "FunctionDeclaration")
+      const p = f.getDeclarations();
+      for (const T of p) {
+        if (T.getKindName() !== "FunctionDeclaration")
           continue;
-        const h = y, T = h.getName(), x = T && T.length > 0 ? T : "default", d = h.getSignature(), S = ue(d, h), b = d.getReturnType().getText();
-        f.push(
+        const y = T, m = y.getName(), v = m && m.length > 0 ? m : "default", h = y.getSignature(), S = ue(h, y), b = h.getReturnType().getText();
+        l.push(
           await L(
             i,
             s,
             u,
             c,
-            x,
+            v,
             S,
             b,
-            h.isAsync(),
+            y.isAsync(),
             n,
             t
           )
@@ -1108,28 +1125,28 @@ async function at(e, t) {
       }
     }
   }
-  const g = lt(s);
-  if (g.length > 0)
-    for (const { name: m, sig: p } of g) {
-      if (_(m))
+  const d = ft(s);
+  if (d.length > 0)
+    for (const { name: g, sig: p } of d) {
+      if (_(g))
         continue;
-      const y = D(p), h = p.getReturnType().getText(), T = [c, P(m)];
-      f.push(
+      const T = q(p), y = p.getReturnType().getText(), m = [c, P(g)];
+      l.push(
         await V(
           i,
           s,
           u,
-          T,
           m,
+          g,
+          T,
           y,
-          h,
           !1,
           n,
           t
         )
       );
     }
-  return f;
+  return l;
 }
 function ct(e, t, r, o) {
   const n = /* @__PURE__ */ new Set(), i = (s) => {
@@ -1140,22 +1157,22 @@ function ct(e, t, r, o) {
     n.add(s);
     try {
       const a = s, c = {};
-      for (const [u, f] of Object.entries(a)) {
+      for (const [u, l] of Object.entries(a)) {
         if (u === "definitions" || u === "$defs") {
-          const l = u, g = t[l];
-          for (const [m, p] of Object.entries(
-            f
+          const f = u, d = t[f];
+          for (const [g, p] of Object.entries(
+            l
           )) {
-            const y = i(p), h = g[m];
-            if (h !== void 0 && JSON.stringify(h) !== JSON.stringify(y))
+            const T = i(p), y = d[g];
+            if (y !== void 0 && JSON.stringify(y) !== JSON.stringify(T))
               throw new Error(
-                `[apigen-core-client] Function "${r}": param "${o}" contributes a "${l}.${m}" 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}.${g}" 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.`
               );
-            g[m] = y;
+            d[g] = T;
           }
           continue;
         }
-        c[u] = i(f);
+        c[u] = i(l);
       }
       return c;
     } finally {
@@ -1165,12 +1182,12 @@ function ct(e, t, r, o) {
   return i(e);
 }
 async function L(e, t, r, o, n, i, s, a, c, u) {
-  const f = P(n);
+  const l = P(n);
   return V(
     e,
     t,
     r,
-    [o, f],
+    [o, l],
     n,
     i,
     s,
@@ -1180,24 +1197,24 @@ async function L(e, t, r, o, n, i, s, a, c, u) {
   );
 }
 async function V(e, t, r, o, n, i, s, a, c, u) {
-  const f = i.length > 0 && i[0].name === "ctx", l = i.filter((d) => d.name !== "ctx"), g = l.filter((d) => !d.optional).map((d) => d.name), m = {}, p = {
+  const l = i.length > 0 && i[0].name === "ctx", f = i.filter((h) => h.name !== "ctx"), d = f.filter((h) => !h.optional).map((h) => h.name), g = {}, p = {
     definitions: {},
     $defs: {}
   };
-  for (const d of l) {
-    const S = await A(e, t, d.type, c, u), b = ct(S, p, n, d.name);
-    d.defaultValue !== void 0 && st(b, d.defaultValue), m[d.name] = b;
+  for (const h of f) {
+    const S = await A(e, t, h.type, c, u), b = ct(S, p, n, h.name);
+    h.defaultValue !== void 0 && st(b, h.defaultValue), g[h.name] = b;
   }
-  const y = s.replace(/^Promise<(.+)>$/, "$1").trim(), h = await A(
+  const T = s.replace(/^Promise<(.+)>$/, "$1").trim(), y = await A(
     e,
     t,
-    y,
+    T,
     c,
     u
-  ), T = {
+  ), m = {
     type: "object",
-    properties: m,
-    required: g,
+    properties: g,
+    required: d,
     // 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.
@@ -1205,7 +1222,7 @@ async function V(e, t, r, o, n, i, s, a, c, u) {
     ...Object.keys(p.$defs).length > 0 ? { $defs: p.$defs } : {}
   };
   return {
-    id: xe(r, o),
+    id: ve(r, o),
     host: "ts",
     namespace: r,
     path: o,
@@ -1214,21 +1231,21 @@ async function V(e, t, r, o, n, i, s, a, c, u) {
     streaming: !1,
     safe: !1,
     // action → false per §4
-    input: T,
-    output: h,
+    input: m,
+    output: y,
     envelope: {},
     typeText: {
       lang: "ts",
-      input: mt(i),
-      output: y
+      input: gt(i),
+      output: T
     },
-    ...f ? { hasCtx: !0 } : {}
+    ...l ? { hasCtx: !0 } : {}
   };
 }
 function ut(e, t, r, o) {
   const n = P(r), i = [t, n];
   return {
-    id: xe(e, i),
+    id: ve(e, i),
     host: "ts",
     namespace: e,
     path: i,
@@ -1243,10 +1260,10 @@ function ut(e, t, r, o) {
     typeText: null
   };
 }
-function xe(e, t) {
+function ve(e, t) {
   return (e.raw ? [e, ...t] : t).map((o) => o.words.join("-")).join("/");
 }
-function ve(e) {
+function xe(e) {
   return e.split(/[-_.]+/).flatMap(
     (t) => (
       // Then split PascalCase / camelCase transitions
@@ -1255,12 +1272,12 @@ function ve(e) {
   ).map((t) => t.toLowerCase()).filter(Boolean);
 }
 function P(e) {
-  return { raw: e, words: ve(e) };
+  return { raw: e, words: xe(e) };
 }
-function ft(e) {
+function lt(e) {
   return e.replace(/\.[^.]+$/, "").replace(/[._]+/g, "-");
 }
-function lt(e) {
+function ft(e) {
   const t = [];
   for (const r of e.getStatements()) {
     if (r.getKindName() !== "ExpressionStatement")
@@ -1273,8 +1290,8 @@ function lt(e) {
       continue;
     const s = n.getRight(), a = s.getType();
     for (const c of a.getProperties()) {
-      const f = c.getTypeAtLocation(s).getCallSignatures();
-      f.length !== 0 && t.push({ name: c.getName(), sig: f[0] });
+      const l = c.getTypeAtLocation(s).getCallSignatures();
+      l.length !== 0 && t.push({ name: c.getName(), sig: l[0] });
     }
   }
   return t;
@@ -1302,7 +1319,7 @@ function ue(e, t) {
     };
   });
 }
-function fe(e, t, r) {
+function le(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);
@@ -1318,7 +1335,7 @@ function fe(e, t, r) {
     };
   });
 }
-function D(e, t) {
+function q(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);
@@ -1330,28 +1347,28 @@ function D(e, t) {
     };
   });
 }
-function mt(e) {
+function gt(e) {
   const t = e.filter((r) => r.name !== "ctx");
   return t.length === 0 ? "()" : "(" + t.map((r) => `${r.name}${r.optional ? "?" : ""}: ${r.type}`).join(", ") + ")";
 }
 function _(e) {
   return !!(e === "__samples__" || e.startsWith("__"));
 }
-function E(e, t, r = /* @__PURE__ */ new Set()) {
+function k(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 ? k(o, t, r) : !1;
   }
   if (e.isTuple())
-    return e.getTupleElements().every((o) => E(o, t, r));
+    return e.getTupleElements().every((o) => k(o, t, r));
   if (e.isUnion())
-    return e.getUnionTypes().every((o) => E(o, t, r));
+    return e.getUnionTypes().every((o) => k(o, t, r));
   if (e.isIntersection())
-    return e.getIntersectionTypes().every((o) => E(o, t, r));
+    return e.getIntersectionTypes().every((o) => k(o, t, r));
   if (e.isObject()) {
     const o = e.getText(t);
     if (r.has(o))
@@ -1360,55 +1377,55 @@ 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 || k(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 k(c, t, r);
     });
   }
   return !1;
 }
-async function Ot(e) {
-  const t = e.session === void 0, r = de(e.session ?? ge());
+async function kt(e) {
+  const t = e.session === void 0, r = de(e.session ?? me());
   try {
-    return await gt(e, r);
+    return await mt(e, r);
   } finally {
     t && r.dispose();
   }
 }
-async function gt(e, t) {
+async function mt(e, t) {
   const {
     sourceFile: r,
     namespace: o = "",
     tsconfig: n,
     includeInstances: i = !1
-  } = e, s = t.projectFor(n), a = t.sourceFileFor(r, n), c = Q.basename(r), u = C(yt(c)), f = C(o), l = [];
-  for (const [g, m] of a.getExportedDeclarations()) {
-    const p = m.find(
-      (T) => T.getKindName() === "ClassDeclaration"
+  } = e, s = t.projectFor(n), a = t.sourceFileFor(r, n), c = Q.basename(r), u = I(yt(c)), l = I(o), f = [];
+  for (const [d, g] of a.getExportedDeclarations()) {
+    const p = g.find(
+      (m) => m.getKindName() === "ClassDeclaration"
     );
     if (!p)
       continue;
-    const y = g === "default" ? p.getName() : g;
-    if (!y || W(y))
+    const T = d === "default" ? p.getName() : d;
+    if (!T || W(T))
       continue;
-    const h = C(y);
-    for (const T of p.getStaticMethods()) {
-      const x = T.getName();
-      if (W(x))
+    const y = I(T);
+    for (const m of p.getStaticMethods()) {
+      const v = m.getName();
+      if (W(v))
         continue;
-      const d = T.getScope();
-      if (d === R.Private || d === R.Protected)
+      const h = m.getScope();
+      if (h === R.Private || h === R.Protected)
         continue;
-      const S = T.getSignature(), b = q(S, T), $ = S.getReturnType().getText(), j = T.isAsync(), v = [u, h, C(x)];
-      l.push(
+      const S = m.getSignature(), b = D(S, m), $ = S.getReturnType().getText(), j = m.isAsync(), x = [u, y, I(v)];
+      f.push(
         await dt(
           s,
           a,
-          f,
-          v,
+          l,
+          x,
           b,
           $,
           j,
@@ -1419,31 +1436,31 @@ async function gt(e, t) {
     }
     if (i) {
       {
-        const x = p.getConstructors()[0] ?? null;
-        let d = [];
-        if (x) {
-          const w = x.getSignature();
-          d = q(w, x);
+        const v = p.getConstructors()[0] ?? null;
+        let h = [];
+        if (v) {
+          const w = v.getSignature();
+          h = D(w, v);
         }
-        const S = [u, h], b = Z(f, S), $ = d.filter((w) => w.name !== "ctx"), j = $.filter((w) => !w.optional).map((w) => w.name), v = {};
+        const S = [u, y], b = Z(l, S), $ = h.filter((w) => w.name !== "ctx"), j = $.filter((w) => !w.optional).map((w) => w.name), x = {};
         for (const w of $)
-          v[w.name] = await A(
+          x[w.name] = await A(
             s,
             a,
             w.type,
             n,
             t
           );
-        l.push({
+        f.push({
           id: b,
           host: "ts",
-          namespace: f,
+          namespace: l,
           path: S,
           kind: "constructor",
           async: !1,
           streaming: !1,
           safe: !1,
-          input: { type: "object", properties: v, required: j },
+          input: { type: "object", properties: x, required: j },
           output: {
             type: "object",
             properties: { instanceId: { type: "string" } },
@@ -1452,19 +1469,19 @@ async function gt(e, t) {
           envelope: {},
           typeText: {
             lang: "ts",
-            input: ht(d),
+            input: ht(h),
             output: "{ instanceId: string }"
           }
         });
       }
-      for (const T of p.getInstanceMethods()) {
-        const x = T.getName();
-        if (W(x))
+      for (const m of p.getInstanceMethods()) {
+        const v = m.getName();
+        if (W(v))
           continue;
-        const d = T.getScope();
-        if (d === R.Private || d === R.Protected)
+        const h = m.getScope();
+        if (h === R.Private || h === R.Protected)
           continue;
-        const S = T.getSignature(), b = q(S, T), $ = S.getReturnType().getText(), j = T.isAsync(), v = [u, h, C(x)], w = Z(f, v), F = b.filter((N) => N.name !== "ctx"), K = F.filter((N) => !N.optional).map((N) => N.name), Y = {};
+        const S = m.getSignature(), b = D(S, m), $ = S.getReturnType().getText(), j = m.isAsync(), x = [u, y, I(v)], w = Z(l, x), F = b.filter((N) => N.name !== "ctx"), K = F.filter((N) => !N.optional).map((N) => N.name), Y = {};
         for (const N of F)
           Y[N.name] = await A(
             s,
@@ -1480,11 +1497,11 @@ async function gt(e, t) {
           n,
           t
         );
-        l.push({
+        f.push({
           id: w,
           host: "ts",
-          namespace: f,
-          path: v,
+          namespace: l,
+          path: x,
           kind: "instance-method",
           async: j,
           streaming: !1,
@@ -1505,22 +1522,22 @@ async function gt(e, t) {
       }
     }
   }
-  return l;
+  return f;
 }
 async function dt(e, t, r, o, n, i, s, a, c) {
-  const u = n.filter((y) => y.name !== "ctx"), f = u.filter((y) => !y.optional).map((y) => y.name), l = {};
-  for (const y of u)
-    l[y.name] = await A(
+  const u = n.filter((T) => T.name !== "ctx"), l = u.filter((T) => !T.optional).map((T) => T.name), f = {};
+  for (const T of u)
+    f[T.name] = await A(
       e,
       t,
-      y.type,
+      T.type,
       a,
       c
     );
-  const g = i.replace(/^Promise<(.+)>$/, "$1").trim(), m = await A(
+  const d = i.replace(/^Promise<(.+)>$/, "$1").trim(), g = await A(
     e,
     t,
-    g,
+    d,
     a,
     c
   );
@@ -1534,26 +1551,26 @@ async function dt(e, t, r, o, n, i, s, a, c) {
     streaming: !1,
     safe: !1,
     // action → false per §4
-    input: { type: "object", properties: l, required: f },
-    output: m,
+    input: { type: "object", properties: f, required: l },
+    output: g,
     envelope: {},
     typeText: {
       lang: "ts",
       input: we(n),
-      output: g
+      output: d
     }
   };
 }
 function Z(e, t) {
   return (e.raw ? [e, ...t] : t).map((o) => o.words.join("-")).join("/");
 }
-function C(e) {
-  return { raw: e, words: ve(e) };
+function I(e) {
+  return { raw: e, words: xe(e) };
 }
 function yt(e) {
   return e.replace(/\.[^.]+$/, "").replace(/[._]+/g, "-");
 }
-function q(e, t) {
+function D(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);
@@ -1596,23 +1613,24 @@ function St(e) {
 function bt(e) {
   return e.language ?? "ts";
 }
-function xt(e, t) {
+function vt(e, t) {
   const r = St(t);
   return r === void 0 ? !1 : r === bt(e);
 }
 function Et(e, t) {
-  return t.filter((r) => xt(e, r));
+  return t.filter((r) => vt(e, r));
 }
 export {
   At as clearPersistentProjectCache,
-  Pt as composeSchemas,
-  ge as createExtractionSession,
+  Nt as composeSchemas,
+  me as createExtractionSession,
   bt as effectiveLanguage,
-  Nt as extract,
-  Ot as extractClasses,
-  Ce as isPrimitiveOnlyInputSchema,
+  Ot as extract,
+  kt as extractClasses,
+  Ie as isPrimitiveOnlyInputSchema,
   St as languageOfSource,
-  xt as pluginConsumesSource,
+  vt as pluginConsumesSource,
+  Pt as pluginsToEnvelopeMiddlewares,
   Et as sourcesForPlugin,
-  ve as tokenize
+  xe as tokenize
 };