@ythalorossy/openfda 1.1.0 → 1.2.0

package/dist/index.js

@@ -1,25 +1,25 @@
 #!/usr/bin/env node
-var M = Object.defineProperty;
-var G = (e, t, n) => t in e ? M(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
-var D = (e, t, n) => G(e, typeof t != "symbol" ? t + "" : t, n);
-import { McpServer as K } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport as L } from "@modelcontextprotocol/sdk/server/stdio.js";
-import d from "zod";
-const j = `OPENFDA_API_KEY is not set. This server reads the key from its process environment; a .env file is not loaded. Add it to the "env" block of your MCP client configuration. Get a free key at https://open.fda.gov/apis/authentication/
+var B = Object.defineProperty;
+var J = (e, t, n) => t in e ? B(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var A = (e, t, n) => J(e, typeof t != "symbol" ? t + "" : t, n);
+import { McpServer as z } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport as H } from "@modelcontextprotocol/sdk/server/stdio.js";
+import u from "zod";
+const Q = `OPENFDA_API_KEY is not set. This server reads the key from its process environment; a .env file is not loaded. Add it to the "env" block of your MCP client configuration. Get a free key at https://open.fda.gov/apis/authentication/
 
-To run without a key on the unauthenticated tier (40 requests/minute, 1,000/day per IP, and no rate-limit headers), set OPENFDA_ALLOW_KEYLESS=1.`, q = "openfda: OPENFDA_ALLOW_KEYLESS=1 — using the unauthenticated tier (40 requests/minute, no rate-limit visibility). Set OPENFDA_API_KEY for 240 requests/minute.", Y = "openfda: OPENFDA_API_KEY is not set; every tool call will return a configuration error. See https://open.fda.gov/apis/authentication/";
-function E(e = process.env) {
+To run without a key on the unauthenticated tier (40 requests/minute, 1,000/day per IP, and no rate-limit headers), set OPENFDA_ALLOW_KEYLESS=1.`, Z = "openfda: OPENFDA_ALLOW_KEYLESS=1 — using the unauthenticated tier (40 requests/minute, no rate-limit visibility). Set OPENFDA_API_KEY for 240 requests/minute.", ee = "openfda: OPENFDA_API_KEY is not set; every tool call will return a configuration error. See https://open.fda.gov/apis/authentication/";
+function O(e = process.env) {
   var n;
   const t = (n = e.OPENFDA_API_KEY) == null ? void 0 : n.trim();
-  return t ? { ok: !0, apiKey: t } : e.OPENFDA_ALLOW_KEYLESS === "1" ? { ok: !0, apiKey: null } : { ok: !1, message: j };
+  return t ? { ok: !0, apiKey: t } : e.OPENFDA_ALLOW_KEYLESS === "1" ? { ok: !0, apiKey: null } : { ok: !1, message: Q };
 }
-function B(e = process.env) {
-  const t = E(e);
-  t.ok ? t.apiKey === null && console.error(q) : console.error(Y);
+function te(e = process.env) {
+  const t = O(e);
+  t.ok ? t.apiKey === null && console.error(Z) : console.error(ee);
 }
-class J {
+class ne {
   constructor(t) {
-    D(this, "registerTool", (t) => this.server.registerTool(
+    A(this, "registerTool", (t) => this.server.registerTool(
       t.name,
       {
         title: t.name,
@@ -27,9 +27,9 @@ class J {
         inputSchema: t.inputSchema
       },
       async (n) => {
-        const a = E();
-        return a.ok ? t.handler(n) : {
-          content: [{ type: "text", text: a.message }],
+        const r = O();
+        return r.ok ? t.handler(n) : {
+          content: [{ type: "text", text: r.message }],
           isError: !0
         };
       }
@@ -37,14 +37,14 @@ class J {
     this.server = t;
   }
 }
-const m = (e) => Array.isArray(e) ? e : [], P = (e) => {
+const m = (e) => Array.isArray(e) ? e : [], M = (e) => {
   const t = m(e.warnings);
   return t.length > 0 ? t : m(e.warnings_and_cautions);
 };
-function W(e) {
+function re(e) {
   return {
     boxed_warning: m(e.boxed_warning),
-    warnings: P(e),
+    warnings: M(e),
     warnings_and_cautions: m(e.warnings_and_cautions),
     contraindications: m(e.contraindications),
     drug_interactions: m(e.drug_interactions),
@@ -57,11 +57,11 @@ function W(e) {
     pregnancy_or_breast_feeding: m(e.pregnancy_or_breast_feeding)
   };
 }
-function V(e) {
+function ae(e) {
   return {
     indications_and_usage: m(e.indications_and_usage),
     boxed_warning: m(e.boxed_warning),
-    warnings: P(e),
+    warnings: M(e),
     warnings_and_cautions: m(e.warnings_and_cautions),
     do_not_use: m(e.do_not_use),
     ask_doctor: m(e.ask_doctor),
@@ -70,10 +70,10 @@ function V(e) {
     pregnancy_or_breast_feeding: m(e.pregnancy_or_breast_feeding)
   };
 }
-class b {
+class y {
   constructor() {
-    D(this, "urlBase", "https://api.fda.gov");
-    D(this, "params", /* @__PURE__ */ new Map());
+    A(this, "urlBase", "https://api.fda.gov");
+    A(this, "params", /* @__PURE__ */ new Map());
   }
   dataset(t) {
     return this.params.set("dataset", t), this;
@@ -87,87 +87,104 @@ class b {
   limit(t = 1) {
     return this.params.set("limit", t), this;
   }
+  /** Aggregate by a field instead of returning records. */
+  count(t) {
+    return this.params.set("count", t), this;
+  }
+  /** Offset into the result set. openFDA rejects values above 25000. */
+  skip(t) {
+    return this.params.set("skip", t), this;
+  }
+  /** e.g. 'receivedate:desc'. */
+  sort(t) {
+    return this.params.set("sort", t), this;
+  }
   build() {
-    const t = this.params.get("dataset"), n = this.params.get("context"), a = this.params.get("search"), i = this.params.get("limit") ?? 1;
-    if (!t || !n || !a)
+    const t = this.params.get("dataset"), n = this.params.get("context"), r = this.params.get("search"), i = this.params.get("limit") ?? 1;
+    if (!t || !n || !r)
       throw new Error("Missing required parameters: context or search");
-    const o = E(), s = new URLSearchParams();
-    return o.ok && o.apiKey && s.set("api_key", o.apiKey), s.set("search", String(a)), s.set("limit", String(i)), `${this.urlBase}/${t}/${n}.json?${s}`;
+    const o = O(), s = new URLSearchParams();
+    o.ok && o.apiKey && s.set("api_key", o.apiKey), s.set("search", String(r)), s.set("limit", String(i));
+    for (const d of ["count", "skip", "sort"]) {
+      const c = this.params.get(d);
+      c !== void 0 && s.set(d, String(c));
+    }
+    return `${this.urlBase}/${t}/${n}.json?${s}`;
   }
 }
-const C = (e) => e.replace(/([?&]api_key=)[^&\s]*/gi, "$1<REDACTED>"), z = {
+const U = (e) => e.replace(/([?&]api_key=)[^&\s]*/gi, "$1<REDACTED>"), se = {
   maxRetries: 3,
   retryDelay: 1e3,
   // 1 second
   timeout: 3e4
   // 30 seconds
 };
-function T(e) {
+function I(e) {
   return !!(e.name === "TypeError" && e.message.includes("fetch") || e.name === "AbortError" || e.status >= 500 && e.status <= 599 || e.status === 429);
 }
-function F(e) {
+function P(e) {
   return new Promise((t) => setTimeout(t, e));
 }
-async function k(e, t = {}) {
-  const { maxRetries: n, retryDelay: a, timeout: i } = { ...z, ...t }, o = {
+async function v(e, t = {}) {
+  const { maxRetries: n, retryDelay: r, timeout: i } = { ...se, ...t }, o = {
     "User-Agent": "@ythalorossy/openfda",
     Accept: "application/json"
   };
   let s = null;
-  for (let p = 0; p <= n; p++)
+  for (let d = 0; d <= n; d++)
     try {
-      const c = new AbortController(), f = setTimeout(() => c.abort(), i), r = await fetch(e, {
+      const c = new AbortController(), l = setTimeout(() => c.abort(), i), a = await fetch(e, {
         headers: o,
         signal: c.signal
       });
-      if (clearTimeout(f), !r.ok) {
-        const u = await r.text().catch(() => "Unable to read error response"), l = {
+      if (clearTimeout(l), !a.ok) {
+        const f = await a.text().catch(() => "Unable to read error response"), _ = {
           type: "http",
-          message: `HTTP ${r.status}: ${r.statusText}`,
-          status: r.status,
-          details: u
+          message: `HTTP ${a.status}: ${a.statusText}`,
+          status: a.status,
+          details: f
         };
-        switch (r.status) {
+        switch (a.status) {
           case 400:
-            l.message = "Bad Request: Invalid search query or parameters";
+            _.message = "Bad Request: Invalid search query or parameters";
             break;
           case 401:
-            l.message = "Unauthorized: Invalid or missing API key";
+            _.message = "Unauthorized: Invalid or missing API key";
             break;
           case 403:
-            l.message = "Forbidden: API key may be invalid or quota exceeded";
+            _.message = "Forbidden: API key may be invalid or quota exceeded";
             break;
           case 404:
-            l.message = "Not Found: No results found for the specified query";
+            _.message = "Not Found: No results found for the specified query";
             break;
           case 429:
-            l.message = "Rate Limited: Too many requests. Retrying...";
+            _.message = "Rate Limited: Too many requests. Retrying...";
             break;
           case 500:
-            l.message = "Server Error: OpenFDA service is experiencing issues";
+            _.message = "Server Error: OpenFDA service is experiencing issues";
             break;
           default:
-            l.message = `HTTP Error ${r.status}: ${r.statusText}`;
+            _.message = `HTTP Error ${a.status}: ${a.statusText}`;
         }
-        if (s = l, r.status >= 400 && r.status < 500 && r.status !== 429)
+        if (s = _, a.status >= 400 && a.status < 500 && a.status !== 429)
           break;
-        if (p < n && T({ status: r.status })) {
-          const h = a * Math.pow(2, p);
-          await F(h);
+        if (d < n && I({ status: a.status })) {
+          const h = r * Math.pow(2, d);
+          await P(h);
           continue;
         }
         break;
       }
       let g;
       try {
-        g = await r.json();
-      } catch (u) {
+        g = await a.json();
+      } catch (f) {
         s = {
           type: "parsing",
-          message: C(
-            `Failed to parse JSON response: ${u instanceof Error ? u.message : "Unknown parsing error"}`
+          message: U(
+            `Failed to parse JSON response: ${f instanceof Error ? f.message : "Unknown parsing error"}`
           ),
-          details: u
+          details: f
         };
         break;
       }
@@ -180,65 +197,99 @@ async function k(e, t = {}) {
       }
       return { data: g, error: null };
     } catch (c) {
-      let f;
-      if (c.name === "AbortError" ? f = {
+      let l;
+      if (c.name === "AbortError" ? l = {
         type: "timeout",
         message: `Request timeout after ${i}ms`,
         details: c
-      } : c instanceof TypeError && c.message.includes("fetch") ? f = {
+      } : c instanceof TypeError && c.message.includes("fetch") ? l = {
         type: "network",
         message: "Network error: Unable to connect to OpenFDA API",
         details: c.message
-      } : f = {
+      } : l = {
         type: "unknown",
-        message: C(
+        message: U(
           `Unexpected error: ${c.message || "Unknown error occurred"}`
         ),
         details: c
-      }, s = f, p < n && T(c)) {
-        const r = a * Math.pow(2, p);
-        await F(r);
+      }, s = l, d < n && I(c)) {
+        const a = r * Math.pow(2, d);
+        await P(a);
         continue;
       }
       break;
     }
   return { data: null, error: s };
 }
-const X = [
+const j = [
   "openfda.brand_name",
   "openfda.generic_name",
   "openfda.substance_name",
   "spl_product_data_elements"
 ];
-async function O(e, t = 1) {
+async function X(e, t = 1) {
   let n;
-  for (const a of X) {
-    const i = new b().dataset("drug").context("label").search(`${a}:"${e}"`).limit(t).build(), { data: o, error: s } = await k(i);
+  for (const r of j) {
+    const i = new y().dataset("drug").context("label").search(`${r}:"${e}"`).limit(t).build(), { data: o, error: s } = await v(i);
     if (s) {
       n = s;
       continue;
     }
     if (o != null && o.results && o.results.length > 0)
-      return { found: !0, matched_via: a, data: o };
+      return { found: !0, matched_via: r, data: o };
   }
   return { found: !1, error: n };
 }
-const U = (e) => `No label found for "${e}".
+const L = (e) => `No label found for "${e}".
 
-Searched, in order: ${X.join(", ")}.
+Searched, in order: ${j.join(", ")}.
 
 Suggestions:
 - Check the spelling.
 - Try the generic name instead of the brand (e.g. "amiodarone" rather than "Cordarone").
 - Try the originator brand rather than a repackager's name.
-- Some discontinued brands have no current FDA label.`, H = {
+- Some discontinued brands have no current FDA label.`;
+function oe(e) {
+  const t = (n) => Array.isArray(n) && typeof n[0] == "string" && n[0] ? n[0] : void 0;
+  return t(e == null ? void 0 : e.generic_name) ?? t(e == null ? void 0 : e.substance_name) ?? "Unknown";
+}
+function x(e, t, n) {
+  return typeof t != "number" ? `Showing ${e} ${n} (total unknown)` : e >= t ? `Showing all ${t} ${n}` : `Showing ${e} of ${t} ${n}`;
+}
+function k(e, t, n) {
+  return {
+    total: typeof t == "number" ? t : null,
+    returned: e.length,
+    limit: n,
+    results: e
+  };
+}
+const ie = {
   name: "get-drug-by-name",
-  description: "Get drug information by brand name, generic name, or active substance. Returns the brand name, generic name, manufacturer name, product NDC, product type, route, substance name, indications and usage, warnings, do not use, ask doctor, ask doctor or pharmacist, stop use, pregnancy or breast feeding. The response reports which field matched via matched_via.",
-  inputSchema: d.object({
-    drugName: d.string().describe("Drug name")
+  description: "Look up a drug by brand, generic or substance name. Returns brand_name, generic_name, manufacturer_name, product_ndc, substance_name, indications_and_usage, and the safety narrative: boxed_warning, warnings, warnings_and_cautions, do_not_use, ask_doctor, ask_doctor_or_pharmacist, stop_use and pregnancy_or_breast_feeding. Every field is always present, empty when the label has none. Reports matched_via to say which field matched, and a total for how many labels matched.",
+  returnsFields: [
+    "brand_name",
+    "generic_name",
+    "manufacturer_name",
+    "product_ndc",
+    "substance_name",
+    "boxed_warning",
+    "warnings",
+    "warnings_and_cautions",
+    "do_not_use",
+    "ask_doctor",
+    "ask_doctor_or_pharmacist",
+    "stop_use",
+    "pregnancy_or_breast_feeding",
+    "indications_and_usage",
+    "matched_via"
+  ],
+  inputSchema: u.object({
+    drugName: u.string().describe("Drug name")
   }),
   async handler({ drugName: e }) {
-    const t = await O(e, 1);
+    var i, o, s, d;
+    const t = await X(e, 1);
     if (!t.found)
       return t.error ? {
         content: [
@@ -249,9 +300,9 @@ Suggestions:
         ],
         isError: !0
       } : {
-        content: [{ type: "text", text: U(e) }]
+        content: [{ type: "text", text: L(e) }]
       };
-    const n = t.data.results[0], a = {
+    const n = t.data.results[0], r = {
       brand_name: n == null ? void 0 : n.openfda.brand_name,
       generic_name: n == null ? void 0 : n.openfda.generic_name,
       manufacturer_name: n == null ? void 0 : n.openfda.manufacturer_name,
@@ -260,44 +311,37 @@ Suggestions:
       route: n == null ? void 0 : n.openfda.route,
       substance_name: n == null ? void 0 : n.openfda.substance_name,
       matched_via: t.matched_via,
-      ...V(n)
+      ...ae(n)
     };
     return {
       content: [
         {
           type: "text",
-          text: `Drug information retrieved successfully:
+          text: `${x(1, (o = (i = t.data.meta) == null ? void 0 : i.results) == null ? void 0 : o.total, `labels matching "${e}"`)}
 
-${JSON.stringify(a, null, 2)}`
+${JSON.stringify(k([r], (d = (s = t.data.meta) == null ? void 0 : s.results) == null ? void 0 : d.total, 1), null, 2)}`
         }
       ]
     };
   }
-};
-function N(e, t, n) {
-  return typeof t != "number" ? `Showing ${e} ${n} (total unknown)` : e >= t ? `Showing all ${t} ${n}` : `Showing ${e} of ${t} ${n}`;
-}
-function S(e, t, n) {
-  return {
-    total: typeof t == "number" ? t : null,
-    returned: e.length,
-    limit: n,
-    results: e
-  };
-}
-const Q = {
+}, ce = {
   name: "get-drug-by-generic-name",
-  description: "Get drug information by generic (active ingredient) name. Useful when you know the generic name but not the brand name. Returns all brand versions of the generic drug.",
-  inputSchema: d.object({
-    genericName: d.string().describe("Generic drug name (active ingredient)"),
-    limit: d.number().optional().default(5).describe("Maximum number of results to return")
+  description: "Get drug information by generic (active ingredient) name. Useful when you know the generic name but not the brand name. Returns all brand versions of the generic drug as results, up to limit, along with total matched and returned counts.",
+  // Raw upstream records wrapped in an envelope: declare only the envelope
+  // keys this tool guarantees (total, returned, limit, results), never
+  // inner record fields, because those vary per record. This tool does not
+  // emit matched_via — it searches a single fixed field.
+  returnsFields: ["total", "returned", "limit", "results"],
+  inputSchema: u.object({
+    genericName: u.string().describe("Generic drug name (active ingredient)"),
+    limit: u.number().optional().default(5).describe("Maximum number of results to return")
   }),
   async handler({
     genericName: e,
     limit: t
   }) {
-    var s, p, c, f;
-    const n = new b().dataset("drug").context("label").search(`openfda.generic_name:"${e}"`).limit(t).build(), { data: a, error: i } = await k(n);
+    var s, d, c, l;
+    const n = new y().dataset("drug").context("label").search(`openfda.generic_name:"${e}"`).limit(t).build(), { data: r, error: i } = await v(n);
     if (i)
       return {
         content: [
@@ -308,7 +352,7 @@ const Q = {
         ],
         isError: !0
       };
-    if (!(a != null && a.results) || a.results.length === 0)
+    if (!(r != null && r.results) || r.results.length === 0)
       return {
         content: [
           {
@@ -317,28 +361,28 @@ const Q = {
           }
         ]
       };
-    const o = a.results.map((r) => {
-      var g, u, l, h;
+    const o = r.results.map((a) => {
+      var g, f, _, h;
       return {
-        brand_name: ((g = r == null ? void 0 : r.openfda.brand_name) == null ? void 0 : g[0]) || "Unknown",
-        generic_name: ((u = r == null ? void 0 : r.openfda.generic_name) == null ? void 0 : u[0]) || "Unknown",
-        manufacturer_name: ((l = r == null ? void 0 : r.openfda.manufacturer_name) == null ? void 0 : l[0]) || "Unknown",
-        product_type: ((h = r == null ? void 0 : r.openfda.product_type) == null ? void 0 : h[0]) || "Unknown",
-        route: (r == null ? void 0 : r.openfda.route) || []
+        brand_name: ((g = a == null ? void 0 : a.openfda.brand_name) == null ? void 0 : g[0]) || "Unknown",
+        generic_name: ((f = a == null ? void 0 : a.openfda.generic_name) == null ? void 0 : f[0]) || "Unknown",
+        manufacturer_name: ((_ = a == null ? void 0 : a.openfda.manufacturer_name) == null ? void 0 : _[0]) || "Unknown",
+        product_type: ((h = a == null ? void 0 : a.openfda.product_type) == null ? void 0 : h[0]) || "Unknown",
+        route: (a == null ? void 0 : a.openfda.route) || []
       };
     });
     return {
       content: [
         {
           type: "text",
-          text: `${N(o.length, (p = (s = a.meta) == null ? void 0 : s.results) == null ? void 0 : p.total, `labels with generic name "${e}"`)}
+          text: `${x(o.length, (d = (s = r.meta) == null ? void 0 : s.results) == null ? void 0 : d.total, `labels with generic name "${e}"`)}
 
-${JSON.stringify(S(o, (f = (c = a.meta) == null ? void 0 : c.results) == null ? void 0 : f.total, t ?? 5), null, 2)}`
+${JSON.stringify(k(o, (l = (c = r.meta) == null ? void 0 : c.results) == null ? void 0 : l.total, t ?? 5), null, 2)}`
         }
       ]
     };
   }
-}, Z = {
+}, de = {
   1: "Recovered/resolved",
   2: "Recovering/resolving",
   3: "Not recovered/not resolved",
@@ -346,49 +390,93 @@ ${JSON.stringify(S(o, (f = (c = a.meta) == null ? void 0 : c.results) == null ?
   5: "Fatal",
   6: "Unknown"
 };
-function ee(e) {
+function ue(e) {
   if (e == null || e === "") return "Not reported";
   const t = String(e);
-  return Z[t] ?? `Unrecognized outcome code "${t}"`;
+  return de[t] ?? `Unrecognized outcome code "${t}"`;
+}
+const K = [
+  "patient.drug.openfda.generic_name",
+  "patient.drug.openfda.substance_name",
+  "patient.drug.medicinalproduct"
+], G = `union(${K.join(", ")})`;
+function q(e) {
+  return K.map((t) => `${t}:"${e}"`).join(
+    " OR "
+  );
 }
-function te(e) {
+function le(e) {
   const t = /* @__PURE__ */ new Set(), n = [];
-  for (const a of e) {
-    const i = a == null ? void 0 : a.reactionmeddrapt;
+  for (const r of e) {
+    const i = r == null ? void 0 : r.reactionmeddrapt;
     if (!i) continue;
-    const o = `${i}\0${String(a == null ? void 0 : a.reactionoutcome)}`;
-    t.has(o) || (t.add(o), n.push({ reaction: i, outcome: a == null ? void 0 : a.reactionoutcome }));
+    const o = `${i}\0${String(r == null ? void 0 : r.reactionoutcome)}`;
+    t.has(o) || (t.add(o), n.push({ reaction: i, outcome: r == null ? void 0 : r.reactionoutcome }));
   }
   return n.slice(0, 3);
 }
-const ne = {
+const F = 25e3, pe = {
   name: "get-drug-adverse-events",
-  description: "Get adverse event reports for a drug. This provides safety information about reported side effects and reactions. Use brand name or generic name.",
-  inputSchema: d.object({
-    drugName: d.string().describe("Drug name (brand or generic)"),
-    limit: d.number().optional().default(10).describe("Maximum number of events to return"),
-    seriousness: d.enum(["serious", "non-serious", "all"]).optional().default("all").describe("Filter by event seriousness")
+  description: "Get adverse event reports for a drug. This provides safety information about reported side effects and reactions. Use brand name or generic name. Without the sort parameter, results are a deterministic earliest-report_id slice, so a small sample is not representative. Returns results, up to limit, reporting matched_via, the total matched, and returned, the number actually sent back. When skip is set, the response also reports the offset (not declared here, since it is only present when skip is supplied).",
+  // Raw upstream records wrapped in an envelope: declare only the envelope
+  // keys this tool ALWAYS guarantees (matched_via, total, returned, limit,
+  // results), never inner record fields, because those vary per record.
+  // `skip` is deliberately NOT declared: it is only present in the payload
+  // when the caller supplies `skip`, and a conditional field must not be
+  // declared here (an earlier round established that declaring a
+  // sometimes-absent field makes this guard assert something false).
+  returnsFields: [
+    "matched_via",
+    "total",
+    "returned",
+    "limit",
+    "results"
+  ],
+  inputSchema: u.object({
+    drugName: u.string().describe("Drug name (brand or generic)"),
+    limit: u.number().optional().default(10).describe("Maximum number of events to return"),
+    seriousness: u.enum(["serious", "non-serious", "all"]).optional().default("all").describe("Filter by event seriousness"),
+    skip: u.number().int().min(0).max(F).optional().describe(
+      `Offset into the result set, for paging past the limit. Maximum ${F}.`
+    ),
+    sort: u.enum(["receivedate:desc", "receivedate:asc"]).optional().describe(
+      "Order results by report receive date. Without it, results are a deterministic earliest-report_id slice, so a small sample is not representative."
+    )
   }),
   async handler({
     drugName: e,
     limit: t,
-    seriousness: n
+    seriousness: n,
+    skip: r,
+    sort: i
   }) {
-    var c, f, r, g;
-    let a = `patient.drug.medicinalproduct:"${e}"`;
-    n !== "all" && (a += ` AND serious:${n === "serious" ? "1" : "2"}`);
-    const i = new b().dataset("drug").context("event").search(a).limit(t).build(), { data: o, error: s } = await k(i);
-    if (s)
+    var h, E;
+    if (r !== void 0 && r > F)
       return {
         content: [
           {
             type: "text",
-            text: `Failed to retrieve adverse events for "${e}": ${s.message}`
+            text: `skip must be ${F} or less (openFDA's ceiling); received ${r}. To reach records beyond that, narrow the search or use sort to bring the records you want into range.`
           }
         ],
         isError: !0
       };
-    if (!(o != null && o.results) || o.results.length === 0)
+    let o = q(e);
+    n !== "all" && (o = `(${o}) AND serious:${n === "serious" ? "1" : "2"}`);
+    const s = new y().dataset("drug").context("event").search(o).limit(t);
+    r !== void 0 && s.skip(r), i !== void 0 && s.sort(i);
+    const d = s.build(), { data: c, error: l } = await v(d);
+    if (l)
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Failed to retrieve adverse events for "${e}": ${l.message}`
+          }
+        ],
+        isError: !0
+      };
+    if (!(c != null && c.results) || c.results.length === 0)
       return {
         content: [
           {
@@ -397,45 +485,63 @@ const ne = {
           }
         ]
       };
-    const p = o.results.map((u) => {
-      var h, _, $, v;
-      const l = te(((h = u.patient) == null ? void 0 : h.reaction) ?? []);
+    const a = c.results.map((p) => {
+      var N, D, S, $;
+      const w = le(((N = p.patient) == null ? void 0 : N.reaction) ?? []);
       return {
-        report_id: u.safetyreportid,
-        serious: u.serious === "1" ? "Yes" : "No",
-        patient_age: ((_ = u.patient) == null ? void 0 : _.patientonsetage) || "Unknown",
-        patient_sex: (($ = u.patient) == null ? void 0 : $.patientsex) === "1" ? "Male" : ((v = u.patient) == null ? void 0 : v.patientsex) === "2" ? "Female" : "Unknown",
+        report_id: p.safetyreportid,
+        serious: p.serious === "1" ? "Yes" : "No",
+        patient_age: ((D = p.patient) == null ? void 0 : D.patientonsetage) || "Unknown",
+        patient_sex: ((S = p.patient) == null ? void 0 : S.patientsex) === "1" ? "Male" : (($ = p.patient) == null ? void 0 : $.patientsex) === "2" ? "Female" : "Unknown",
         // Derived from the same deduped pairs so the two arrays stay the
         // same length and positionally aligned (see dedupeReactionPairs).
-        reactions: l.map((w) => w.reaction),
-        outcomes: l.map((w) => ee(w.outcome)),
-        report_date: u.receiptdate || "Unknown"
+        reactions: w.map((T) => T.reaction),
+        outcomes: w.map((T) => ue(T.outcome)),
+        report_date: p.receiptdate || "Unknown"
       };
-    });
+    }), g = (E = (h = c.meta) == null ? void 0 : h.results) == null ? void 0 : E.total, f = r !== void 0 ? `${x(a.length, g, `adverse event reports for "${e}"`)}, starting at offset ${r}` : x(
+      a.length,
+      g,
+      `adverse event reports for "${e}"`
+    ), _ = {
+      matched_via: G,
+      ...r !== void 0 ? { skip: r } : {},
+      ...k(a, g, t ?? 10)
+    };
     return {
       content: [
         {
           type: "text",
-          text: `${N(p.length, (f = (c = o.meta) == null ? void 0 : c.results) == null ? void 0 : f.total, `adverse event reports for "${e}"`)}
+          text: `${f}
 
-${JSON.stringify(S(p, (g = (r = o.meta) == null ? void 0 : r.results) == null ? void 0 : g.total, t ?? 10), null, 2)}`
+${JSON.stringify(_, null, 2)}`
         }
       ]
     };
   }
-}, ae = {
+}, me = {
   name: "get-drugs-by-manufacturer",
-  description: "Get all drugs manufactured by a specific company. Useful for finding alternatives or checking manufacturer portfolios.",
-  inputSchema: d.object({
-    manufacturerName: d.string().describe("Manufacturer/company name"),
-    limit: d.number().optional().default(20).describe("Maximum number of drugs to return")
+  description: "Get all drugs manufactured by a specific company. Useful for finding alternatives or checking manufacturer portfolios. Returns results, up to limit, reporting matched_via, the total matched, and returned, the number actually sent back.",
+  // Raw upstream records wrapped in an envelope: declare only the envelope
+  // keys this tool guarantees (matched_via, total, returned, limit,
+  // results), never inner record fields, because those vary per record.
+  returnsFields: [
+    "matched_via",
+    "total",
+    "returned",
+    "limit",
+    "results"
+  ],
+  inputSchema: u.object({
+    manufacturerName: u.string().describe("Manufacturer/company name"),
+    limit: u.number().optional().default(20).describe("Maximum number of drugs to return")
   }),
   async handler({
     manufacturerName: e,
     limit: t
   }) {
-    var s, p, c, f;
-    const n = new b().dataset("drug").context("label").search(`openfda.manufacturer_name:"${e}"`).limit(t).build(), { data: a, error: i } = await k(n);
+    var s, d, c, l;
+    const n = new y().dataset("drug").context("label").search(`openfda.manufacturer_name:"${e}"`).limit(t).build(), { data: r, error: i } = await v(n);
     if (i)
       return {
         content: [
@@ -446,7 +552,7 @@ ${JSON.stringify(S(p, (g = (r = o.meta) == null ? void 0 : r.results) == null ?
         ],
         isError: !0
       };
-    if (!(a != null && a.results) || a.results.length === 0)
+    if (!(r != null && r.results) || r.results.length === 0)
       return {
         content: [
           {
@@ -455,36 +561,53 @@ ${JSON.stringify(S(p, (g = (r = o.meta) == null ? void 0 : r.results) == null ?
           }
         ]
       };
-    const o = a.results.map((r) => {
-      var g, u, l, h;
+    const o = r.results.map((a) => {
+      var g, f, _, h;
       return {
-        brand_name: ((g = r == null ? void 0 : r.openfda.brand_name) == null ? void 0 : g[0]) || "Unknown",
-        generic_name: ((u = r == null ? void 0 : r.openfda.generic_name) == null ? void 0 : u[0]) || "Unknown",
-        product_type: ((l = r == null ? void 0 : r.openfda.product_type) == null ? void 0 : l[0]) || "Unknown",
-        route: (r == null ? void 0 : r.openfda.route) || [],
-        ndc: ((h = r == null ? void 0 : r.openfda.product_ndc) == null ? void 0 : h[0]) || "Unknown"
+        brand_name: ((g = a == null ? void 0 : a.openfda.brand_name) == null ? void 0 : g[0]) || "Unknown",
+        generic_name: ((f = a == null ? void 0 : a.openfda.generic_name) == null ? void 0 : f[0]) || "Unknown",
+        product_type: ((_ = a == null ? void 0 : a.openfda.product_type) == null ? void 0 : _[0]) || "Unknown",
+        route: (a == null ? void 0 : a.openfda.route) || [],
+        ndc: ((h = a == null ? void 0 : a.openfda.product_ndc) == null ? void 0 : h[0]) || "Unknown"
       };
     });
     return {
       content: [
         {
           type: "text",
-          text: `${N(o.length, (p = (s = a.meta) == null ? void 0 : s.results) == null ? void 0 : p.total, `labels from manufacturer "${e}"`)}
+          text: `${x(o.length, (d = (s = r.meta) == null ? void 0 : s.results) == null ? void 0 : d.total, `labels from manufacturer "${e}"`)}
 
-${JSON.stringify(S(o, (f = (c = a.meta) == null ? void 0 : c.results) == null ? void 0 : f.total, t ?? 20), null, 2)}`
+${JSON.stringify({ matched_via: "openfda.manufacturer_name", ...k(o, (l = (c = r.meta) == null ? void 0 : c.results) == null ? void 0 : l.total, t ?? 20) }, null, 2)}`
         }
       ]
     };
   }
-}, re = {
+}, fe = {
   name: "get-drug-safety-info",
-  description: "Get comprehensive safety information for a drug including the boxed warning, warnings and cautions, contraindications, drug interactions, and precautions. Accepts a brand name, generic name, or active substance; the response reports which field matched via matched_via.",
-  inputSchema: d.object({
-    drugName: d.string().describe("Drug brand name")
+  description: "Get safety information for a drug. Returns drug_name, generic_name, boxed_warning, warnings, warnings_and_cautions, contraindications, drug_interactions, precautions, adverse_reactions, overdosage, do_not_use, ask_doctor, stop_use and pregnancy_or_breast_feeding. Every field is always present, empty when the label has none, so an empty boxed_warning means the drug has none rather than that it was not checked. Accepts a brand, generic or substance name and reports matched_via.",
+  returnsFields: [
+    "drug_name",
+    "generic_name",
+    "matched_via",
+    "boxed_warning",
+    "warnings",
+    "warnings_and_cautions",
+    "contraindications",
+    "drug_interactions",
+    "precautions",
+    "adverse_reactions",
+    "overdosage",
+    "do_not_use",
+    "ask_doctor",
+    "stop_use",
+    "pregnancy_or_breast_feeding"
+  ],
+  inputSchema: u.object({
+    drugName: u.string().describe("Drug brand name")
   }),
   async handler({ drugName: e }) {
-    var i, o;
-    const t = await O(e, 1);
+    var i;
+    const t = await X(e, 1);
     if (!t.found)
       return t.error ? {
         content: [
@@ -495,13 +618,15 @@ ${JSON.stringify(S(o, (f = (c = a.meta) == null ? void 0 : c.results) == null ?
         ],
         isError: !0
       } : {
-        content: [{ type: "text", text: U(e) }]
+        content: [{ type: "text", text: L(e) }]
       };
-    const n = t.data.results[0], a = {
+    const n = t.data.results[0], r = {
       drug_name: ((i = n == null ? void 0 : n.openfda.brand_name) == null ? void 0 : i[0]) || e,
-      generic_name: ((o = n == null ? void 0 : n.openfda.generic_name) == null ? void 0 : o[0]) || "Unknown",
+      generic_name: oe(
+        (n == null ? void 0 : n.openfda) ?? {}
+      ),
       matched_via: t.matched_via,
-      ...W(n)
+      ...re(n)
     };
     return {
       content: [
@@ -509,76 +634,94 @@ ${JSON.stringify(S(o, (f = (c = a.meta) == null ? void 0 : c.results) == null ?
           type: "text",
           text: `Safety information for "${e}":
 
-${JSON.stringify(a, null, 2)}`
+${JSON.stringify(r, null, 2)}`
         }
       ]
     };
   }
-}, se = /^(?:\d{4}-\d{4}|\d{5}-\d{3,4})$/, oe = /^\d{1,2}$/;
-function I(e) {
+}, _e = /^(?:\d{4}-\d{4}|\d{5}-\d{3,4})$/, ge = /^\d{1,2}$/;
+function V(e) {
   const t = e.trim().toUpperCase(), n = { productNDC: t, packageNDC: null, isValid: !1 };
-  let a, i = null;
+  let r, i = null;
   if (t.includes("-")) {
     const o = t.split("-");
     if (o.length === 2)
-      a = t;
+      r = t;
     else if (o.length === 3) {
       const s = o[2];
-      if (!s || !oe.test(s)) return n;
-      a = `${o[0]}-${o[1]}`, i = t;
+      if (!s || !ge.test(s)) return n;
+      r = `${o[0]}-${o[1]}`, i = t;
     } else
       return n;
   } else if (/^\d+$/.test(t))
     if (t.length === 11)
-      a = `${t.slice(0, 5)}-${t.slice(5, 9)}`, i = `${a}-${t.slice(9, 11)}`;
+      r = `${t.slice(0, 5)}-${t.slice(5, 9)}`, i = `${r}-${t.slice(9, 11)}`;
     else if (t.length === 9)
-      a = `${t.slice(0, 5)}-${t.slice(5, 9)}`;
+      r = `${t.slice(0, 5)}-${t.slice(5, 9)}`;
     else
       return n;
   else
     return n;
-  return se.test(a) ? { productNDC: a, packageNDC: i, isValid: !0 } : n;
+  return _e.test(r) ? { productNDC: r, packageNDC: i, isValid: !0 } : n;
 }
-const ie = {
+const he = [
+  "✅ Accepted formats:",
+  "• 4-4 product NDC: 0456-4020",
+  "• 5-3 product NDC: 58151-155",
+  "• 5-4 product NDC: 12345-1234",
+  "• Package NDC: 12345-1234-01 or 58151-155-01",
+  "• Undashed 9 digits: 123451234 (read as 5-4)",
+  "• Undashed 11 digits: 12345123401 (read as 5-4-2)",
+  "",
+  "Undashed 8- and 10-digit input is rejected because the split is ambiguous: 8 digits could be 5-3 or 4-4, and 10 could be 4-4-2, 5-3-2 or 5-4-1. Guessing could return a different drug, so add the dashes instead."
+].join(`
+`), W = (e, t) => `Invalid ${t} format: "${e}"
+
+${he}`, be = {
   name: "get-drug-by-ndc",
-  description: "Get drug information by National Drug Code (NDC). Accepts both product NDC (XXXXX-XXXX) and package NDC (XXXXX-XXXX-XX) formats. Also accepts NDC codes without dashes.",
-  inputSchema: d.object({
-    ndcCode: d.string().describe(
+  description: "Get drug information by National Drug Code (NDC). Accepts dashed formats: 4-4 (0456-4020), 5-3 (58151-155), 5-4 (12345-1234), and package NDC. Also accepts undashed 9-digit and 11-digit input. Undashed 8- and 10-digit input is rejected as ambiguous. Returns results, up to limit, reporting matched_via, the total matched, and returned, the number actually sent back.",
+  // Raw upstream records wrapped in an envelope: declare only the envelope
+  // keys this tool guarantees (matched_via, total, returned, limit,
+  // results), never inner record fields, because those vary per record.
+  returnsFields: [
+    "matched_via",
+    "total",
+    "returned",
+    "limit",
+    "results"
+  ],
+  inputSchema: u.object({
+    ndcCode: u.string().describe(
       "National Drug Code (NDC) - accepts formats: XXXXX-XXXX, XXXXX-XXXX-XX, or without dashes"
     )
   }),
   async handler({ ndcCode: e }) {
-    var g, u, l, h;
-    const { productNDC: t, packageNDC: n, isValid: a } = I(e);
-    if (!a)
+    var f, _, h, E;
+    const { productNDC: t, packageNDC: n, isValid: r } = V(e);
+    if (!r)
       return {
         content: [
           {
             type: "text",
-            text: `Invalid NDC format: "${e}"
-
-✅ Accepted formats:
-• Product NDC: 12345-1234
-• Package NDC: 12345-1234-01
-• Without dashes: 123451234 or 12345123401`
+            text: W(e, "NDC")
           }
         ],
         isError: !0
       };
     let i = `openfda.product_ndc:"${t}"`;
     n && (i += ` OR openfda.package_ndc:"${n}"`);
-    const o = new b().dataset("drug").context("label").search(i).limit(10).build(), { data: s, error: p } = await k(o);
-    if (p)
+    const o = n ? "openfda.product_ndc OR openfda.package_ndc" : "openfda.product_ndc", s = new y().dataset("drug").context("label").search(i).limit(10).build(), { data: d, error: c } = await v(s);
+    if (c)
       return {
         content: [
           {
             type: "text",
-            text: `Failed to retrieve drug data for NDC "${e}": ${p.message}`
+            text: `Failed to retrieve drug data for NDC "${e}": ${c.message}`
           }
         ],
         isError: !0
       };
-    if (!(s != null && s.results) || s.results.length === 0)
+    if (!(d != null && d.results) || d.results.length === 0)
       return {
         content: [
           {
@@ -592,75 +735,82 @@ const ie = {
           }
         ]
       };
-    const c = s.results.map((_) => {
-      var w, A;
-      const $ = ((w = _.openfda.product_ndc) == null ? void 0 : w.filter((x) => x === t)) || [], v = ((A = _.openfda.package_ndc) == null ? void 0 : A.filter(
-        (x) => n ? x === n : x.startsWith(t)
+    const l = d.results.map((p) => {
+      var D, S;
+      const w = ((D = p.openfda.product_ndc) == null ? void 0 : D.filter(($) => $ === t)) || [], N = ((S = p.openfda.package_ndc) == null ? void 0 : S.filter(
+        ($) => n ? $ === n : $.startsWith(t)
       )) || [];
       return {
-        brand_name: _.openfda.brand_name || [],
-        generic_name: _.openfda.generic_name || [],
-        manufacturer_name: _.openfda.manufacturer_name || [],
-        product_type: _.openfda.product_type || [],
-        route: _.openfda.route || [],
-        substance_name: _.openfda.substance_name || [],
-        matching_product_ndc: $,
-        matching_package_ndc: v,
-        all_product_ndc: _.openfda.product_ndc || [],
-        all_package_ndc: _.openfda.package_ndc || [],
-        dosage_and_administration: _.dosage_and_administration || [],
-        package_label_principal_display_panel: _.package_label_principal_display_panel || [],
-        active_ingredient: _.active_ingredient || [],
-        purpose: _.purpose || []
+        brand_name: p.openfda.brand_name || [],
+        generic_name: p.openfda.generic_name || [],
+        manufacturer_name: p.openfda.manufacturer_name || [],
+        product_type: p.openfda.product_type || [],
+        route: p.openfda.route || [],
+        substance_name: p.openfda.substance_name || [],
+        matching_product_ndc: w,
+        matching_package_ndc: N,
+        all_product_ndc: p.openfda.product_ndc || [],
+        all_package_ndc: p.openfda.package_ndc || [],
+        dosage_and_administration: p.dosage_and_administration || [],
+        package_label_principal_display_panel: p.package_label_principal_display_panel || [],
+        active_ingredient: p.active_ingredient || [],
+        purpose: p.purpose || []
       };
-    }), f = c.reduce(
-      (_, $) => _ + $.matching_package_ndc.length,
+    }), a = l.reduce(
+      (p, w) => p + w.matching_package_ndc.length,
       0
-    ), r = n ? `Searched for specific package NDC: ${n}` : `Searched for product NDC: ${t} (all packages)`;
+    ), g = n ? `Searched for specific package NDC: ${n}` : `Searched for product NDC: ${t} (all packages)`;
     return {
       content: [
         {
           type: "text",
-          text: `${N(c.length, (u = (g = s.meta) == null ? void 0 : g.results) == null ? void 0 : u.total, `labels for NDC "${e}"`)} with ${f} package(s)
+          text: `${x(l.length, (_ = (f = d.meta) == null ? void 0 : f.results) == null ? void 0 : _.total, `labels for NDC "${e}"`)} with ${a} package(s)
 
-${r}
+${g}
 
-${JSON.stringify(S(c, (h = (l = s.meta) == null ? void 0 : l.results) == null ? void 0 : h.total, 10), null, 2)}`
+${JSON.stringify({ matched_via: o, ...k(l, (E = (h = d.meta) == null ? void 0 : h.results) == null ? void 0 : E.total, 10) }, null, 2)}`
         }
       ]
     };
   }
-}, ce = {
+}, ye = {
   name: "get-drug-by-product-ndc",
-  description: "Get drug information by product NDC. Accepts the dashed forms 4-4 (0456-4020), 5-3 (58151-155) and 5-4 (12345-1234), plus undashed 9-digit (5-4) and 11-digit (5-4-2) input. Undashed 8- and 10-digit input is rejected as ambiguous — dash it. This ignores package variations and finds all packages for a product.",
-  inputSchema: d.object({
-    productNDC: d.string().describe(
+  description: "Get drug information by product NDC. Accepts the dashed forms 4-4 (0456-4020), 5-3 (58151-155) and 5-4 (12345-1234), plus undashed 9-digit (5-4) and 11-digit (5-4-2) input. Undashed 8- and 10-digit input is rejected as ambiguous — dash it. This ignores package variations and finds all packages for a product. Returns product_ndc, available_packages, brand_name, generic_name, manufacturer_name, product_type, route, substance_name, active_ingredient, purpose and dosage_and_administration; every field is always present, empty when the label has none.",
+  // Fixed payload of named fields (one record, not an envelope over many):
+  // every key here is always set on the success path, defaulting to an
+  // empty array when the upstream label omits it.
+  returnsFields: [
+    "product_ndc",
+    "available_packages",
+    "brand_name",
+    "generic_name",
+    "manufacturer_name",
+    "product_type",
+    "route",
+    "substance_name",
+    "active_ingredient",
+    "purpose",
+    "dosage_and_administration"
+  ],
+  inputSchema: u.object({
+    productNDC: u.string().describe(
       "Product NDC: dashed 4-4 (0456-4020), 5-3 (58151-155) or 5-4 (12345-1234); undashed 9-digit (123451234) or 11-digit (12345123401) also work"
     )
   }),
   async handler({ productNDC: e }) {
-    var f;
-    const { productNDC: t, isValid: n } = I(e);
+    var l;
+    const { productNDC: t, isValid: n } = V(e);
     if (!n)
       return {
         content: [
           {
             type: "text",
-            text: `Invalid product NDC format: "${e}"
-
-✅ Accepted formats:
-• 4-4 product NDC: 0456-4020
-• 5-3 product NDC: 58151-155
-• 5-4 product NDC: 12345-1234
-• Undashed 9 digits: 123451234 (read as 5-4)
-• Undashed 11 digits: 12345123401 (read as 5-4-2)
-
-Undashed 8- and 10-digit input is rejected because the split is ambiguous: 8 digits could be 5-3 or 4-4, and 10 could be 4-4-2, 5-3-2 or 5-4-1. Guessing could return a different drug, so add the dashes instead.`
+            text: W(e, "product NDC")
           }
         ],
         isError: !0
       };
-    const a = new b().dataset("drug").context("label").search(`openfda.product_ndc:"${t}"`).limit(1).build(), { data: i, error: o } = await k(a);
+    const r = new y().dataset("drug").context("label").search(`openfda.product_ndc:"${t}"`).limit(1).build(), { data: i, error: o } = await v(r);
     if (o)
       return {
         content: [
@@ -681,11 +831,11 @@ Undashed 8- and 10-digit input is rejected because the split is ambiguous: 8 dig
         ],
         structuredContent: null
       };
-    const s = i.results[0], p = ((f = s.openfda.package_ndc) == null ? void 0 : f.filter(
-      (r) => r.startsWith(t)
+    const s = i.results[0], d = ((l = s.openfda.package_ndc) == null ? void 0 : l.filter(
+      (a) => a.startsWith(t)
     )) || [], c = {
       product_ndc: t,
-      available_packages: p,
+      available_packages: d,
       brand_name: s.openfda.brand_name || [],
       generic_name: s.openfda.generic_name || [],
       manufacturer_name: s.openfda.manufacturer_name || [],
@@ -700,81 +850,215 @@ Undashed 8- and 10-digit input is rejected because the split is ambiguous: 8 dig
       content: [
         {
           type: "text",
-          text: `✅ Product NDC "${t}" found with ${p.length} package variation(s):
+          text: `✅ Product NDC "${t}" found with ${d.length} package variation(s):
 
 ${JSON.stringify(c, null, 2)}`
         }
       ]
     };
   }
-}, ue = {
+}, R = {
+  application: {
+    prefix: "",
+    fields: {
+      application_number: {},
+      // Case-sensitive, stored uppercase: "UPJOHN" -> 13 results,
+      // "Upjohn"/"upjohn" -> NOT_FOUND. Normalised so a caller typing
+      // "Pfizer" does not get a silent miss that looks like absent data.
+      sponsor_name: { uppercase: !0 }
+    }
+  },
+  openfda: {
+    prefix: "openfda",
+    fields: {
+      application_number: {},
+      brand_name: {},
+      generic_name: {},
+      manufacturer_name: {},
+      route: {},
+      substance_name: {},
+      product_ndc: {}
+    }
+  },
+  products: {
+    prefix: "products",
+    fields: {
+      dosage_form: {},
+      marketing_status: {},
+      product_number: {},
+      reference_drug: {},
+      route: {},
+      te_code: {}
+    }
+  },
+  submissions: {
+    prefix: "submissions",
+    fields: {
+      review_priority: {},
+      submission_class_code: {},
+      submission_number: {},
+      submission_status: {},
+      submission_status_date: {},
+      submission_type: {}
+    }
+  },
+  application_docs: {
+    prefix: "submissions.application_docs",
+    fields: { id: {}, url: {}, date: {}, type: {} }
+  }
+}, C = Object.keys(R);
+function ve(e, t) {
+  const n = R[e];
+  if (!n)
+    return {
+      ok: !1,
+      message: `Unknown section "${e}". Valid sections: ${C.join(", ")}.`
+    };
+  const r = n.fields[t];
+  return r ? {
+    ok: !0,
+    path: n.prefix ? `${n.prefix}.${t}` : t,
+    uppercase: r.uppercase === !0
+  } : {
+    ok: !1,
+    message: `Unknown field "${t}" for section "${e}". Valid fields: ${Object.keys(n.fields).join(", ")}.`
+  };
+}
+const $e = (e) => `${e}: ${Object.keys(R[e].fields).join(", ")}`, xe = {
   name: "get-drugsfda",
-  description: "Get drugsfda data by section and field. Search OpenFDA drugsfda endpoint by specifying a section (application, openfda, products, submissions, application_docs), a field name within that section, and a search value.",
-  inputSchema: d.object({
-    sectionName: d.string().describe(
-      "Section within drugsfda. Valid values: application, openfda, products, submissions, application_docs"
+  description: "Search Drugs@FDA application data by section and field. Returns application, sponsor, product and submission records as results, up to limit. Reports matched_via (the resolved field path), the total number of records matched, and returned, the number actually sent back.",
+  // Raw upstream records wrapped in an envelope: declare only the envelope
+  // keys this tool guarantees (matched_via, total, returned, limit,
+  // results), never inner record fields, because those vary per record.
+  returnsFields: [
+    "matched_via",
+    "total",
+    "returned",
+    "limit",
+    "results"
+  ],
+  inputSchema: u.object({
+    sectionName: u.enum([...C]).describe(`Section to search. One of: ${C.join(", ")}`),
+    fieldName: u.string().describe(
+      `Field within the section. ${C.map($e).join(". ")}`
     ),
-    fieldName: d.string().describe(
-      "Field name within the selected section. application: application_number. openfda: application_number, brand_name, generic_name, manufacturer_name, nui, package_ndc, pharm_class_cs, pharm_class_epc, pharm_class_pe, pharm_class_moa, product_ndc, route, rxcui, spl_id, spl_set_id, substance_name, unii. products: active_ingredients.name, active_ingredients.strength, dosage_form, marketing_status, product_number, reference_drug, reference_standard, route, te_code. submissions: application_docs, review_priority, submission_class_code, submission_class_code_description, submission_number, submission_property_type.code, submission_public_notes, submission_status, submission_status_date, submission_type. application_docs: applications_doc_id, applications_doc_date, application_docs_title, applications_doc_type, applications_doc_url"
+    searchValue: u.string().describe(
+      "Value to search for. Sponsor names are stored uppercase and are normalised automatically."
     ),
-    searchValue: d.string().describe("Value to search for in the specified field")
+    limit: u.number().int().min(1).max(100).optional().default(5).describe("Maximum number of records to return")
   }),
   async handler({
     sectionName: e,
     fieldName: t,
-    searchValue: n
+    searchValue: n,
+    limit: r
   }) {
-    const a = new b().dataset("drug").context("drugsfda").search(`${e}.${t}:"${n}"`).limit(1).build(), { data: i, error: o } = await k(a);
-    if (o) {
-      let s = `Failed to retrieve drugsfda data for "${n}" in ${e}.${t}: ${o.message}`;
-      switch (o.type) {
-        case "http":
-          o.status === 404 ? s += `
-
-Suggestions:
-- Verify the field name is correct for the section
-- Check the search value spelling` : (o.status === 401 || o.status === 403) && (s += `
-
-Please check the API key configuration.`);
-          break;
-        case "network":
-          s += `
-
-Please check your internet connection and try again.`;
-          break;
-        case "timeout":
-          s += `
-
-The request took too long. Please try again.`;
-          break;
-      }
+    var g, f;
+    const i = r ?? 5, o = ve(e, t);
+    if (!o.ok)
       return {
-        content: [{ type: "text", text: s }],
+        content: [{ type: "text", text: o.message }],
         isError: !0
       };
-    }
-    return !(i != null && i.results) || i.results.length === 0 ? {
+    const s = o.uppercase ? n.toUpperCase() : n, d = new y().dataset("drug").context("drugsfda").search(`${o.path}:"${s}"`).limit(i).build(), { data: c, error: l } = await v(d);
+    if (l)
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Failed to retrieve Drugs@FDA data for "${s}" in ${o.path}: ${l.message}`
+          }
+        ],
+        isError: !0
+      };
+    if (!(c != null && c.results) || c.results.length === 0)
+      return {
+        content: [
+          {
+            type: "text",
+            text: `No Drugs@FDA records found for "${s}" in ${o.path}.`
+          }
+        ]
+      };
+    const a = (f = (g = c.meta) == null ? void 0 : g.results) == null ? void 0 : f.total;
+    return {
       content: [
         {
           type: "text",
-          text: `No drugsfda data found for "${n}" in ${e}.${t}. Please verify the search parameters.`
+          text: `${x(c.results.length, a, `Drugs@FDA records matching ${o.path}`)}
+
+${JSON.stringify({ matched_via: o.path, ...k(c.results, a, i) }, null, 2)}`
         }
       ]
-    } : {
+    };
+  }
+}, we = [
+  "patient.reaction.reactionmeddrapt.exact",
+  "patient.reaction.reactionoutcome",
+  "serious",
+  "patient.patientsex",
+  "occurcountry.exact",
+  "patient.drug.openfda.generic_name.exact"
+], ke = {
+  name: "get-drug-adverse-event-counts",
+  description: "Rank adverse-event values for a drug by frequency — for example the most commonly reported reactions. Returns aggregated {term, count} pairs as results, not individual reports, along with matched_via, counted_by (the field that was aggregated) and returned (how many ranked terms came back). Note that openFDA omits a result total on aggregated responses, so this tool reports no total; use get-drug-adverse-events for individual reports and their total.",
+  // Raw upstream records wrapped in an envelope: declare only the envelope
+  // keys this tool guarantees (matched_via, counted_by, returned, results),
+  // never inner record fields, because those vary per record. There is no
+  // `total` or `limit` here — openFDA omits a total on aggregated
+  // responses, so this tool deliberately does not declare one.
+  returnsFields: ["matched_via", "counted_by", "returned", "results"],
+  inputSchema: u.object({
+    drugName: u.string().describe("Drug name (brand, generic or substance)"),
+    field: u.enum(we).optional().default("patient.reaction.reactionmeddrapt.exact").describe("Field to aggregate by"),
+    limit: u.number().int().min(1).max(100).optional().default(10).describe("Maximum number of ranked terms to return")
+  }),
+  async handler({
+    drugName: e,
+    field: t,
+    limit: n
+  }) {
+    const r = t ?? "patient.reaction.reactionmeddrapt.exact", i = n ?? 10, o = new y().dataset("drug").context("event").search(q(e)).count(r).limit(i).build(), { data: s, error: d } = await v(o);
+    if (d)
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Failed to retrieve adverse event counts for "${e}": ${d.message}`
+          }
+        ],
+        isError: !0
+      };
+    if (!(s != null && s.results) || s.results.length === 0)
+      return {
+        content: [
+          {
+            type: "text",
+            text: `No adverse event counts found for "${e}".`
+          }
+        ]
+      };
+    const c = {
+      matched_via: G,
+      counted_by: r,
+      returned: s.results.length,
+      results: s.results
+    };
+    return {
       content: [
         {
           type: "text",
-          text: `drugsfda data retrieved successfully:
+          text: `Top ${s.results.length} values of ${r} for "${e}" (aggregated responses carry no result total)
 
-${JSON.stringify(i.results[0], null, 2)}`
+${JSON.stringify(c, null, 2)}`
         }
       ]
     };
   }
-}, de = "1.1.0", R = new K(
+}, Ee = "1.2.0", Y = new z(
   {
     name: "openfda",
-    version: de,
+    version: Ee,
     description: "OpenFDA Model Context Protocol"
   },
   {
@@ -783,20 +1067,21 @@ ${JSON.stringify(i.results[0], null, 2)}`
       tools: {}
     }
   }
-), y = new J(R);
-y.registerTool(H);
-y.registerTool(Q);
-y.registerTool(ne);
-y.registerTool(ae);
-y.registerTool(re);
-y.registerTool(ie);
-y.registerTool(ce);
-y.registerTool(ue);
-async function pe() {
-  B();
-  const e = new L();
-  await R.connect(e), console.error("OpenFDA MCP Server running on stdio");
+), b = new ne(Y);
+b.registerTool(ie);
+b.registerTool(ce);
+b.registerTool(pe);
+b.registerTool(me);
+b.registerTool(fe);
+b.registerTool(be);
+b.registerTool(ye);
+b.registerTool(xe);
+b.registerTool(ke);
+async function De() {
+  te();
+  const e = new H();
+  await Y.connect(e), console.error("OpenFDA MCP Server running on stdio");
 }
-pe().catch((e) => {
+De().catch((e) => {
   console.error("Fatal error in main():", e), process.exit(1);
 });