@ythalorossy/openfda 1.2.0 → 1.3.0

package/dist/index.js

@@ -1,23 +1,23 @@
 #!/usr/bin/env node
-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/
+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 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.`, 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) {
+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: Q };
+  return t ? { ok: !0, apiKey: t } : e.OPENFDA_ALLOW_KEYLESS === "1" ? { ok: !0, apiKey: null } : { ok: !1, message: ne };
 }
-function te(e = process.env) {
-  const t = O(e);
-  t.ok ? t.apiKey === null && console.error(Z) : console.error(ee);
+function se(e = process.env) {
+  const t = C(e);
+  t.ok ? t.apiKey === null && console.error(re) : console.error(ae);
 }
-class ne {
+class oe {
   constructor(t) {
     A(this, "registerTool", (t) => this.server.registerTool(
       t.name,
@@ -27,9 +27,9 @@ class ne {
         inputSchema: t.inputSchema
       },
       async (n) => {
-        const r = O();
-        return r.ok ? t.handler(n) : {
-          content: [{ type: "text", text: r.message }],
+        const a = C();
+        return a.ok ? t.handler(n) : {
+          content: [{ type: "text", text: a.message }],
           isError: !0
         };
       }
@@ -37,40 +37,41 @@ class ne {
     this.server = t;
   }
 }
-const m = (e) => Array.isArray(e) ? e : [], M = (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 re(e) {
+function ie(e) {
   return {
-    boxed_warning: m(e.boxed_warning),
-    warnings: M(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 ae(e) {
+function ce(e) {
   return {
-    indications_and_usage: m(e.indications_and_usage),
-    boxed_warning: m(e.boxed_warning),
-    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),
-    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 y {
+class x {
   constructor() {
     A(this, "urlBase", "https://api.fda.gov");
     A(this, "params", /* @__PURE__ */ new Map());
@@ -100,102 +101,102 @@ class y {
     return this.params.set("sort", t), this;
   }
   build() {
-    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)
+    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 = 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));
+    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 U = (e) => e.replace(/([?&]api_key=)[^&\s]*/gi, "$1<REDACTED>"), se = {
+const I = (e) => e.replace(/([?&]api_key=)[^&\s]*/gi, "$1<REDACTED>"), ue = {
   maxRetries: 3,
   retryDelay: 1e3,
   // 1 second
   timeout: 3e4
   // 30 seconds
 };
-function I(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 P(e) {
   return new Promise((t) => setTimeout(t, e));
 }
-async function v(e, t = {}) {
-  const { maxRetries: n, retryDelay: r, timeout: i } = { ...se, ...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 d = 0; d <= n; d++)
+  for (let o = 0; o <= n; o++)
     try {
-      const c = new AbortController(), l = setTimeout(() => c.abort(), i), a = 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(l), !a.ok) {
-        const f = await a.text().catch(() => "Unable to read error response"), _ = {
+      if (clearTimeout(l), !r.ok) {
+        const _ = await r.text().catch(() => "Unable to read error response"), m = {
           type: "http",
-          message: `HTTP ${a.status}: ${a.statusText}`,
-          status: a.status,
-          details: f
+          message: `HTTP ${r.status}: ${r.statusText}`,
+          status: r.status,
+          details: _
         };
-        switch (a.status) {
+        switch (r.status) {
           case 400:
-            _.message = "Bad Request: Invalid search query or parameters";
+            m.message = "Bad Request: Invalid search query or parameters";
             break;
           case 401:
-            _.message = "Unauthorized: Invalid or missing API key";
+            m.message = "Unauthorized: Invalid or missing API key";
             break;
           case 403:
-            _.message = "Forbidden: API key may be invalid or quota exceeded";
+            m.message = "Forbidden: API key may be invalid or quota exceeded";
             break;
           case 404:
-            _.message = "Not Found: No results found for the specified query";
+            m.message = "Not Found: No results found for the specified query";
             break;
           case 429:
-            _.message = "Rate Limited: Too many requests. Retrying...";
+            m.message = "Rate Limited: Too many requests. Retrying...";
             break;
           case 500:
-            _.message = "Server Error: OpenFDA service is experiencing issues";
+            m.message = "Server Error: OpenFDA service is experiencing issues";
             break;
           default:
-            _.message = `HTTP Error ${a.status}: ${a.statusText}`;
+            m.message = `HTTP Error ${r.status}: ${r.statusText}`;
         }
-        if (s = _, a.status >= 400 && a.status < 500 && a.status !== 429)
+        if (s = m, r.status >= 400 && r.status < 500 && r.status !== 429)
           break;
-        if (d < n && I({ status: a.status })) {
-          const h = r * Math.pow(2, d);
-          await P(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 a.json();
-      } catch (f) {
+        h = await r.json();
+      } catch (_) {
         s = {
           type: "parsing",
-          message: U(
-            `Failed to parse JSON response: ${f instanceof Error ? f.message : "Unknown parsing error"}`
+          message: I(
+            `Failed to parse JSON response: ${_ instanceof Error ? _.message : "Unknown parsing error"}`
           ),
-          details: f
+          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 l;
       if (c.name === "AbortError" ? l = {
@@ -208,55 +209,57 @@ async function v(e, t = {}) {
         details: c.message
       } : l = {
         type: "unknown",
-        message: U(
+        message: I(
           `Unexpected error: ${c.message || "Unknown error occurred"}`
         ),
         details: c
-      }, s = l, d < n && I(c)) {
-        const a = r * Math.pow(2, d);
-        await P(a);
+      }, s = l, o < n && R(c)) {
+        const r = a * Math.pow(2, o);
+        await P(r);
         continue;
       }
       break;
     }
   return { data: null, error: s };
 }
-const j = [
+const L = [
   "openfda.brand_name",
   "openfda.generic_name",
   "openfda.substance_name",
   "spl_product_data_elements"
 ];
-async function X(e, t = 1) {
-  let n;
-  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;
+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: r, data: o };
+      return { found: !0, matched_via: i, data: o };
   }
-  return { found: !1, error: n };
+  return { found: !1, error: a };
 }
-const L = (e) => `No label found for "${e}".
+const K = (e) => `No label found for "${e}".
 
-Searched, in order: ${j.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.`;
-function oe(e) {
+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) ?? "Unknown";
+  return t(e == null ? void 0 : e.generic_name) ?? t(e == null ? void 0 : e.substance_name) ?? null;
 }
-function x(e, t, n) {
+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 k(e, t, n) {
+function S(e, t, n) {
   return {
     total: typeof t == "number" ? t : null,
     returned: e.length,
@@ -264,9 +267,9 @@ function k(e, t, n) {
     results: e
   };
 }
-const ie = {
+const de = {
   name: "get-drug-by-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.",
+  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",
@@ -284,47 +287,62 @@ const ie = {
     "indications_and_usage",
     "matched_via"
   ],
-  inputSchema: u.object({
-    drugName: u.string().describe("Drug name")
+  inputSchema: d.object({
+    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 }) {
-    var i, o, s, d;
-    const t = await X(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: L(e) }]
+        content: [{ type: "text", text: K(e) }]
       };
-    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,
-      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,
-      ...ae(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: `${x(1, (o = (i = t.data.meta) == null ? void 0 : i.results) == null ? void 0 : o.total, `labels matching "${e}"`)}
+          text: `${w(i.length, (l = (c = a.data.meta) == null ? void 0 : c.results) == null ? void 0 : l.total, `labels matching "${e}"`)}
 
-${JSON.stringify(k([r], (d = (s = t.data.meta) == null ? void 0 : s.results) == null ? void 0 : d.total, 1), null, 2)}`
+${JSON.stringify(u, null, 2)}`
         }
       ]
     };
   }
-}, ce = {
+}, 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 as results, up to limit, along with total matched and returned counts.",
   // Raw upstream records wrapped in an envelope: declare only the envelope
@@ -332,16 +350,16 @@ ${JSON.stringify(k([r], (d = (s = t.data.meta) == null ? void 0 : s.results) ==
   // 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")
+  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")
   }),
   async handler({
     genericName: e,
     limit: t
   }) {
-    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);
+    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: [
@@ -352,7 +370,7 @@ ${JSON.stringify(k([r], (d = (s = t.data.meta) == null ? void 0 : s.results) ==
         ],
         isError: !0
       };
-    if (!(r != null && r.results) || r.results.length === 0)
+    if (!(a != null && a.results) || a.results.length === 0)
       return {
         content: [
           {
@@ -361,28 +379,30 @@ ${JSON.stringify(k([r], (d = (s = t.data.meta) == null ? void 0 : s.results) ==
           }
         ]
       };
-    const o = r.results.map((a) => {
-      var g, f, _, h;
+    const u = a.results.map((r) => {
+      var h, _, m;
       return {
-        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) || []
+        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) || []
       };
     });
     return {
       content: [
         {
           type: "text",
-          text: `${x(o.length, (d = (s = r.meta) == null ? void 0 : s.results) == null ? void 0 : d.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(k(o, (l = (c = r.meta) == null ? void 0 : c.results) == null ? void 0 : l.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)}`
         }
       ]
     };
   }
-}, de = {
+}, G = {
   1: "Recovered/resolved",
   2: "Recovering/resolving",
   3: "Not recovered/not resolved",
@@ -390,32 +410,51 @@ ${JSON.stringify(k(o, (l = (c = r.meta) == null ? void 0 : c.results) == null ?
   5: "Fatal",
   6: "Unknown"
 };
-function ue(e) {
+function pe(e) {
   if (e == null || e === "") return "Not reported";
   const t = String(e);
-  return de[t] ?? `Unrecognized outcome code "${t}"`;
+  return G[t] ?? `Unrecognized outcome code "${t}"`;
 }
-const K = [
+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"
-], G = `union(${K.join(", ")})`;
-function q(e) {
-  return K.map((t) => `${t}:"${e}"`).join(
+], J = `union(${V.join(", ")})`;
+function W(e) {
+  return V.map((t) => `${t}:"${e}"`).join(
     " OR "
   );
 }
-function le(e) {
+function _e(e) {
   const t = /* @__PURE__ */ new Set(), n = [];
-  for (const r of e) {
-    const i = r == null ? void 0 : r.reactionmeddrapt;
+  for (const a of e) {
+    const i = a == null ? void 0 : a.reactionmeddrapt;
     if (!i) continue;
-    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 }));
+    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 F = 25e3, pe = {
+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. 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
@@ -432,14 +471,14 @@ const F = 25e3, pe = {
     "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(
+  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"),
+    skip: d.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(
+    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."
     )
   }),
@@ -447,25 +486,25 @@ const F = 25e3, pe = {
     drugName: e,
     limit: t,
     seriousness: n,
-    skip: r,
+    skip: a,
     sort: i
   }) {
-    var h, E;
-    if (r !== void 0 && r > F)
+    var g, y;
+    if (a !== void 0 && a > F)
       return {
         content: [
           {
             type: "text",
-            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.`
+            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
       };
-    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);
+    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: [
@@ -485,41 +524,42 @@ const F = 25e3, pe = {
           }
         ]
       };
-    const a = c.results.map((p) => {
-      var N, D, S, $;
-      const w = le(((N = p.patient) == null ? void 0 : N.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: 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",
+        // 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: w.map((T) => T.reaction),
-        outcomes: w.map((T) => ue(T.outcome)),
+        reactions: k.map((v) => v.reaction),
+        outcomes: k.map((v) => pe(v.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,
+    }), 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}"`
-    ), _ = {
-      matched_via: G,
-      ...r !== void 0 ? { skip: r } : {},
-      ...k(a, g, t ?? 10)
+    ), m = {
+      matched_via: J,
+      ...a !== void 0 ? { skip: a } : {},
+      ...S(r, h, t ?? 10)
     };
     return {
       content: [
         {
           type: "text",
-          text: `${f}
+          text: `${_}
 
-${JSON.stringify(_, null, 2)}`
+${JSON.stringify(m, null, 2)}`
         }
       ]
     };
   }
-}, me = {
+}, ge = {
   name: "get-drugs-by-manufacturer",
   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
@@ -532,16 +572,16 @@ ${JSON.stringify(_, null, 2)}`
     "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")
+  inputSchema: d.object({
+    manufacturerName: d.string().describe("Manufacturer/company name"),
+    limit: d.number().optional().default(20).describe("Maximum number of drugs to return")
   }),
   async handler({
     manufacturerName: e,
     limit: t
   }) {
-    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);
+    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: [
@@ -552,7 +592,7 @@ ${JSON.stringify(_, null, 2)}`
         ],
         isError: !0
       };
-    if (!(r != null && r.results) || r.results.length === 0)
+    if (!(a != null && a.results) || a.results.length === 0)
       return {
         content: [
           {
@@ -561,30 +601,32 @@ ${JSON.stringify(_, null, 2)}`
           }
         ]
       };
-    const o = r.results.map((a) => {
-      var g, f, _, h;
+    const u = a.results.map((r) => {
+      var h, _, m;
       return {
-        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"
+        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: ((m = r == null ? void 0 : r.openfda.product_ndc) == null ? void 0 : m[0]) || "Unknown"
       };
     });
     return {
       content: [
         {
           type: "text",
-          text: `${x(o.length, (d = (s = r.meta) == null ? void 0 : s.results) == null ? void 0 : d.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({ 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)}`
+${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)}`
         }
       ]
     };
   }
-}, fe = {
+}, be = {
   name: "get-drug-safety-info",
-  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.",
+  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",
@@ -599,11 +641,12 @@ ${JSON.stringify({ matched_via: "openfda.manufacturer_name", ...k(o, (l = (c = r
     "overdosage",
     "do_not_use",
     "ask_doctor",
+    "ask_doctor_or_pharmacist",
     "stop_use",
     "pregnancy_or_breast_feeding"
   ],
-  inputSchema: u.object({
-    drugName: u.string().describe("Drug brand name")
+  inputSchema: d.object({
+    drugName: d.string().describe("Drug brand name")
   }),
   async handler({ drugName: e }) {
     var i;
@@ -618,15 +661,15 @@ ${JSON.stringify({ matched_via: "openfda.manufacturer_name", ...k(o, (l = (c = r
         ],
         isError: !0
       } : {
-        content: [{ type: "text", text: L(e) }]
+        content: [{ type: "text", text: K(e) }]
       };
-    const n = t.data.results[0], r = {
+    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: oe(
+      generic_name: O(
         (n == null ? void 0 : n.openfda) ?? {}
       ),
       matched_via: t.matched_via,
-      ...re(n)
+      ...ie(n)
     };
     return {
       content: [
@@ -634,37 +677,37 @@ ${JSON.stringify({ matched_via: "openfda.manufacturer_name", ...k(o, (l = (c = r
           type: "text",
           text: `Safety information for "${e}":
 
-${JSON.stringify(r, null, 2)}`
+${JSON.stringify(a, null, 2)}`
         }
       ]
     };
   }
-}, _e = /^(?:\d{4}-\d{4}|\d{5}-\d{3,4})$/, ge = /^\d{1,2}$/;
-function V(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 r, i = null;
+  let a, i = null;
   if (t.includes("-")) {
-    const o = t.split("-");
-    if (o.length === 2)
-      r = t;
-    else if (o.length === 3) {
-      const s = o[2];
-      if (!s || !ge.test(s)) return n;
-      r = `${o[0]}-${o[1]}`, i = t;
+    const u = t.split("-");
+    if (u.length === 2)
+      a = 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))
     if (t.length === 11)
-      r = `${t.slice(0, 5)}-${t.slice(5, 9)}`, i = `${r}-${t.slice(9, 11)}`;
+      a = `${t.slice(0, 5)}-${t.slice(5, 9)}`, i = `${a}-${t.slice(9, 11)}`;
     else if (t.length === 9)
-      r = `${t.slice(0, 5)}-${t.slice(5, 9)}`;
+      a = `${t.slice(0, 5)}-${t.slice(5, 9)}`;
     else
       return n;
   else
     return n;
-  return _e.test(r) ? { productNDC: r, packageNDC: i, isValid: !0 } : n;
+  return ye.test(a) ? { productNDC: a, packageNDC: i, isValid: !0 } : n;
 }
-const he = [
+const xe = [
   "✅ Accepted formats:",
   "• 4-4 product NDC: 0456-4020",
   "• 5-3 product NDC: 58151-155",
@@ -675,9 +718,9 @@ const he = [
   "",
   "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}"
+`), z = (e, t) => `Invalid ${t} format: "${e}"
 
-${he}`, be = {
+${xe}`, $e = {
   name: "get-drug-by-ndc",
   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
@@ -690,27 +733,27 @@ ${he}`, be = {
     "limit",
     "results"
   ],
-  inputSchema: u.object({
-    ndcCode: u.string().describe(
+  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 f, _, h, E;
-    const { productNDC: t, packageNDC: n, isValid: r } = V(e);
-    if (!r)
+    var _, m, g, y;
+    const { productNDC: t, packageNDC: n, isValid: a } = Y(e);
+    if (!a)
       return {
         content: [
           {
             type: "text",
-            text: W(e, "NDC")
+            text: z(e, "NDC")
           }
         ],
         isError: !0
       };
     let i = `openfda.product_ndc:"${t}"`;
     n && (i += ` OR openfda.package_ndc:"${n}"`);
-    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);
+    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: [
@@ -721,7 +764,7 @@ ${he}`, be = {
         ],
         isError: !0
       };
-    if (!(d != null && d.results) || d.results.length === 0)
+    if (!(o != null && o.results) || o.results.length === 0)
       return {
         content: [
           {
@@ -735,10 +778,10 @@ ${he}`, be = {
           }
         ]
       };
-    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)
+    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: p.openfda.brand_name || [],
@@ -747,8 +790,8 @@ ${he}`, be = {
         product_type: p.openfda.product_type || [],
         route: p.openfda.route || [],
         substance_name: p.openfda.substance_name || [],
-        matching_product_ndc: w,
-        matching_package_ndc: N,
+        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 || [],
@@ -756,24 +799,24 @@ ${he}`, be = {
         active_ingredient: p.active_ingredient || [],
         purpose: p.purpose || []
       };
-    }), a = l.reduce(
-      (p, w) => p + w.matching_package_ndc.length,
+    }), r = l.reduce(
+      (p, k) => p + k.matching_package_ndc.length,
       0
-    ), g = 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: `${x(l.length, (_ = (f = d.meta) == null ? void 0 : f.results) == null ? void 0 : _.total, `labels for NDC "${e}"`)} with ${a} 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)
 
-${g}
+${h}
 
-${JSON.stringify({ matched_via: o, ...k(l, (E = (h = d.meta) == null ? void 0 : h.results) == null ? void 0 : E.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)}`
         }
       ]
     };
   }
-}, ye = {
+}, 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. 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):
@@ -792,31 +835,31 @@ ${JSON.stringify({ matched_via: o, ...k(l, (E = (h = d.meta) == null ? void 0 :
     "purpose",
     "dosage_and_administration"
   ],
-  inputSchema: u.object({
-    productNDC: u.string().describe(
+  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 l;
-    const { productNDC: t, isValid: n } = V(e);
+    const { productNDC: t, isValid: n } = Y(e);
     if (!n)
       return {
         content: [
           {
             type: "text",
-            text: W(e, "product NDC")
+            text: z(e, "product NDC")
           }
         ],
         isError: !0
       };
-    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)
+    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
@@ -831,11 +874,11 @@ ${JSON.stringify({ matched_via: o, ...k(l, (E = (h = d.meta) == null ? void 0 :
         ],
         structuredContent: null
       };
-    const s = i.results[0], d = ((l = s.openfda.package_ndc) == null ? void 0 : l.filter(
-      (a) => a.startsWith(t)
+    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: d,
+      available_packages: o,
       brand_name: s.openfda.brand_name || [],
       generic_name: s.openfda.generic_name || [],
       manufacturer_name: s.openfda.manufacturer_name || [],
@@ -850,14 +893,14 @@ ${JSON.stringify({ matched_via: o, ...k(l, (E = (h = d.meta) == null ? void 0 :
       content: [
         {
           type: "text",
-          text: `✅ Product NDC "${t}" found with ${d.length} package variation(s):
+          text: `✅ Product NDC "${t}" found with ${o.length} package variation(s):
 
 ${JSON.stringify(c, null, 2)}`
         }
       ]
     };
   }
-}, R = {
+}, U = {
   application: {
     prefix: "",
     fields: {
@@ -906,27 +949,45 @@ ${JSON.stringify(c, null, 2)}`
     prefix: "submissions.application_docs",
     fields: { id: {}, url: {}, date: {}, type: {} }
   }
-}, C = Object.keys(R);
-function ve(e, t) {
-  const n = R[e];
+}, T = Object.keys(U);
+function ke(e, t) {
+  const n = U[e];
   if (!n)
     return {
       ok: !1,
-      message: `Unknown section "${e}". Valid sections: ${C.join(", ")}.`
+      message: `Unknown section "${e}". Valid sections: ${T.join(", ")}.`
     };
-  const r = n.fields[t];
-  return r ? {
+  const a = n.fields[t];
+  return a ? {
     ok: !0,
     path: n.prefix ? `${n.prefix}.${t}` : t,
-    uppercase: r.uppercase === !0
+    uppercase: a.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 = {
+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: "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.",
+  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.
@@ -937,94 +998,100 @@ const $e = (e) => `${e}: ${Object.keys(R[e].fields).join(", ")}`, xe = {
     "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(". ")}`
+  inputSchema: d.object({
+    sectionName: d.enum([...T]).describe(`Section to search. One of: ${T.join(", ")}`),
+    fieldName: d.string().describe(
+      `Field within the section. ${T.map(Se).join(". ")}`
     ),
-    searchValue: u.string().describe(
+    searchValue: d.string().describe(
       "Value to search for. Sponsor names are stored uppercase and are normalised automatically."
     ),
-    limit: u.number().int().min(1).max(100).optional().default(5).describe("Maximum number of records to return")
+    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,
-    limit: r
+    limit: a,
+    detail: i
   }) {
-    var g, f;
-    const i = r ?? 5, o = ve(e, t);
+    var g, y;
+    const u = a ?? 5, s = i ?? "summary", o = ke(e, t);
     if (!o.ok)
       return {
         content: [{ type: "text", text: o.message }],
         isError: !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)
+    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 "${s}" in ${o.path}: ${l.message}`
+            text: `Failed to retrieve Drugs@FDA data for "${c}" in ${o.path}: ${h.message}`
           }
         ],
         isError: !0
       };
-    if (!(c != null && c.results) || c.results.length === 0)
+    if (!(r != null && r.results) || r.results.length === 0)
       return {
         content: [
           {
             type: "text",
-            text: `No Drugs@FDA records found for "${s}" in ${o.path}.`
+            text: `No Drugs@FDA records found for "${c}" in ${o.path}.`
           }
         ]
       };
-    const a = (f = (g = c.meta) == null ? void 0 : g.results) == null ? void 0 : f.total;
+    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: `${x(c.results.length, a, `Drugs@FDA records matching ${o.path}`)}
+          text: `${w(r.results.length, _, `Drugs@FDA records matching ${o.path}`)}
 
-${JSON.stringify({ matched_via: o.path, ...k(c.results, a, i) }, null, 2)}`
+${JSON.stringify({ matched_via: o.path, ...S(m, _, u) }, null, 2)}`
         }
       ]
     };
   }
-}, we = [
+}, Ae = [
   "patient.reaction.reactionmeddrapt.exact",
   "patient.reaction.reactionoutcome",
   "serious",
   "patient.patientsex",
   "occurcountry.exact",
   "patient.drug.openfda.generic_name.exact"
-], ke = {
+], 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, 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.",
+  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: 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")
+  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 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)
+    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}": ${d.message}`
+            text: `Failed to retrieve adverse event counts for "${e}": ${o.message}`
           }
         ],
         isError: !0
@@ -1039,26 +1106,32 @@ ${JSON.stringify({ matched_via: o.path, ...k(c.results, a, i) }, null, 2)}`
         ]
       };
     const c = {
-      matched_via: G,
-      counted_by: r,
+      matched_via: J,
+      counted_by: a,
       returned: s.results.length,
-      results: s.results
+      // 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: `Top ${s.results.length} values of ${r} for "${e}" (aggregated responses carry no result total)
+          text: `Top ${s.results.length} values of ${a} for "${e}" (aggregated responses carry no result total)
 
 ${JSON.stringify(c, null, 2)}`
         }
       ]
     };
   }
-}, Ee = "1.2.0", Y = new z(
+}, Te = "1.3.0", H = new ee(
   {
     name: "openfda",
-    version: Ee,
+    version: Te,
     description: "OpenFDA Model Context Protocol"
   },
   {
@@ -1067,21 +1140,21 @@ ${JSON.stringify(c, null, 2)}`
       tools: {}
     }
   }
-), b = new ne(Y);
-b.registerTool(ie);
-b.registerTool(ce);
-b.registerTool(pe);
-b.registerTool(me);
-b.registerTool(fe);
+), b = new oe(H);
+b.registerTool(de);
+b.registerTool(le);
+b.registerTool(he);
+b.registerTool(ge);
 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");
+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");
 }
-De().catch((e) => {
+Ce().catch((e) => {
   console.error("Fatal error in main():", e), process.exit(1);
 });