@ythalorossy/openfda 1.1.0 → 1.3.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";
+var Q = Object.defineProperty;
+var Z = (e, t, n) => t in e ? Q(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var A = (e, t, n) => Z(e, typeof t != "symbol" ? t + "" : t, n);
+import { McpServer as ee } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport as te } 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/
+const ne = `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.`, re = "openfda: OPENFDA_ALLOW_KEYLESS=1 — using the unauthenticated tier (40 requests/minute, no rate-limit visibility). Set OPENFDA_API_KEY for 240 requests/minute.", ae = "openfda: OPENFDA_API_KEY is not set; every tool call will return a configuration error. See https://open.fda.gov/apis/authentication/";
+function C(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: ne };
 }
-function B(e = process.env) {
-  const t = E(e);
-  t.ok ? t.apiKey === null && console.error(q) : console.error(Y);
+function se(e = process.env) {
+  const t = C(e);
+  t.ok ? t.apiKey === null && console.error(re) : console.error(ae);
 }
-class J {
+class oe {
   constructor(t) {
-    D(this, "registerTool", (t) => this.server.registerTool(
+    A(this, "registerTool", (t) => this.server.registerTool(
       t.name,
       {
         title: t.name,
@@ -27,7 +27,7 @@ class J {
         inputSchema: t.inputSchema
       },
       async (n) => {
-        const a = E();
+        const a = C();
         return a.ok ? t.handler(n) : {
           content: [{ type: "text", text: a.message }],
           isError: !0
@@ -37,43 +37,44 @@ class J {
     this.server = t;
   }
 }
-const m = (e) => Array.isArray(e) ? e : [], P = (e) => {
-  const t = m(e.warnings);
-  return t.length > 0 ? t : m(e.warnings_and_cautions);
+const f = (e) => Array.isArray(e) ? e : [], j = (e) => {
+  const t = f(e.warnings);
+  return t.length > 0 ? t : f(e.warnings_and_cautions);
 };
-function W(e) {
+function ie(e) {
   return {
-    boxed_warning: m(e.boxed_warning),
-    warnings: P(e),
-    warnings_and_cautions: m(e.warnings_and_cautions),
-    contraindications: m(e.contraindications),
-    drug_interactions: m(e.drug_interactions),
-    precautions: m(e.precautions),
-    adverse_reactions: m(e.adverse_reactions),
-    overdosage: m(e.overdosage),
-    do_not_use: m(e.do_not_use),
-    ask_doctor: m(e.ask_doctor),
-    stop_use: m(e.stop_use),
-    pregnancy_or_breast_feeding: m(e.pregnancy_or_breast_feeding)
+    boxed_warning: f(e.boxed_warning),
+    warnings: j(e),
+    warnings_and_cautions: f(e.warnings_and_cautions),
+    contraindications: f(e.contraindications),
+    drug_interactions: f(e.drug_interactions),
+    precautions: f(e.precautions),
+    adverse_reactions: f(e.adverse_reactions),
+    overdosage: f(e.overdosage),
+    do_not_use: f(e.do_not_use),
+    ask_doctor: f(e.ask_doctor),
+    ask_doctor_or_pharmacist: f(e.ask_doctor_or_pharmacist),
+    stop_use: f(e.stop_use),
+    pregnancy_or_breast_feeding: f(e.pregnancy_or_breast_feeding)
   };
 }
-function V(e) {
+function ce(e) {
   return {
-    indications_and_usage: m(e.indications_and_usage),
-    boxed_warning: m(e.boxed_warning),
-    warnings: P(e),
-    warnings_and_cautions: m(e.warnings_and_cautions),
-    do_not_use: m(e.do_not_use),
-    ask_doctor: m(e.ask_doctor),
-    ask_doctor_or_pharmacist: m(e.ask_doctor_or_pharmacist),
-    stop_use: m(e.stop_use),
-    pregnancy_or_breast_feeding: m(e.pregnancy_or_breast_feeding)
+    indications_and_usage: f(e.indications_and_usage),
+    boxed_warning: f(e.boxed_warning),
+    warnings: j(e),
+    warnings_and_cautions: f(e.warnings_and_cautions),
+    do_not_use: f(e.do_not_use),
+    ask_doctor: f(e.ask_doctor),
+    ask_doctor_or_pharmacist: f(e.ask_doctor_or_pharmacist),
+    stop_use: f(e.stop_use),
+    pregnancy_or_breast_feeding: f(e.pregnancy_or_breast_feeding)
   };
 }
-class b {
+class x {
   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,207 +88,268 @@ 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)
       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 u = C(), s = new URLSearchParams();
+    u.ok && u.apiKey && s.set("api_key", u.apiKey), s.set("search", String(a)), s.set("limit", String(i));
+    for (const o of ["count", "skip", "sort"]) {
+      const c = this.params.get(o);
+      c !== void 0 && s.set(o, String(c));
+    }
+    return `${this.urlBase}/${t}/${n}.json?${s}`;
   }
 }
-const C = (e) => e.replace(/([?&]api_key=)[^&\s]*/gi, "$1<REDACTED>"), z = {
+const I = (e) => e.replace(/([?&]api_key=)[^&\s]*/gi, "$1<REDACTED>"), ue = {
   maxRetries: 3,
   retryDelay: 1e3,
   // 1 second
   timeout: 3e4
   // 30 seconds
 };
-function T(e) {
+function R(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 $(e, t = {}) {
+  const { maxRetries: n, retryDelay: a, timeout: i } = { ...ue, ...t }, u = {
     "User-Agent": "@ythalorossy/openfda",
     Accept: "application/json"
   };
   let s = null;
-  for (let p = 0; p <= n; p++)
+  for (let o = 0; o <= n; o++)
     try {
-      const c = new AbortController(), f = setTimeout(() => c.abort(), i), r = await fetch(e, {
-        headers: o,
+      const c = new AbortController(), l = setTimeout(() => c.abort(), i), r = await fetch(e, {
+        headers: u,
         signal: c.signal
       });
-      if (clearTimeout(f), !r.ok) {
-        const u = await r.text().catch(() => "Unable to read error response"), l = {
+      if (clearTimeout(l), !r.ok) {
+        const _ = await r.text().catch(() => "Unable to read error response"), m = {
           type: "http",
           message: `HTTP ${r.status}: ${r.statusText}`,
           status: r.status,
-          details: u
+          details: _
         };
         switch (r.status) {
           case 400:
-            l.message = "Bad Request: Invalid search query or parameters";
+            m.message = "Bad Request: Invalid search query or parameters";
             break;
           case 401:
-            l.message = "Unauthorized: Invalid or missing API key";
+            m.message = "Unauthorized: Invalid or missing API key";
             break;
           case 403:
-            l.message = "Forbidden: API key may be invalid or quota exceeded";
+            m.message = "Forbidden: API key may be invalid or quota exceeded";
             break;
           case 404:
-            l.message = "Not Found: No results found for the specified query";
+            m.message = "Not Found: No results found for the specified query";
             break;
           case 429:
-            l.message = "Rate Limited: Too many requests. Retrying...";
+            m.message = "Rate Limited: Too many requests. Retrying...";
             break;
           case 500:
-            l.message = "Server Error: OpenFDA service is experiencing issues";
+            m.message = "Server Error: OpenFDA service is experiencing issues";
             break;
           default:
-            l.message = `HTTP Error ${r.status}: ${r.statusText}`;
+            m.message = `HTTP Error ${r.status}: ${r.statusText}`;
         }
-        if (s = l, r.status >= 400 && r.status < 500 && r.status !== 429)
+        if (s = m, r.status >= 400 && r.status < 500 && r.status !== 429)
           break;
-        if (p < n && T({ status: r.status })) {
-          const h = a * Math.pow(2, p);
-          await F(h);
+        if (o < n && R({ status: r.status })) {
+          const g = a * Math.pow(2, o);
+          await P(g);
           continue;
         }
         break;
       }
-      let g;
+      let h;
       try {
-        g = await r.json();
-      } catch (u) {
+        h = await r.json();
+      } catch (_) {
         s = {
           type: "parsing",
-          message: C(
-            `Failed to parse JSON response: ${u instanceof Error ? u.message : "Unknown parsing error"}`
+          message: I(
+            `Failed to parse JSON response: ${_ instanceof Error ? _.message : "Unknown parsing error"}`
           ),
-          details: u
+          details: _
         };
         break;
       }
-      if (!g) {
+      if (!h) {
         s = {
           type: "empty_response",
           message: "Received empty response from OpenFDA API"
         };
         break;
       }
-      return { data: g, error: null };
+      return { data: h, 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: I(
           `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, o < n && R(c)) {
+        const r = a * Math.pow(2, o);
+        await P(r);
         continue;
       }
       break;
     }
   return { data: null, error: s };
 }
-const X = [
+const L = [
   "openfda.brand_name",
   "openfda.generic_name",
   "openfda.substance_name",
   "spl_product_data_elements"
 ];
-async function O(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);
-    if (s) {
-      n = s;
+async function X(e, t = 1, n) {
+  let a;
+  for (const i of L) {
+    const u = new x().dataset("drug").context("label").search(`${i}:"${e}"`).limit(t);
+    n !== void 0 && u.skip(n);
+    const s = u.build(), { data: o, error: c } = await $(s);
+    if (c) {
+      a = c;
       continue;
     }
     if (o != null && o.results && o.results.length > 0)
-      return { found: !0, matched_via: a, data: o };
+      return { found: !0, matched_via: i, data: o };
   }
-  return { found: !1, error: n };
+  return { found: !1, error: a };
 }
-const U = (e) => `No label found for "${e}".
+const K = (e) => `No label found for "${e}".
 
-Searched, in order: ${X.join(", ")}.
+Searched, in order: ${L.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 O(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) ?? null;
+}
+function w(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 de = {
   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.",
+  description: `Look up a drug by brand, generic or substance name. Returns an array of labels (default 1, up to limit), each with substance_name, brand_name, generic_name, manufacturer_name, product_ndc, 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. The first label is not necessarily the most canonical one — a popular brand can have dozens of labels, and the top match is often a combination product (e.g. "Advil" can return Advil Dual Action with Acetaminophen before plain ibuprofen). substance_name is listed first in each label specifically so a combination product is obvious at a glance. Use limit and skip to page through the rest when the total is high or the first result looks like a combination. route comes from openfda.route, the SPL route of administration. get-drugsfda's products[].route is the Drugs@FDA product route and uses a different controlled vocabulary — the same product can be SUBCUTANEOUS here and INJECTION there — so joining on route across tools will silently miss.`,
+  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: d.object({
-    drugName: d.string().describe("Drug name")
+    drugName: d.string().describe("Drug name (brand, generic or substance)"),
+    limit: d.number().int().min(1).max(25).optional().default(1).describe("Maximum number of labels to return"),
+    skip: d.number().int().min(0).optional().describe(
+      "Offset into the matching labels. The first label is not necessarily the most canonical one — for a brand with many labels, skip reaches the others."
+    )
   }),
-  async handler({ drugName: e }) {
-    const t = await O(e, 1);
-    if (!t.found)
-      return t.error ? {
+  async handler({
+    drugName: e,
+    limit: t,
+    skip: n
+  }) {
+    var s, o, c, l;
+    const a = await X(e, t ?? 1, n);
+    if (!a.found)
+      return a.error ? {
         content: [
           {
             type: "text",
-            text: `Failed to retrieve drug data for "${e}": ${t.error.message}`
+            text: `Failed to retrieve drug data for "${e}": ${a.error.message}`
           }
         ],
         isError: !0
       } : {
-        content: [{ type: "text", text: U(e) }]
+        content: [{ type: "text", text: K(e) }]
       };
-    const n = t.data.results[0], a = {
-      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,
-      product_ndc: n == null ? void 0 : n.openfda.product_ndc,
-      product_type: n == null ? void 0 : n.openfda.product_type,
-      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)
+    const i = a.data.results.map((r) => ({
+      // substance_name first: a combination product must be obvious at a
+      // glance, because the top match for a brand is often a combination.
+      substance_name: (r == null ? void 0 : r.openfda.substance_name) ?? [],
+      brand_name: (r == null ? void 0 : r.openfda.brand_name) ?? [],
+      generic_name: (r == null ? void 0 : r.openfda.generic_name) ?? [],
+      manufacturer_name: (r == null ? void 0 : r.openfda.manufacturer_name) ?? [],
+      product_ndc: (r == null ? void 0 : r.openfda.product_ndc) ?? [],
+      product_type: (r == null ? void 0 : r.openfda.product_type) ?? [],
+      route: (r == null ? void 0 : r.openfda.route) ?? [],
+      matched_via: a.matched_via,
+      ...ce(r)
+    })), u = {
+      // Only present when the caller supplied it, mirroring
+      // get-drug-adverse-events so paged responses stay distinguishable.
+      ...n !== void 0 ? { skip: n } : {},
+      ...S(i, (o = (s = a.data.meta) == null ? void 0 : s.results) == null ? void 0 : o.total, t ?? 1)
     };
     return {
       content: [
         {
           type: "text",
-          text: `Drug information retrieved successfully:
+          text: `${w(i.length, (l = (c = a.data.meta) == null ? void 0 : c.results) == null ? void 0 : l.total, `labels matching "${e}"`)}
 
-${JSON.stringify(a, null, 2)}`
+${JSON.stringify(u, 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 = {
+}, le = {
   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.",
+  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: d.object({
     genericName: d.string().describe("Generic drug name (active ingredient)"),
     limit: d.number().optional().default(5).describe("Maximum number of results to return")
@@ -296,8 +358,8 @@ const Q = {
     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, o, c, l;
+    const n = new x().dataset("drug").context("label").search(`openfda.generic_name:"${e}"`).limit(t).build(), { data: a, error: i } = await $(n);
     if (i)
       return {
         content: [
@@ -317,13 +379,15 @@ const Q = {
           }
         ]
       };
-    const o = a.results.map((r) => {
-      var g, u, l, h;
+    const u = a.results.map((r) => {
+      var h, _, m;
       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",
+        brand_name: ((h = r == null ? void 0 : r.openfda.brand_name) == null ? void 0 : h[0]) || "Unknown",
+        generic_name: O(
+          (r == null ? void 0 : r.openfda) ?? {}
+        ),
+        manufacturer_name: ((_ = r == null ? void 0 : r.openfda.manufacturer_name) == null ? void 0 : _[0]) || "Unknown",
+        product_type: ((m = r == null ? void 0 : r.openfda.product_type) == null ? void 0 : m[0]) || "Unknown",
         route: (r == null ? void 0 : r.openfda.route) || []
       };
     });
@@ -331,14 +395,14 @@ const Q = {
       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: `${w(u.length, (o = (s = a.meta) == null ? void 0 : s.results) == null ? void 0 : o.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(S(u, (l = (c = a.meta) == null ? void 0 : c.results) == null ? void 0 : l.total, t ?? 5), null, 2)}`
         }
       ]
     };
   }
-}, Z = {
+}, G = {
   1: "Recovered/resolved",
   2: "Recovering/resolving",
   3: "Not recovered/not resolved",
@@ -346,49 +410,112 @@ ${JSON.stringify(S(o, (f = (c = a.meta) == null ? void 0 : c.results) == null ?
   5: "Fatal",
   6: "Unknown"
 };
-function ee(e) {
+function pe(e) {
   if (e == null || e === "") return "Not reported";
   const t = String(e);
-  return Z[t] ?? `Unrecognized outcome code "${t}"`;
+  return G[t] ?? `Unrecognized outcome code "${t}"`;
+}
+const q = {
+  1: "Serious",
+  2: "Not serious"
+}, B = {
+  0: "Unknown",
+  1: "Male",
+  2: "Female"
+}, me = {
+  serious: q,
+  "patient.patientsex": B,
+  "patient.reaction.reactionoutcome": G
+};
+function fe(e, t) {
+  if (t == null || t === "") return "Not reported";
+  const n = me[e];
+  if (!n) return String(t);
+  const a = String(t);
+  return n[a] ?? `Unrecognized ${e} code "${a}"`;
+}
+const V = [
+  "patient.drug.openfda.generic_name",
+  "patient.drug.openfda.substance_name",
+  "patient.drug.medicinalproduct"
+], J = `union(${V.join(", ")})`;
+function W(e) {
+  return V.map((t) => `${t}:"${e}"`).join(
+    " OR "
+  );
 }
-function te(e) {
+function _e(e) {
   const t = /* @__PURE__ */ new Set(), n = [];
   for (const a of e) {
     const i = a == null ? void 0 : a.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 u = `${i}\0${String(a == null ? void 0 : a.reactionoutcome)}`;
+    t.has(u) || (t.add(u), n.push({ reaction: i, outcome: a == null ? void 0 : a.reactionoutcome }));
   }
   return n.slice(0, 3);
 }
-const ne = {
+const F = 25e3, he = {
   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.",
+  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: 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")
+    seriousness: d.enum(["serious", "non-serious", "all"]).optional().default("all").describe("Filter by event seriousness"),
+    skip: d.number().int().min(0).max(F).optional().describe(
+      `Offset into the result set, for paging past the limit. Maximum ${F}.`
+    ),
+    sort: d.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: a,
+    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 g, y;
+    if (a !== void 0 && a > 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 ${a}. 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 u = W(e);
+    n !== "all" && (u = `(${u}) AND serious:${n === "serious" ? "1" : "2"}`);
+    const s = new x().dataset("drug").context("event").search(u).limit(t);
+    a !== void 0 && s.skip(a), i !== void 0 && s.sort(i);
+    const o = s.build(), { data: c, error: l } = await $(o);
+    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,35 +524,54 @@ const ne = {
           }
         ]
       };
-    const p = o.results.map((u) => {
-      var h, _, $, v;
-      const l = te(((h = u.patient) == null ? void 0 : h.reaction) ?? []);
+    const r = c.results.map((p) => {
+      var D, E, N;
+      const k = _e(((D = p.patient) == null ? void 0 : D.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,
+        // Same map the counts tool uses, so the two tools cannot disagree.
+        serious: q[String(p.serious)] ?? "Not reported",
+        patient_age: ((E = p.patient) == null ? void 0 : E.patientonsetage) || "Unknown",
+        patient_sex: B[String((N = p.patient) == null ? void 0 : N.patientsex)] ?? "Not reported",
         // 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: k.map((v) => v.reaction),
+        outcomes: k.map((v) => pe(v.outcome)),
+        report_date: p.receiptdate || "Unknown"
       };
-    });
+    }), h = (y = (g = c.meta) == null ? void 0 : g.results) == null ? void 0 : y.total, _ = a !== void 0 ? `${w(r.length, h, `adverse event reports for "${e}"`)}, starting at offset ${a}` : w(
+      r.length,
+      h,
+      `adverse event reports for "${e}"`
+    ), m = {
+      matched_via: J,
+      ...a !== void 0 ? { skip: a } : {},
+      ...S(r, h, 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: `${_}
 
-${JSON.stringify(S(p, (g = (r = o.meta) == null ? void 0 : r.results) == null ? void 0 : g.total, t ?? 10), null, 2)}`
+${JSON.stringify(m, null, 2)}`
         }
       ]
     };
   }
-}, ae = {
+}, ge = {
   name: "get-drugs-by-manufacturer",
-  description: "Get all drugs manufactured by a specific company. Useful for finding alternatives or checking manufacturer portfolios.",
+  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: d.object({
     manufacturerName: d.string().describe("Manufacturer/company name"),
     limit: d.number().optional().default(20).describe("Maximum number of drugs to return")
@@ -434,8 +580,8 @@ ${JSON.stringify(S(p, (g = (r = o.meta) == null ? void 0 : r.results) == null ?
     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, o, c, l;
+    const n = new x().dataset("drug").context("label").search(`openfda.manufacturer_name:"${e}"`).limit(t).build(), { data: a, error: i } = await $(n);
     if (i)
       return {
         content: [
@@ -455,36 +601,56 @@ ${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 u = a.results.map((r) => {
+      var h, _, m;
       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",
+        brand_name: ((h = r == null ? void 0 : r.openfda.brand_name) == null ? void 0 : h[0]) || "Unknown",
+        generic_name: O(
+          (r == null ? void 0 : r.openfda) ?? {}
+        ),
+        product_type: ((_ = r == null ? void 0 : r.openfda.product_type) == null ? void 0 : _[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"
+        ndc: ((m = r == null ? void 0 : r.openfda.product_ndc) == null ? void 0 : m[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: `${w(u.length, (o = (s = a.meta) == null ? void 0 : s.results) == null ? void 0 : o.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", ...S(u, (l = (c = a.meta) == null ? void 0 : c.results) == null ? void 0 : l.total, t ?? 20) }, null, 2)}`
         }
       ]
     };
   }
-}, re = {
+}, be = {
   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.",
+  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, ask_doctor_or_pharmacist, 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. generic_name is null when the label carries no structured generic or substance name. 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",
+    "ask_doctor_or_pharmacist",
+    "stop_use",
+    "pregnancy_or_breast_feeding"
+  ],
   inputSchema: d.object({
     drugName: d.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 +661,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: K(e) }]
       };
     const n = t.data.results[0], a = {
       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: O(
+        (n == null ? void 0 : n.openfda) ?? {}
+      ),
       matched_via: t.matched_via,
-      ...W(n)
+      ...ie(n)
     };
     return {
       content: [
@@ -514,18 +682,18 @@ ${JSON.stringify(a, null, 2)}`
       ]
     };
   }
-}, se = /^(?:\d{4}-\d{4}|\d{5}-\d{3,4})$/, oe = /^\d{1,2}$/;
-function I(e) {
+}, ye = /^(?:\d{4}-\d{4}|\d{5}-\d{3,4})$/, ve = /^\d{1,2}$/;
+function Y(e) {
   const t = e.trim().toUpperCase(), n = { productNDC: t, packageNDC: null, isValid: !1 };
   let a, i = null;
   if (t.includes("-")) {
-    const o = t.split("-");
-    if (o.length === 2)
+    const u = t.split("-");
+    if (u.length === 2)
       a = t;
-    else if (o.length === 3) {
-      const s = o[2];
-      if (!s || !oe.test(s)) return n;
-      a = `${o[0]}-${o[1]}`, i = t;
+    else if (u.length === 3) {
+      const s = u[2];
+      if (!s || !ve.test(s)) return n;
+      a = `${u[0]}-${u[1]}`, i = t;
     } else
       return n;
   } else if (/^\d+$/.test(t))
@@ -537,48 +705,66 @@ function I(e) {
       return n;
   else
     return n;
-  return se.test(a) ? { productNDC: a, packageNDC: i, isValid: !0 } : n;
+  return ye.test(a) ? { productNDC: a, packageNDC: i, isValid: !0 } : n;
 }
-const ie = {
+const xe = [
+  "✅ 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(`
+`), z = (e, t) => `Invalid ${t} format: "${e}"
+
+${xe}`, $e = {
   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.",
+  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: d.object({
     ndcCode: d.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);
+    var _, m, g, y;
+    const { productNDC: t, packageNDC: n, isValid: a } = Y(e);
     if (!a)
       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: z(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 u = n ? "openfda.product_ndc OR openfda.package_ndc" : "openfda.product_ndc", s = new x().dataset("drug").context("label").search(i).limit(10).build(), { data: o, error: c } = await $(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 (!(o != null && o.results) || o.results.length === 0)
       return {
         content: [
           {
@@ -592,81 +778,88 @@ 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 = o.results.map((p) => {
+      var E, N;
+      const k = ((E = p.openfda.product_ndc) == null ? void 0 : E.filter((v) => v === t)) || [], D = ((N = p.openfda.package_ndc) == null ? void 0 : N.filter(
+        (v) => n ? v === n : v.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: k,
+        matching_package_ndc: D,
+        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,
+    }), r = l.reduce(
+      (p, k) => p + k.matching_package_ndc.length,
       0
-    ), r = n ? `Searched for specific package NDC: ${n}` : `Searched for product NDC: ${t} (all packages)`;
+    ), h = 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: `${w(l.length, (m = (_ = o.meta) == null ? void 0 : _.results) == null ? void 0 : m.total, `labels for NDC "${e}"`)} with ${r} package(s)
 
-${r}
+${h}
 
-${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: u, ...S(l, (y = (g = o.meta) == null ? void 0 : g.results) == null ? void 0 : y.total, 10) }, null, 2)}`
         }
       ]
     };
   }
-}, ce = {
+}, we = {
   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.",
+  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: d.object({
     productNDC: d.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 } = Y(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: z(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);
-    if (o)
+    const a = new x().dataset("drug").context("label").search(`openfda.product_ndc:"${t}"`).limit(1).build(), { data: i, error: u } = await $(a);
+    if (u)
       return {
         content: [
           {
             type: "text",
-            text: `Failed to retrieve drug data for product NDC "${e}": ${o.message}`
+            text: `Failed to retrieve drug data for product NDC "${e}": ${u.message}`
           }
         ],
         isError: !0
@@ -681,11 +874,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(
+    const s = i.results[0], o = ((l = s.openfda.package_ndc) == null ? void 0 : l.filter(
       (r) => r.startsWith(t)
     )) || [], c = {
       product_ndc: t,
-      available_packages: p,
+      available_packages: o,
       brand_name: s.openfda.brand_name || [],
       generic_name: s.openfda.generic_name || [],
       manufacturer_name: s.openfda.manufacturer_name || [],
@@ -700,81 +893,245 @@ 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 ${o.length} package variation(s):
 
 ${JSON.stringify(c, null, 2)}`
         }
       ]
     };
   }
-}, ue = {
+}, U = {
+  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: {} }
+  }
+}, T = Object.keys(U);
+function ke(e, t) {
+  const n = U[e];
+  if (!n)
+    return {
+      ok: !1,
+      message: `Unknown section "${e}". Valid sections: ${T.join(", ")}.`
+    };
+  const a = n.fields[t];
+  return a ? {
+    ok: !0,
+    path: n.prefix ? `${n.prefix}.${t}` : t,
+    uppercase: a.uppercase === !0
+  } : {
+    ok: !1,
+    message: `Unknown field "${t}" for section "${e}". Valid fields: ${Object.keys(n.fields).join(", ")}.`
+  };
+}
+const Se = (e) => `${e}: ${Object.keys(U[e].fields).join(", ")}`, M = 10, Ee = (e) => ({
+  ...e,
+  te_code: e.te_code ?? null
+}), Ne = (e, t) => {
+  const n = Array.isArray(e.submissions) ? e.submissions : [], a = Array.isArray(e.products) ? e.products : [], i = {
+    application_number: e.application_number,
+    sponsor_name: e.sponsor_name,
+    // openFDA omits openfda entirely on most records (43/50 for a LILLY
+    // sponsor_name search); emit it either way, matching te_code above.
+    openfda: e.openfda ?? {},
+    products: a.map(Ee),
+    submission_count: n.length
+  };
+  return t === "summary" ? i : {
+    ...i,
+    submissions: n.slice(0, M),
+    submissions_truncated: n.length > M
+  };
+}, De = {
   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.",
+  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. detail controls record shape: summary (default) returns application_number, sponsor_name, openfda, products and a submission_count; full adds the submissions array, capped at 10 per record, plus submissions_truncated when more were omitted. This default changed in 1.3.0: submissions is no longer returned unless detail is set to full. Note: openfda.route is the SPL route of administration and products[].route is the Drugs@FDA product route. They use different controlled vocabularies — the same product can be SUBCUTANEOUS in one and INJECTION in the other — so joining on route across tools will silently miss.",
+  // 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: d.object({
-    sectionName: d.string().describe(
-      "Section within drugsfda. Valid values: application, openfda, products, submissions, application_docs"
-    ),
+    sectionName: d.enum([...T]).describe(`Section to search. One of: ${T.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"
+      `Field within the section. ${T.map(Se).join(". ")}`
+    ),
+    searchValue: d.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: d.number().int().min(1).max(100).optional().default(5).describe("Maximum number of records to return"),
+    detail: d.enum(["summary", "full"]).optional().default("summary").describe(
+      "summary (default) returns application number, sponsor, products and a submission count. full adds the submissions array, capped per record."
+    )
   }),
   async handler({
     sectionName: e,
     fieldName: t,
-    searchValue: n
+    searchValue: n,
+    limit: a,
+    detail: i
   }) {
-    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, y;
+    const u = a ?? 5, s = i ?? "summary", o = ke(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 c = o.uppercase ? n.toUpperCase() : n, l = new x().dataset("drug").context("drugsfda").search(`${o.path}:"${c}"`).limit(u).build(), { data: r, error: h } = await $(l);
+    if (h)
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Failed to retrieve Drugs@FDA data for "${c}" in ${o.path}: ${h.message}`
+          }
+        ],
+        isError: !0
+      };
+    if (!(r != null && r.results) || r.results.length === 0)
+      return {
+        content: [
+          {
+            type: "text",
+            text: `No Drugs@FDA records found for "${c}" in ${o.path}.`
+          }
+        ]
+      };
+    const _ = (y = (g = r.meta) == null ? void 0 : g.results) == null ? void 0 : y.total, m = r.results.map(
+      (p) => Ne(p, s)
+    );
+    return {
       content: [
         {
           type: "text",
-          text: `No drugsfda data found for "${n}" in ${e}.${t}. Please verify the search parameters.`
+          text: `${w(r.results.length, _, `Drugs@FDA records matching ${o.path}`)}
+
+${JSON.stringify({ matched_via: o.path, ...S(m, _, u) }, null, 2)}`
         }
       ]
-    } : {
+    };
+  }
+}, Ae = [
+  "patient.reaction.reactionmeddrapt.exact",
+  "patient.reaction.reactionoutcome",
+  "serious",
+  "patient.patientsex",
+  "occurcountry.exact",
+  "patient.drug.openfda.generic_name.exact"
+], Fe = {
+  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, term_code, 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). For coded fields (serious, patient.patientsex, patient.reaction.reactionoutcome), term is a decoded human-readable label (e.g. "Serious", "Female") and term_code is the raw upstream value; for text fields term and term_code are identical. 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: d.object({
+    drugName: d.string().describe("Drug name (brand, generic or substance)"),
+    field: d.enum(Ae).optional().default("patient.reaction.reactionmeddrapt.exact").describe("Field to aggregate by"),
+    limit: d.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 a = t ?? "patient.reaction.reactionmeddrapt.exact", i = n ?? 10, u = new x().dataset("drug").context("event").search(W(e)).count(a).limit(i).build(), { data: s, error: o } = await $(u);
+    if (o)
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Failed to retrieve adverse event counts for "${e}": ${o.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: J,
+      counted_by: a,
+      returned: s.results.length,
+      // Decode coded enums; text fields pass through. term_code keeps the
+      // raw value so callers aggregating by code are unaffected.
+      results: s.results.map((l) => ({
+        term: fe(a, l.term),
+        term_code: l.term,
+        count: l.count
+      }))
+    };
+    return {
       content: [
         {
           type: "text",
-          text: `drugsfda data retrieved successfully:
+          text: `Top ${s.results.length} values of ${a} 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(
+}, Te = "1.3.0", H = new ee(
   {
     name: "openfda",
-    version: de,
+    version: Te,
     description: "OpenFDA Model Context Protocol"
   },
   {
@@ -783,20 +1140,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 oe(H);
+b.registerTool(de);
+b.registerTool(le);
+b.registerTool(he);
+b.registerTool(ge);
+b.registerTool(be);
+b.registerTool($e);
+b.registerTool(we);
+b.registerTool(De);
+b.registerTool(Fe);
+async function Ce() {
+  se();
+  const e = new te();
+  await H.connect(e), console.error("OpenFDA MCP Server running on stdio");
 }
-pe().catch((e) => {
+Ce().catch((e) => {
   console.error("Fatal error in main():", e), process.exit(1);
 });