@ythalorossy/openfda 1.0.19 → 1.1.0

package/dist/index.js

@@ -1,28 +1,79 @@
 #!/usr/bin/env node
-var v = Object.defineProperty;
-var D = (n, t, r) => t in n ? v(n, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[t] = r;
-var k = (n, t, r) => D(n, typeof t != "symbol" ? t + "" : t, r);
-import { McpServer as N } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport as C } from "@modelcontextprotocol/sdk/server/stdio.js";
+var M = Object.defineProperty;
+var G = (e, t, n) => t in e ? M(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var D = (e, t, n) => G(e, typeof t != "symbol" ? t + "" : t, n);
+import { McpServer as K } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport as L } from "@modelcontextprotocol/sdk/server/stdio.js";
 import d from "zod";
-class T {
+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/
+
+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) {
+  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 };
+}
+function B(e = process.env) {
+  const t = E(e);
+  t.ok ? t.apiKey === null && console.error(q) : console.error(Y);
+}
+class J {
   constructor(t) {
-    k(this, "registerTool", (t) => this.server.registerTool(
+    D(this, "registerTool", (t) => this.server.registerTool(
       t.name,
       {
         title: t.name,
         description: t.description,
         inputSchema: t.inputSchema
       },
-      t.handler
+      async (n) => {
+        const a = E();
+        return a.ok ? t.handler(n) : {
+          content: [{ type: "text", text: a.message }],
+          isError: !0
+        };
+      }
     ));
     this.server = t;
   }
 }
-class g {
+const m = (e) => Array.isArray(e) ? e : [], P = (e) => {
+  const t = m(e.warnings);
+  return t.length > 0 ? t : m(e.warnings_and_cautions);
+};
+function W(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)
+  };
+}
+function V(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)
+  };
+}
+class b {
   constructor() {
-    k(this, "urlBase", "https://api.fda.gov");
-    k(this, "params", /* @__PURE__ */ new Map());
+    D(this, "urlBase", "https://api.fda.gov");
+    D(this, "params", /* @__PURE__ */ new Map());
   }
   dataset(t) {
     return this.params.set("dataset", t), this;
@@ -37,178 +88,179 @@ class g {
     return this.params.set("limit", t), this;
   }
   build() {
-    const t = this.params.get("dataset"), r = this.params.get("context"), s = this.params.get("search"), e = this.params.get("limit") ?? 1, o = process.env.OPENFDA_API_KEY;
-    if (!t || !r || !s)
+    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");
-    return `${this.urlBase}/${t}/${r}.json?api_key=${o}&search=${s}&limit=${e}`;
+    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 F = {
+const C = (e) => e.replace(/([?&]api_key=)[^&\s]*/gi, "$1<REDACTED>"), z = {
   maxRetries: 3,
   retryDelay: 1e3,
   // 1 second
   timeout: 3e4
   // 30 seconds
 };
-function x(n) {
-  return !!(n.name === "TypeError" && n.message.includes("fetch") || n.name === "AbortError" || n.status >= 500 && n.status <= 599 || n.status === 429);
+function T(e) {
+  return !!(e.name === "TypeError" && e.message.includes("fetch") || e.name === "AbortError" || e.status >= 500 && e.status <= 599 || e.status === 429);
 }
-function w(n) {
-  return new Promise((t) => setTimeout(t, n));
+function F(e) {
+  return new Promise((t) => setTimeout(t, e));
 }
-async function h(n, t = {}) {
-  const { maxRetries: r, retryDelay: s, timeout: e } = { ...F, ...t }, o = {
+async function k(e, t = {}) {
+  const { maxRetries: n, retryDelay: a, timeout: i } = { ...z, ...t }, o = {
     "User-Agent": "@ythalorossy/openfda",
     Accept: "application/json"
   };
-  let a = null;
-  for (let p = 0; p <= r; p++)
+  let s = null;
+  for (let p = 0; p <= n; p++)
     try {
-      const i = new AbortController(), l = setTimeout(() => i.abort(), e), c = await fetch(n, {
+      const c = new AbortController(), f = setTimeout(() => c.abort(), i), r = await fetch(e, {
         headers: o,
-        signal: i.signal
+        signal: c.signal
       });
-      if (clearTimeout(l), !c.ok) {
-        const f = await c.text().catch(() => "Unable to read error response"), m = {
+      if (clearTimeout(f), !r.ok) {
+        const u = await r.text().catch(() => "Unable to read error response"), l = {
           type: "http",
-          message: `HTTP ${c.status}: ${c.statusText}`,
-          status: c.status,
-          details: f
+          message: `HTTP ${r.status}: ${r.statusText}`,
+          status: r.status,
+          details: u
         };
-        switch (c.status) {
+        switch (r.status) {
           case 400:
-            m.message = "Bad Request: Invalid search query or parameters";
+            l.message = "Bad Request: Invalid search query or parameters";
             break;
           case 401:
-            m.message = "Unauthorized: Invalid or missing API key";
+            l.message = "Unauthorized: Invalid or missing API key";
             break;
           case 403:
-            m.message = "Forbidden: API key may be invalid or quota exceeded";
+            l.message = "Forbidden: API key may be invalid or quota exceeded";
             break;
           case 404:
-            m.message = "Not Found: No results found for the specified query";
+            l.message = "Not Found: No results found for the specified query";
             break;
           case 429:
-            m.message = "Rate Limited: Too many requests. Retrying...";
+            l.message = "Rate Limited: Too many requests. Retrying...";
             break;
           case 500:
-            m.message = "Server Error: OpenFDA service is experiencing issues";
+            l.message = "Server Error: OpenFDA service is experiencing issues";
             break;
           default:
-            m.message = `HTTP Error ${c.status}: ${c.statusText}`;
+            l.message = `HTTP Error ${r.status}: ${r.statusText}`;
         }
-        if (a = m, c.status >= 400 && c.status < 500 && c.status !== 429)
+        if (s = l, r.status >= 400 && r.status < 500 && r.status !== 429)
           break;
-        if (p < r && x({ status: c.status })) {
-          const b = s * Math.pow(2, p);
-          await w(b);
+        if (p < n && T({ status: r.status })) {
+          const h = a * Math.pow(2, p);
+          await F(h);
           continue;
         }
         break;
       }
-      let u;
+      let g;
       try {
-        u = await c.json();
-      } catch (f) {
-        a = {
+        g = await r.json();
+      } catch (u) {
+        s = {
           type: "parsing",
-          message: `Failed to parse JSON response: ${f instanceof Error ? f.message : "Unknown parsing error"}`,
-          details: f
+          message: C(
+            `Failed to parse JSON response: ${u instanceof Error ? u.message : "Unknown parsing error"}`
+          ),
+          details: u
         };
         break;
       }
-      if (!u) {
-        a = {
+      if (!g) {
+        s = {
           type: "empty_response",
           message: "Received empty response from OpenFDA API"
         };
         break;
       }
-      return { data: u, error: null };
-    } catch (i) {
-      let l;
-      if (i.name === "AbortError" ? l = {
+      return { data: g, error: null };
+    } catch (c) {
+      let f;
+      if (c.name === "AbortError" ? f = {
         type: "timeout",
-        message: `Request timeout after ${e}ms`,
-        details: i
-      } : i instanceof TypeError && i.message.includes("fetch") ? l = {
+        message: `Request timeout after ${i}ms`,
+        details: c
+      } : c instanceof TypeError && c.message.includes("fetch") ? f = {
         type: "network",
         message: "Network error: Unable to connect to OpenFDA API",
-        details: i.message
-      } : l = {
+        details: c.message
+      } : f = {
         type: "unknown",
-        message: `Unexpected error: ${i.message || "Unknown error occurred"}`,
-        details: i
-      }, a = l, p < r && x(i)) {
-        const c = s * Math.pow(2, p);
-        await w(c);
+        message: C(
+          `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);
         continue;
       }
       break;
     }
-  return { data: null, error: a };
+  return { data: null, error: s };
 }
-const S = {
+const X = [
+  "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;
+      continue;
+    }
+    if (o != null && o.results && o.results.length > 0)
+      return { found: !0, matched_via: a, data: o };
+  }
+  return { found: !1, error: n };
+}
+const U = (e) => `No label found for "${e}".
+
+Searched, in order: ${X.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 = {
   name: "get-drug-by-name",
-  description: "Get drug by name. Use this tool to get the drug information by name. The drug name should be the brand name. It 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.",
+  description: "Get drug information by brand name, generic name, or active substance. Returns the brand name, generic name, manufacturer name, product NDC, product type, route, substance name, indications and usage, warnings, do not use, ask doctor, ask doctor or pharmacist, stop use, pregnancy or breast feeding. The response reports which field matched via matched_via.",
   inputSchema: d.object({
     drugName: d.string().describe("Drug name")
   }),
-  async handler({ drugName: n }) {
-    const t = new g().dataset("drug").context("label").search(`openfda.brand_name:"${n}"`).limit(1).build(), { data: r, error: s } = await h(t);
-    if (s) {
-      let a = `Failed to retrieve drug data for "${n}": ${s.message}`;
-      switch (s.type) {
-        case "http":
-          s.status === 404 ? a += `${t}
-
-Suggestions:
-- Verify the exact brand name spelling
-- Try searching for the generic name instead
-- Check if the drug is FDA-approved` : (s.status === 401 || s.status === 403) && (a += `
-
-Please check the API key configuration.`);
-          break;
-        case "network":
-          a += `
-
-Please check your internet connection and try again.`;
-          break;
-        case "timeout":
-          a += `
-
-The request took too long. Please try again.`;
-          break;
-      }
-      return {
-        content: [{ type: "text", text: a }],
-        isError: !0
-      };
-    }
-    if (!(r != null && r.results) || r.results.length === 0)
-      return {
+  async handler({ drugName: e }) {
+    const t = await O(e, 1);
+    if (!t.found)
+      return t.error ? {
         content: [
           {
             type: "text",
-            text: `No drug information found for "${n}". Please verify the brand name spelling or try searching for the generic name.`
+            text: `Failed to retrieve drug data for "${e}": ${t.error.message}`
           }
-        ]
+        ],
+        isError: !0
+      } : {
+        content: [{ type: "text", text: U(e) }]
       };
-    const e = r.results[0], o = {
-      brand_name: e == null ? void 0 : e.openfda.brand_name,
-      generic_name: e == null ? void 0 : e.openfda.generic_name,
-      manufacturer_name: e == null ? void 0 : e.openfda.manufacturer_name,
-      product_ndc: e == null ? void 0 : e.openfda.product_ndc,
-      product_type: e == null ? void 0 : e.openfda.product_type,
-      route: e == null ? void 0 : e.openfda.route,
-      substance_name: e == null ? void 0 : e.openfda.substance_name,
-      indications_and_usage: e == null ? void 0 : e.indications_and_usage,
-      warnings: e == null ? void 0 : e.warnings,
-      do_not_use: e == null ? void 0 : e.do_not_use,
-      ask_doctor: e == null ? void 0 : e.ask_doctor,
-      ask_doctor_or_pharmacist: e == null ? void 0 : e.ask_doctor_or_pharmacist,
-      stop_use: e == null ? void 0 : e.stop_use,
-      pregnancy_or_breast_feeding: e == null ? void 0 : e.pregnancy_or_breast_feeding
+    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)
     };
     return {
       content: [
@@ -216,12 +268,24 @@ The request took too long. Please try again.`;
           type: "text",
           text: `Drug information retrieved successfully:
 
-${JSON.stringify(o, null, 2)}`
+${JSON.stringify(a, null, 2)}`
         }
       ]
     };
   }
-}, E = {
+};
+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 = {
   name: "get-drug-by-generic-name",
   description: "Get drug information by generic (active ingredient) name. Useful when you know the generic name but not the brand name. Returns all brand versions of the generic drug.",
   inputSchema: d.object({
@@ -229,51 +293,75 @@ ${JSON.stringify(o, null, 2)}`
     limit: d.number().optional().default(5).describe("Maximum number of results to return")
   }),
   async handler({
-    genericName: n,
+    genericName: e,
     limit: t
   }) {
-    const r = new g().dataset("drug").context("label").search(`openfda.generic_name:"${n}"`).limit(t).build(), { data: s, error: e } = await h(r);
-    if (e)
+    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);
+    if (i)
       return {
         content: [
           {
             type: "text",
-            text: `Failed to retrieve drug data for generic name "${n}": ${e.message}`
+            text: `Failed to retrieve drug data for generic name "${e}": ${i.message}`
           }
         ],
         isError: !0
       };
-    if (!(s != null && s.results) || s.results.length === 0)
+    if (!(a != null && a.results) || a.results.length === 0)
       return {
         content: [
           {
             type: "text",
-            text: `No drug information found for generic name "${n}".`
+            text: `No drug information found for generic name "${e}".`
           }
         ]
       };
-    const o = s.results.map((a) => {
-      var p, i, l, c;
+    const o = a.results.map((r) => {
+      var g, u, l, h;
       return {
-        brand_name: ((p = a == null ? void 0 : a.openfda.brand_name) == null ? void 0 : p[0]) || "Unknown",
-        generic_name: ((i = a == null ? void 0 : a.openfda.generic_name) == null ? void 0 : i[0]) || "Unknown",
-        manufacturer_name: ((l = a == null ? void 0 : a.openfda.manufacturer_name) == null ? void 0 : l[0]) || "Unknown",
-        product_type: ((c = a == null ? void 0 : a.openfda.product_type) == null ? void 0 : c[0]) || "Unknown",
-        route: (a == null ? void 0 : a.openfda.route) || []
+        brand_name: ((g = r == null ? void 0 : r.openfda.brand_name) == null ? void 0 : g[0]) || "Unknown",
+        generic_name: ((u = r == null ? void 0 : r.openfda.generic_name) == null ? void 0 : u[0]) || "Unknown",
+        manufacturer_name: ((l = r == null ? void 0 : r.openfda.manufacturer_name) == null ? void 0 : l[0]) || "Unknown",
+        product_type: ((h = r == null ? void 0 : r.openfda.product_type) == null ? void 0 : h[0]) || "Unknown",
+        route: (r == null ? void 0 : r.openfda.route) || []
       };
     });
     return {
       content: [
         {
           type: "text",
-          text: `Found ${o.length} drug(s) with generic name "${n}":
+          text: `${N(o.length, (p = (s = a.meta) == null ? void 0 : s.results) == null ? void 0 : p.total, `labels with generic name "${e}"`)}
 
-${JSON.stringify(o, null, 2)}`
+${JSON.stringify(S(o, (f = (c = a.meta) == null ? void 0 : c.results) == null ? void 0 : f.total, t ?? 5), null, 2)}`
         }
       ]
     };
   }
-}, P = {
+}, Z = {
+  1: "Recovered/resolved",
+  2: "Recovering/resolving",
+  3: "Not recovered/not resolved",
+  4: "Recovered/resolved with sequelae",
+  5: "Fatal",
+  6: "Unknown"
+};
+function ee(e) {
+  if (e == null || e === "") return "Not reported";
+  const t = String(e);
+  return Z[t] ?? `Unrecognized outcome code "${t}"`;
+}
+function te(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 }));
+  }
+  return n.slice(0, 3);
+}
+const ne = {
   name: "get-drug-adverse-events",
   description: "Get adverse event reports for a drug. This provides safety information about reported side effects and reactions. Use brand name or generic name.",
   inputSchema: d.object({
@@ -282,19 +370,20 @@ ${JSON.stringify(o, null, 2)}`
     seriousness: d.enum(["serious", "non-serious", "all"]).optional().default("all").describe("Filter by event seriousness")
   }),
   async handler({
-    drugName: n,
+    drugName: e,
     limit: t,
-    seriousness: r
+    seriousness: n
   }) {
-    let s = `patient.drug.medicinalproduct:"${n}"`;
-    r !== "all" && (s += `+AND+serious:${r === "serious" ? "1" : "2"}`);
-    const e = new g().dataset("drug").context("event").search(s).limit(t).build(), { data: o, error: a } = await h(e);
-    if (a)
+    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)
       return {
         content: [
           {
             type: "text",
-            text: `Failed to retrieve adverse events for "${n}": ${a.message}`
+            text: `Failed to retrieve adverse events for "${e}": ${s.message}`
           }
         ],
         isError: !0
@@ -304,34 +393,37 @@ ${JSON.stringify(o, null, 2)}`
         content: [
           {
             type: "text",
-            text: `No adverse events found for "${n}".`
+            text: `No adverse events found for "${e}".`
           }
         ]
       };
-    const p = o.results.map((i) => {
-      var l, c, u, f, m, b, $;
+    const p = o.results.map((u) => {
+      var h, _, $, v;
+      const l = te(((h = u.patient) == null ? void 0 : h.reaction) ?? []);
       return {
-        report_id: i.safetyreportid,
-        serious: i.serious === "1" ? "Yes" : "No",
-        patient_age: ((l = i.patient) == null ? void 0 : l.patientonsetage) || "Unknown",
-        patient_sex: ((c = i.patient) == null ? void 0 : c.patientsex) === "1" ? "Male" : ((u = i.patient) == null ? void 0 : u.patientsex) === "2" ? "Female" : "Unknown",
-        reactions: ((m = (f = i.patient) == null ? void 0 : f.reaction) == null ? void 0 : m.map((_) => _.reactionmeddrapt).slice(0, 3)) || [],
-        outcomes: (($ = (b = i.patient) == null ? void 0 : b.reaction) == null ? void 0 : $.map((_) => _.reactionoutcome).slice(0, 3)) || [],
-        report_date: i.receiptdate || "Unknown"
+        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",
+        // 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"
       };
     });
     return {
       content: [
         {
           type: "text",
-          text: `Found ${p.length} adverse event report(s) for "${n}":
+          text: `${N(p.length, (f = (c = o.meta) == null ? void 0 : c.results) == null ? void 0 : f.total, `adverse event reports for "${e}"`)}
 
-${JSON.stringify(p, null, 2)}`
+${JSON.stringify(S(p, (g = (r = o.meta) == null ? void 0 : r.results) == null ? void 0 : g.total, t ?? 10), null, 2)}`
         }
       ]
     };
   }
-}, A = {
+}, ae = {
   name: "get-drugs-by-manufacturer",
   description: "Get all drugs manufactured by a specific company. Useful for finding alternatives or checking manufacturer portfolios.",
   inputSchema: d.object({
@@ -339,126 +431,115 @@ ${JSON.stringify(p, null, 2)}`
     limit: d.number().optional().default(20).describe("Maximum number of drugs to return")
   }),
   async handler({
-    manufacturerName: n,
+    manufacturerName: e,
     limit: t
   }) {
-    const r = new g().dataset("drug").context("label").search(`openfda.manufacturer_name:"${n}"`).limit(t).build(), { data: s, error: e } = await h(r);
-    if (e)
+    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);
+    if (i)
       return {
         content: [
           {
             type: "text",
-            text: `${r}
-Failed to retrieve drugs for manufacturer "${n}": ${e.message}`
+            text: `Failed to retrieve drugs for manufacturer "${e}": ${i.message}`
           }
         ],
         isError: !0
       };
-    if (!(s != null && s.results) || s.results.length === 0)
+    if (!(a != null && a.results) || a.results.length === 0)
       return {
         content: [
           {
             type: "text",
-            text: `No drugs found for manufacturer "${n}".`
+            text: `No drugs found for manufacturer "${e}".`
           }
         ]
       };
-    const o = s.results.map((a) => {
-      var p, i, l, c;
+    const o = a.results.map((r) => {
+      var g, u, l, h;
       return {
-        brand_name: ((p = a == null ? void 0 : a.openfda.brand_name) == null ? void 0 : p[0]) || "Unknown",
-        generic_name: ((i = a == null ? void 0 : a.openfda.generic_name) == null ? void 0 : i[0]) || "Unknown",
-        product_type: ((l = a == null ? void 0 : a.openfda.product_type) == null ? void 0 : l[0]) || "Unknown",
-        route: (a == null ? void 0 : a.openfda.route) || [],
-        ndc: ((c = a == null ? void 0 : a.openfda.product_ndc) == null ? void 0 : c[0]) || "Unknown"
+        brand_name: ((g = r == null ? void 0 : r.openfda.brand_name) == null ? void 0 : g[0]) || "Unknown",
+        generic_name: ((u = r == null ? void 0 : r.openfda.generic_name) == null ? void 0 : u[0]) || "Unknown",
+        product_type: ((l = r == null ? void 0 : r.openfda.product_type) == null ? void 0 : l[0]) || "Unknown",
+        route: (r == null ? void 0 : r.openfda.route) || [],
+        ndc: ((h = r == null ? void 0 : r.openfda.product_ndc) == null ? void 0 : h[0]) || "Unknown"
       };
     });
     return {
       content: [
         {
           type: "text",
-          text: `Found ${o.length} drug(s) from manufacturer "${n}":
+          text: `${N(o.length, (p = (s = a.meta) == null ? void 0 : s.results) == null ? void 0 : p.total, `labels from manufacturer "${e}"`)}
 
-${JSON.stringify(o, null, 2)}`
+${JSON.stringify(S(o, (f = (c = a.meta) == null ? void 0 : c.results) == null ? void 0 : f.total, t ?? 20), null, 2)}`
         }
       ]
     };
   }
-}, U = {
+}, re = {
   name: "get-drug-safety-info",
-  description: "Get comprehensive safety information for a drug including warnings, contraindications, drug interactions, and precautions. Use brand name.",
+  description: "Get comprehensive safety information for a drug including the boxed warning, warnings and cautions, contraindications, drug interactions, and precautions. Accepts a brand name, generic name, or active substance; the response reports which field matched via matched_via.",
   inputSchema: d.object({
     drugName: d.string().describe("Drug brand name")
   }),
-  async handler({ drugName: n }) {
-    var a, p;
-    const t = new g().dataset("drug").context("label").search(`openfda.brand_name:"${n}"`).limit(1).build(), { data: r, error: s } = await h(t);
-    if (s)
-      return {
+  async handler({ drugName: e }) {
+    var i, o;
+    const t = await O(e, 1);
+    if (!t.found)
+      return t.error ? {
         content: [
           {
             type: "text",
-            text: `Failed to retrieve safety information for "${n}": ${s.message}`
+            text: `Failed to retrieve safety information for "${e}": ${t.error.message}`
           }
         ],
         isError: !0
+      } : {
+        content: [{ type: "text", text: U(e) }]
       };
-    if (!(r != null && r.results) || r.results.length === 0)
-      return {
-        content: [
-          {
-            type: "text",
-            text: `No safety information found for "${n}".`
-          }
-        ]
-      };
-    const e = r.results[0], o = {
-      drug_name: ((a = e == null ? void 0 : e.openfda.brand_name) == null ? void 0 : a[0]) || n,
-      generic_name: ((p = e == null ? void 0 : e.openfda.generic_name) == null ? void 0 : p[0]) || "Unknown",
-      warnings: (e == null ? void 0 : e.warnings) || [],
-      contraindications: (e == null ? void 0 : e.contraindications) || [],
-      drug_interactions: (e == null ? void 0 : e.drug_interactions) || [],
-      precautions: (e == null ? void 0 : e.precautions) || [],
-      adverse_reactions: (e == null ? void 0 : e.adverse_reactions) || [],
-      overdosage: (e == null ? void 0 : e.overdosage) || [],
-      do_not_use: (e == null ? void 0 : e.do_not_use) || [],
-      ask_doctor: (e == null ? void 0 : e.ask_doctor) || [],
-      stop_use: (e == null ? void 0 : e.stop_use) || [],
-      pregnancy_or_breast_feeding: (e == null ? void 0 : e.pregnancy_or_breast_feeding) || []
+    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",
+      matched_via: t.matched_via,
+      ...W(n)
     };
     return {
       content: [
         {
           type: "text",
-          text: `Safety information for "${n}":
+          text: `Safety information for "${e}":
 
-${JSON.stringify(o, null, 2)}`
+${JSON.stringify(a, null, 2)}`
         }
       ]
     };
   }
-};
-function O(n) {
-  const t = n.trim().toUpperCase();
-  let r, s = null;
+}, se = /^(?:\d{4}-\d{4}|\d{5}-\d{3,4})$/, oe = /^\d{1,2}$/;
+function I(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)
-      r = t, s = null;
-    else if (o.length === 3)
-      r = `${o[0]}-${o[1]}`, s = t;
+      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
+      return n;
+  } else if (/^\d+$/.test(t))
+    if (t.length === 11)
+      a = `${t.slice(0, 5)}-${t.slice(5, 9)}`, i = `${a}-${t.slice(9, 11)}`;
+    else if (t.length === 9)
+      a = `${t.slice(0, 5)}-${t.slice(5, 9)}`;
     else
-      return { productNDC: t, packageNDC: null, isValid: !1 };
-  } else if (t.length === 11)
-    r = `${t.substring(0, 5)}-${t.substring(5, 9)}`, s = `${t.substring(0, 5)}-${t.substring(5, 9)}-${t.substring(9, 11)}`;
-  else if (t.length === 9)
-    r = `${t.substring(0, 5)}-${t.substring(5, 9)}`, s = null;
+      return n;
   else
-    return { productNDC: t, packageNDC: null, isValid: !1 };
-  const e = /^\d{5}-\d{4}$/.test(r);
-  return { productNDC: r, packageNDC: s, isValid: e };
+    return n;
+  return se.test(a) ? { productNDC: a, packageNDC: i, isValid: !0 } : n;
 }
-const I = {
+const ie = {
   name: "get-drug-by-ndc",
   description: "Get drug information by National Drug Code (NDC). Accepts both product NDC (XXXXX-XXXX) and package NDC (XXXXX-XXXX-XX) formats. Also accepts NDC codes without dashes.",
   inputSchema: d.object({
@@ -466,14 +547,15 @@ const I = {
       "National Drug Code (NDC) - accepts formats: XXXXX-XXXX, XXXXX-XXXX-XX, or without dashes"
     )
   }),
-  async handler({ ndcCode: n }) {
-    const { productNDC: t, packageNDC: r, isValid: s } = O(n);
-    if (!s)
+  async handler({ ndcCode: e }) {
+    var g, u, l, h;
+    const { productNDC: t, packageNDC: n, isValid: a } = I(e);
+    if (!a)
       return {
         content: [
           {
             type: "text",
-            text: `Invalid NDC format: "${n}"
+            text: `Invalid NDC format: "${e}"
 
 ✅ Accepted formats:
 • Product NDC: 12345-1234
@@ -483,25 +565,25 @@ const I = {
         ],
         isError: !0
       };
-    let e = `openfda.product_ndc:"${t}"`;
-    r && (e += `+OR+openfda.package_ndc:"${r}"`);
-    const o = new g().dataset("drug").context("label").search(e).limit(10).build(), { data: a, error: p } = await h(o);
+    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)
       return {
         content: [
           {
             type: "text",
-            text: `Failed to retrieve drug data for NDC "${n}": ${p.message}`
+            text: `Failed to retrieve drug data for NDC "${e}": ${p.message}`
           }
         ],
         isError: !0
       };
-    if (!(a != null && a.results) || a.results.length === 0)
+    if (!(s != null && s.results) || s.results.length === 0)
       return {
         content: [
           {
             type: "text",
-            text: `No drug found with NDC "${n}" (product: ${t}).
+            text: `No drug found with NDC "${e}" (product: ${t}).
 
 💡 Tips:
 • Verify the NDC format
@@ -510,112 +592,122 @@ const I = {
           }
         ]
       };
-    const i = a.results.map((u) => {
-      var b, $;
-      const f = ((b = u.openfda.product_ndc) == null ? void 0 : b.filter((_) => _ === t)) || [], m = (($ = u.openfda.package_ndc) == null ? void 0 : $.filter(
-        (_) => r ? _ === r : _.startsWith(t)
+    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)
       )) || [];
       return {
-        brand_name: u.openfda.brand_name || [],
-        generic_name: u.openfda.generic_name || [],
-        manufacturer_name: u.openfda.manufacturer_name || [],
-        product_type: u.openfda.product_type || [],
-        route: u.openfda.route || [],
-        substance_name: u.openfda.substance_name || [],
-        matching_product_ndc: f,
-        matching_package_ndc: m,
-        all_product_ndc: u.openfda.product_ndc || [],
-        all_package_ndc: u.openfda.package_ndc || [],
-        dosage_and_administration: u.dosage_and_administration || [],
-        package_label_principal_display_panel: u.package_label_principal_display_panel || [],
-        active_ingredient: u.active_ingredient || [],
-        purpose: u.purpose || []
+        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 || []
       };
-    }), l = i.reduce(
-      (u, f) => u + f.matching_package_ndc.length,
+    }), f = c.reduce(
+      (_, $) => _ + $.matching_package_ndc.length,
       0
-    ), c = r ? `Searched for specific package NDC: ${r}` : `Searched for product NDC: ${t} (all packages)`;
+    ), r = n ? `Searched for specific package NDC: ${n}` : `Searched for product NDC: ${t} (all packages)`;
     return {
       content: [
         {
           type: "text",
-          text: `✅ Found ${i.length} drug(s) with ${l} package(s) for NDC "${n}"
+          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)
 
-${c}
+${r}
 
-${JSON.stringify(i, null, 2)}`
+${JSON.stringify(S(c, (h = (l = s.meta) == null ? void 0 : l.results) == null ? void 0 : h.total, 10), null, 2)}`
         }
       ]
     };
   }
-}, M = {
+}, ce = {
   name: "get-drug-by-product-ndc",
-  description: "Get drug information by product NDC only (XXXXX-XXXX format). 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.",
   inputSchema: d.object({
-    productNDC: d.string().describe("Product NDC in format XXXXX-XXXX")
+    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: n }) {
-    var p;
-    if (!/^\d{5}-\d{4}$/.test(n.trim()))
+  async handler({ productNDC: e }) {
+    var f;
+    const { productNDC: t, isValid: n } = I(e);
+    if (!n)
       return {
         content: [
           {
             type: "text",
-            text: `Invalid product NDC format: "${n}"
+            text: `Invalid product NDC format: "${e}"
 
-✅ Required format: XXXXX-XXXX (e.g., 12345-1234)`
+✅ 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.`
           }
         ],
         isError: !0
       };
-    const t = new g().dataset("drug").context("label").search(`openfda.product_ndc:"${n.trim()}"`).limit(1).build(), { data: r, error: s } = await h(t);
-    if (s)
+    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)
       return {
         content: [
           {
             type: "text",
-            text: `${t}Failed to retrieve drug data for product NDC "${n}": ${s.message}`
+            text: `Failed to retrieve drug data for product NDC "${e}": ${o.message}`
           }
         ],
         isError: !0
       };
-    if (!(r != null && r.results) || r.results.length === 0)
+    if (!(i != null && i.results) || i.results.length === 0)
       return {
         content: [
           {
             type: "text",
-            text: `No drug found with product NDC "${n}".`
+            text: `No drug found with product NDC "${e}".`
           }
         ],
         structuredContent: null
       };
-    const e = r.results[0], o = ((p = e.openfda.package_ndc) == null ? void 0 : p.filter(
-      (i) => i.startsWith(n.trim())
-    )) || [], a = {
-      product_ndc: n,
-      available_packages: o,
-      brand_name: e.openfda.brand_name || [],
-      generic_name: e.openfda.generic_name || [],
-      manufacturer_name: e.openfda.manufacturer_name || [],
-      product_type: e.openfda.product_type || [],
-      route: e.openfda.route || [],
-      substance_name: e.openfda.substance_name || [],
-      active_ingredient: e.active_ingredient || [],
-      purpose: e.purpose || [],
-      dosage_and_administration: e.dosage_and_administration || []
+    const s = i.results[0], p = ((f = s.openfda.package_ndc) == null ? void 0 : f.filter(
+      (r) => r.startsWith(t)
+    )) || [], c = {
+      product_ndc: t,
+      available_packages: p,
+      brand_name: s.openfda.brand_name || [],
+      generic_name: s.openfda.generic_name || [],
+      manufacturer_name: s.openfda.manufacturer_name || [],
+      product_type: s.openfda.product_type || [],
+      route: s.openfda.route || [],
+      substance_name: s.openfda.substance_name || [],
+      active_ingredient: s.active_ingredient || [],
+      purpose: s.purpose || [],
+      dosage_and_administration: s.dosage_and_administration || []
     };
     return {
       content: [
         {
           type: "text",
-          text: `✅ Product NDC "${n}" found with ${o.length} package variation(s):
+          text: `✅ Product NDC "${t}" found with ${p.length} package variation(s):
 
-${JSON.stringify(a, null, 2)}`
+${JSON.stringify(c, null, 2)}`
         }
       ]
     };
   }
-}, R = {
+}, ue = {
   name: "get-drugsfda",
   description: "Get drugsfda data by section and field. Search OpenFDA drugsfda endpoint by specifying a section (application, openfda, products, submissions, application_docs), a field name within that section, and a search value.",
   inputSchema: d.object({
@@ -628,44 +720,44 @@ ${JSON.stringify(a, null, 2)}`
     searchValue: d.string().describe("Value to search for in the specified field")
   }),
   async handler({
-    sectionName: n,
+    sectionName: e,
     fieldName: t,
-    searchValue: r
+    searchValue: n
   }) {
-    const s = new g().dataset("drug").context("drugsfda").search(`${n}.${t}:"${r}"`).limit(1).build(), { data: e, error: o } = await h(s);
+    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 a = `${s} Failed to retrieve drugsfda data for "${r}" in ${n}.${t}: ${o.message}`;
+      let s = `Failed to retrieve drugsfda data for "${n}" in ${e}.${t}: ${o.message}`;
       switch (o.type) {
         case "http":
-          o.status === 404 ? a += `
+          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) && (a += `
+- Check the search value spelling` : (o.status === 401 || o.status === 403) && (s += `
 
 Please check the API key configuration.`);
           break;
         case "network":
-          a += `
+          s += `
 
 Please check your internet connection and try again.`;
           break;
         case "timeout":
-          a += `
+          s += `
 
 The request took too long. Please try again.`;
           break;
       }
       return {
-        content: [{ type: "text", text: a }],
+        content: [{ type: "text", text: s }],
         isError: !0
       };
     }
-    return !(e != null && e.results) || e.results.length === 0 ? {
+    return !(i != null && i.results) || i.results.length === 0 ? {
       content: [
         {
           type: "text",
-          text: `No drugsfda data found for "${r}" in ${n}.${t}. Please verify the search parameters.`
+          text: `No drugsfda data found for "${n}" in ${e}.${t}. Please verify the search parameters.`
         }
       ]
     } : {
@@ -674,15 +766,15 @@ The request took too long. Please try again.`;
           type: "text",
           text: `drugsfda data retrieved successfully:
 
-${JSON.stringify(e.results[0], null, 2)}`
+${JSON.stringify(i.results[0], null, 2)}`
         }
       ]
     };
   }
-}, X = new N(
+}, de = "1.1.0", R = new K(
   {
     name: "openfda",
-    version: "1.0.0",
+    version: de,
     description: "OpenFDA Model Context Protocol"
   },
   {
@@ -691,19 +783,20 @@ ${JSON.stringify(e.results[0], null, 2)}`
       tools: {}
     }
   }
-), y = new T(X);
-y.registerTool(S);
-y.registerTool(E);
-y.registerTool(P);
-y.registerTool(A);
-y.registerTool(U);
-y.registerTool(I);
-y.registerTool(M);
-y.registerTool(R);
-async function j() {
-  const n = new C();
-  await X.connect(n), console.error("OpenFDA MCP Server running on stdio");
+), 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");
 }
-j().catch((n) => {
-  console.error("Fatal error in main():", n), process.exit(1);
+pe().catch((e) => {
+  console.error("Fatal error in main():", e), process.exit(1);
 });