datadog-mcp 1.0.0 → 1.0.4

package/dist/index.js

@@ -35,7 +35,7 @@ var configSchema = z.object({
     transport: z.enum(["stdio", "http"]).default("stdio"),
     port: z.number().default(3e3),
     host: z.string().default("localhost")
-  }),
+  }).default({}),
   limits: z.object({
     maxResults: z.number().default(100),
     maxLogLines: z.number().default(100),
@@ -44,7 +44,7 @@ var configSchema = z.object({
     // Default limit for initial queries
     maxMetricDataPoints: z.number().default(1e3),
     defaultTimeRangeHours: z.number().default(24)
-  }),
+  }).default({}),
   features: z.object({
     readOnly: z.boolean().default(false),
     disabledTools: z.array(z.string()).default([])
@@ -52,6 +52,22 @@ var configSchema = z.object({
 });
 
 // src/config/index.ts
+function parseEqualsFormat(arg) {
+  if (!arg.includes("=")) return null;
+  const parts = arg.slice(2).split("=");
+  const key = parts[0];
+  const value = parts.slice(1).join("=");
+  return key && value !== void 0 ? [key, value] : null;
+}
+function parseSpacedFormat(arg, nextArg) {
+  if (nextArg && !nextArg.startsWith("--")) {
+    return [arg.slice(2), nextArg];
+  }
+  return null;
+}
+function parseBooleanFlag(arg) {
+  return arg.slice(2);
+}
 function parseArgs() {
   const strings = {};
   const booleans = /* @__PURE__ */ new Set();
@@ -60,23 +76,20 @@ function parseArgs() {
     const arg = argv[i];
     if (!arg) continue;
     if (arg.startsWith("--")) {
-      if (arg.includes("=")) {
-        const parts = arg.slice(2).split("=");
-        const key = parts[0];
-        const value = parts.slice(1).join("=");
-        if (key && value !== void 0) {
-          strings[key] = value;
-        }
-      } else {
-        const argName = arg.slice(2);
-        const nextArg = argv[i + 1];
-        if (nextArg && !nextArg.startsWith("--")) {
-          strings[argName] = nextArg;
-          i++;
-        } else {
-          booleans.add(argName);
-        }
+      const equalsResult = parseEqualsFormat(arg);
+      if (equalsResult) {
+        const [key, value] = equalsResult;
+        strings[key] = value;
+        continue;
+      }
+      const spacedResult = parseSpacedFormat(arg, argv[i + 1]);
+      if (spacedResult) {
+        const [key, value] = spacedResult;
+        strings[key] = value;
+        i += 1;
+        continue;
       }
+      booleans.add(parseBooleanFlag(arg));
     }
   }
   return { strings, booleans };
@@ -98,18 +111,20 @@ function loadConfig() {
       name: "datadog-mcp",
       version: "1.0.0",
       transport: args.strings.transport ?? process.env.MCP_TRANSPORT ?? "stdio",
-      port: parseInt(args.strings.port ?? process.env.MCP_PORT ?? "3000", 10),
+      port: Number.parseInt(args.strings.port ?? process.env.MCP_PORT ?? "3000", 10),
       host: args.strings.host ?? process.env.MCP_HOST ?? "localhost"
     },
     limits: {
-      maxResults: parseInt(process.env.MCP_MAX_RESULTS ?? "100", 10),
-      maxLogLines: parseInt(process.env.MCP_MAX_LOG_LINES ?? "500", 10),
-      maxMetricDataPoints: parseInt(process.env.MCP_MAX_METRIC_POINTS ?? "1000", 10),
-      defaultTimeRangeHours: parseInt(process.env.MCP_DEFAULT_TIME_RANGE ?? "24", 10)
+      maxResults: Number.parseInt(process.env.MCP_MAX_RESULTS ?? "100", 10),
+      maxLogLines: Number.parseInt(process.env.MCP_MAX_LOG_LINES ?? "500", 10),
+      maxMetricDataPoints: Number.parseInt(process.env.MCP_MAX_METRIC_POINTS ?? "1000", 10),
+      defaultTimeRangeHours: Number.parseInt(process.env.MCP_DEFAULT_TIME_RANGE ?? "24", 10)
     },
     features: {
       readOnly: args.booleans.has("read-only") || process.env.MCP_READ_ONLY === "true",
-      disabledTools: parseDisabledTools(args.strings["disable-tools"] ?? process.env.MCP_DISABLE_TOOLS)
+      disabledTools: parseDisabledTools(
+        args.strings["disable-tools"] ?? process.env.MCP_DISABLE_TOOLS
+      )
     }
   };
   return configSchema.parse(raw);
@@ -194,19 +209,31 @@ function handleDatadogError(error) {
       case 400:
         throw new McpError(ErrorCode.InvalidRequest, `Invalid request: ${message}`);
       case 401:
-        throw new McpError(DatadogErrorCode.Unauthorized, `Authentication failed: Invalid Datadog API key or APP key`);
+        throw new McpError(
+          DatadogErrorCode.Unauthorized,
+          `Authentication failed: Invalid Datadog API key or APP key`
+        );
       case 403:
         throw new McpError(DatadogErrorCode.Forbidden, `Authorization denied: ${message}`);
       case 404:
         throw new McpError(DatadogErrorCode.NotFound, `Resource not found: ${message}`);
       case 429:
-        throw new McpError(DatadogErrorCode.RateLimited, "Rate limit exceeded. Retry after a short delay.");
+        throw new McpError(
+          DatadogErrorCode.RateLimited,
+          "Rate limit exceeded. Retry after a short delay."
+        );
       case 500:
       case 502:
       case 503:
-        throw new McpError(DatadogErrorCode.ServiceUnavailable, "Datadog service temporarily unavailable. Retry later.");
+        throw new McpError(
+          DatadogErrorCode.ServiceUnavailable,
+          "Datadog service temporarily unavailable. Retry later."
+        );
       default:
-        throw new McpError(ErrorCode.InternalError, `Datadog API error (${apiError.code}): ${message}`);
+        throw new McpError(
+          ErrorCode.InternalError,
+          `Datadog API error (${apiError.code}): ${message}`
+        );
     }
   }
   throw new McpError(
@@ -247,7 +274,7 @@ function formatResponse(data) {
   return [
     {
       type: "text",
-      text: JSON.stringify(data, null, 2)
+      text: JSON.stringify(data, null, 2) ?? "null"
     }
   ];
 }
@@ -341,7 +368,16 @@ function buildRumSessionUrl(applicationId, sessionId, site = "datadoghq.com") {
 }
 
 // src/tools/monitors.ts
-var ActionSchema = z2.enum(["list", "get", "search", "create", "update", "delete", "mute", "unmute"]);
+var ActionSchema = z2.enum([
+  "list",
+  "get",
+  "search",
+  "create",
+  "update",
+  "delete",
+  "mute",
+  "unmute"
+]);
 var InputSchema = {
   action: ActionSchema.describe("Action to perform"),
   id: z2.string().optional().describe("Monitor ID (required for get/update/delete/mute/unmute)"),
@@ -389,8 +425,8 @@ async function listMonitors(api, params, limits, site) {
   };
 }
 async function getMonitor(api, id, site) {
-  const monitorId = parseInt(id, 10);
-  if (isNaN(monitorId)) {
+  const monitorId = Number.parseInt(id, 10);
+  if (Number.isNaN(monitorId)) {
     throw new Error(`Invalid monitor ID: ${id}`);
   }
   const monitor = await api.getMonitor({ monitorId });
@@ -478,7 +514,7 @@ async function createMonitor(api, config) {
   };
 }
 async function updateMonitor(api, id, config) {
-  const monitorId = parseInt(id, 10);
+  const monitorId = Number.parseInt(id, 10);
   const body = normalizeMonitorConfig(config);
   const monitor = await api.updateMonitor({ monitorId, body });
   return {
@@ -487,12 +523,12 @@ async function updateMonitor(api, id, config) {
   };
 }
 async function deleteMonitor(api, id) {
-  const monitorId = parseInt(id, 10);
+  const monitorId = Number.parseInt(id, 10);
   await api.deleteMonitor({ monitorId });
   return { success: true, message: `Monitor ${id} deleted` };
 }
 async function muteMonitor(api, id, params) {
-  const monitorId = parseInt(id, 10);
+  const monitorId = Number.parseInt(id, 10);
   const monitor = await api.getMonitor({ monitorId });
   await api.updateMonitor({
     monitorId,
@@ -506,7 +542,7 @@ async function muteMonitor(api, id, params) {
   return { success: true, message: `Monitor ${id} muted` };
 }
 async function unmuteMonitor(api, id) {
-  const monitorId = parseInt(id, 10);
+  const monitorId = Number.parseInt(id, 10);
   const monitor = await api.getMonitor({ monitorId });
   await api.updateMonitor({
     monitorId,
@@ -531,7 +567,9 @@ TIP: For alert HISTORY (which monitors triggered), use the events tool with tags
         checkReadOnly(action, readOnly);
         switch (action) {
           case "list":
-            return toolResult(await listMonitors(api, { name, tags, groupStates, limit }, limits, site));
+            return toolResult(
+              await listMonitors(api, { name, tags, groupStates, limit }, limits, site)
+            );
           case "get": {
             const monitorId = requireParam(id, "id", "get");
             return toolResult(await getMonitor(api, monitorId, site));
@@ -602,9 +640,7 @@ async function listDashboards(api, params, limits) {
   let dashboards = response.dashboards ?? [];
   if (params.name) {
     const lowerName = params.name.toLowerCase();
-    dashboards = dashboards.filter(
-      (d) => d.title?.toLowerCase().includes(lowerName)
-    );
+    dashboards = dashboards.filter((d) => d.title?.toLowerCase().includes(lowerName));
   }
   const result = dashboards.slice(0, effectiveLimit).map(formatDashboardSummary);
   return {
@@ -667,7 +703,7 @@ async function deleteDashboard(api, id) {
   await api.deleteDashboard({ dashboardId: id });
   return { success: true, message: `Dashboard ${id} deleted` };
 }
-function registerDashboardsTool(server, api, limits, readOnly = false) {
+function registerDashboardsTool(server, api, limits, readOnly = false, _site = "datadoghq.com") {
   server.tool(
     "dashboards",
     "Access Datadog dashboards and visualizations. Actions: list (filter by name/tags), get, create, update, delete. Use for: finding existing views, team dashboards, understanding what is monitored.",
@@ -729,9 +765,9 @@ function parseTime(input, defaultValue) {
     return input;
   }
   const trimmed = input.trim();
-  const simpleRelativeMatch = trimmed.match(/^(\d+)(s|m|h|d)$/);
+  const simpleRelativeMatch = trimmed.match(/^(\d+)([smhd])$/);
   if (simpleRelativeMatch) {
-    const value = parseInt(simpleRelativeMatch[1] ?? "0", 10);
+    const value = Number.parseInt(simpleRelativeMatch[1] ?? "0", 10);
     const unit = simpleRelativeMatch[2];
     const nowTs = now();
     switch (unit) {
@@ -747,13 +783,13 @@ function parseTime(input, defaultValue) {
         return defaultValue;
     }
   }
-  const relativeWithTimeMatch = trimmed.match(/^(\d+)(d|h)[@\s](\d{1,2}):(\d{2})(?::(\d{2}))?$/);
+  const relativeWithTimeMatch = trimmed.match(/^(\d+)([dh])[@\s](\d{1,2}):(\d{2})(?::(\d{2}))?$/);
   if (relativeWithTimeMatch) {
-    const value = parseInt(relativeWithTimeMatch[1] ?? "0", 10);
+    const value = Number.parseInt(relativeWithTimeMatch[1] ?? "0", 10);
     const unit = relativeWithTimeMatch[2];
-    const hours = parseInt(relativeWithTimeMatch[3] ?? "0", 10);
-    const minutes = parseInt(relativeWithTimeMatch[4] ?? "0", 10);
-    const seconds = parseInt(relativeWithTimeMatch[5] ?? "0", 10);
+    const hours = Number.parseInt(relativeWithTimeMatch[3] ?? "0", 10);
+    const minutes = Number.parseInt(relativeWithTimeMatch[4] ?? "0", 10);
+    const seconds = Number.parseInt(relativeWithTimeMatch[5] ?? "0", 10);
     if (unit === "d") {
       const date3 = startOfDayAgo(value);
       date3.setHours(hours, minutes, seconds, 0);
@@ -767,26 +803,27 @@ function parseTime(input, defaultValue) {
   const keywordMatch = trimmed.match(/^(today|yesterday)[@\s](\d{1,2}):(\d{2})(?::(\d{2}))?$/i);
   if (keywordMatch) {
     const keyword = keywordMatch[1]?.toLowerCase();
-    const hours = parseInt(keywordMatch[2] ?? "0", 10);
-    const minutes = parseInt(keywordMatch[3] ?? "0", 10);
-    const seconds = parseInt(keywordMatch[4] ?? "0", 10);
+    const hours = Number.parseInt(keywordMatch[2] ?? "0", 10);
+    const minutes = Number.parseInt(keywordMatch[3] ?? "0", 10);
+    const seconds = Number.parseInt(keywordMatch[4] ?? "0", 10);
     const daysAgo = keyword === "yesterday" ? 1 : 0;
     const date2 = startOfDayAgo(daysAgo);
     date2.setHours(hours, minutes, seconds, 0);
     return Math.floor(date2.getTime() / 1e3);
   }
   const date = new Date(trimmed);
-  if (!isNaN(date.getTime())) {
+  if (!Number.isNaN(date.getTime())) {
     return Math.floor(date.getTime() / 1e3);
   }
-  const ts = parseInt(trimmed, 10);
-  if (!isNaN(ts)) {
+  const ts = Number.parseInt(trimmed, 10);
+  if (!Number.isNaN(ts)) {
     return ts;
   }
   return defaultValue;
 }
 function ensureValidTimeRange(from, to, minRangeSeconds = 60) {
   if (from > to) {
+    ;
     [from, to] = [to, from];
   }
   if (to - from < minRangeSeconds) {
@@ -804,21 +841,21 @@ function parseDurationToNs(input) {
   const trimmed = input.trim().toLowerCase();
   const match = trimmed.match(/^(\d+(?:\.\d+)?)(ns|µs|us|ms|s|m|h|d|w)?$/);
   if (!match) {
-    const raw = parseInt(trimmed, 10);
-    return isNaN(raw) ? void 0 : raw;
+    const raw = Number.parseInt(trimmed, 10);
+    return Number.isNaN(raw) ? void 0 : raw;
   }
-  const value = parseFloat(match[1] ?? "0");
+  const value = Number.parseFloat(match[1] ?? "0");
   const unit = match[2] ?? "ns";
   const multipliers = {
-    "ns": 1,
-    "\xB5s": 1e3,
-    "us": 1e3,
-    "ms": 1e6,
-    "s": 1e9,
-    "m": 6e10,
-    "h": 36e11,
-    "d": 864e11,
-    "w": 6048e11
+    ns: 1,
+    \u00B5s: 1e3,
+    us: 1e3,
+    ms: 1e6,
+    s: 1e9,
+    m: 6e10,
+    h: 36e11,
+    d: 864e11,
+    w: 6048e11
   };
   return Math.floor(value * (multipliers[unit] ?? 1));
 }
@@ -834,10 +871,18 @@ function formatDurationNs(ns) {
 var ActionSchema3 = z4.enum(["search", "aggregate"]);
 var InputSchema3 = {
   action: ActionSchema3.describe("Action to perform"),
-  query: z4.string().optional().describe('Log search query (Datadog syntax). Examples: "error", "service:my-service status:error", "error AND timeout"'),
-  keyword: z4.string().optional().describe("Simple text search - finds logs containing this text (grep-like). Merged with query using AND"),
-  pattern: z4.string().optional().describe('Regex pattern to match in log message (grep -E style). Example: "ERROR.*timeout|connection refused"'),
-  from: z4.string().optional().describe("Start time. Formats: ISO 8601, relative (30s, 15m, 2h, 7d), precise (3d@11:45:23, yesterday@14:00)"),
+  query: z4.string().optional().describe(
+    'Log search query (Datadog syntax). Examples: "error", "service:my-service status:error", "error AND timeout"'
+  ),
+  keyword: z4.string().optional().describe(
+    "Simple text search - finds logs containing this text (grep-like). Merged with query using AND"
+  ),
+  pattern: z4.string().optional().describe(
+    'Regex pattern to match in log message (grep -E style). Example: "ERROR.*timeout|connection refused"'
+  ),
+  from: z4.string().optional().describe(
+    "Start time. Formats: ISO 8601, relative (30s, 15m, 2h, 7d), precise (3d@11:45:23, yesterday@14:00)"
+  ),
   to: z4.string().optional().describe('End time. Same formats as "from". Example: from="3d@11:45:23" to="3d@12:55:34"'),
   service: z4.string().optional().describe("Filter by service name"),
   host: z4.string().optional().describe("Filter by host"),
@@ -845,8 +890,12 @@ var InputSchema3 = {
   indexes: z4.array(z4.string()).optional().describe("Log indexes to search"),
   limit: z4.number().optional().describe("Maximum number of logs to return"),
   sort: z4.enum(["timestamp", "-timestamp"]).optional().describe("Sort order"),
-  sample: z4.enum(["first", "spread", "diverse"]).optional().describe("Sampling mode: first (chronological, default), spread (evenly across time range), diverse (distinct message patterns)"),
-  compact: z4.boolean().optional().describe("Strip custom attributes for token efficiency. Keeps: id, timestamp, service, status, message (truncated), dd.trace_id, error info"),
+  sample: z4.enum(["first", "spread", "diverse"]).optional().describe(
+    "Sampling mode: first (chronological, default), spread (evenly across time range), diverse (distinct message patterns)"
+  ),
+  compact: z4.boolean().optional().describe(
+    "Strip custom attributes for token efficiency. Keeps: id, timestamp, service, status, message (truncated), dd.trace_id, error info"
+  ),
   groupBy: z4.array(z4.string()).optional().describe("Fields to group by (for aggregate)"),
   compute: z4.record(z4.unknown()).optional().describe("Compute operations (for aggregate)")
 };
@@ -876,8 +925,9 @@ function formatLogCompact(log) {
     const ts = attrs.timestamp;
     timestamp = ts instanceof Date ? ts.toISOString() : new Date(String(ts)).toISOString();
   }
-  const traceId = nestedAttrs["dd.trace_id"] ?? nestedAttrs["trace_id"] ?? attrs["dd.trace_id"] ?? "";
-  const spanId = nestedAttrs["dd.span_id"] ?? nestedAttrs["span_id"] ?? attrs["dd.span_id"] ?? "";
+  const attrsAny = attrs;
+  const traceId = nestedAttrs["dd.trace_id"] ?? nestedAttrs["trace_id"] ?? attrsAny["dd.trace_id"] ?? "";
+  const spanId = nestedAttrs["dd.span_id"] ?? nestedAttrs["span_id"] ?? attrsAny["dd.span_id"] ?? "";
   const errorType = nestedAttrs["error.type"] ?? nestedAttrs["error.kind"] ?? "";
   const errorMessage = nestedAttrs["error.message"] ?? nestedAttrs["error.msg"] ?? "";
   const fullMessage = attrs.message ?? "";
@@ -1054,35 +1104,66 @@ CORRELATION: Logs contain dd.trace_id in attributes for linking to traces and AP
 SAMPLING: Use sample:"diverse" for error investigation (dedupes by message pattern), sample:"spread" for time distribution.
 TOKEN TIP: Use compact:true to reduce payload size (strips heavy fields) when querying large volumes.`,
     InputSchema3,
-    async ({ action, query, keyword, pattern, service, host, status, from, to, indexes, limit, sort, sample, compact, groupBy, compute }) => {
+    async ({
+      action,
+      query,
+      keyword,
+      pattern,
+      service,
+      host,
+      status,
+      from,
+      to,
+      indexes,
+      limit,
+      sort,
+      sample,
+      compact,
+      groupBy,
+      compute
+    }) => {
       try {
         switch (action) {
           case "search": {
-            return toolResult(await searchLogs(api, {
-              query,
-              keyword,
-              pattern,
-              service,
-              host,
-              status,
-              from,
-              to,
-              indexes,
-              limit,
-              sort,
-              sample,
-              compact
-            }, limits, site));
+            return toolResult(
+              await searchLogs(
+                api,
+                {
+                  query,
+                  keyword,
+                  pattern,
+                  service,
+                  host,
+                  status,
+                  from,
+                  to,
+                  indexes,
+                  limit,
+                  sort,
+                  sample,
+                  compact
+                },
+                limits,
+                site
+              )
+            );
           }
           case "aggregate": {
-            const aggregateQuery = requireParam(query, "query", "aggregate");
-            return toolResult(await aggregateLogs(api, {
-              query: aggregateQuery,
-              from,
-              to,
-              groupBy,
-              compute
-            }, limits, site));
+            const aggregateQuery = query ?? "*";
+            return toolResult(
+              await aggregateLogs(
+                api,
+                {
+                  query: aggregateQuery,
+                  from,
+                  to,
+                  groupBy,
+                  compute
+                },
+                limits,
+                site
+              )
+            );
           }
           default:
             throw new Error(`Unknown action: ${action}`);
@@ -1099,8 +1180,12 @@ import { z as z5 } from "zod";
 var ActionSchema4 = z5.enum(["query", "search", "list", "metadata"]);
 var InputSchema4 = {
   action: ActionSchema4.describe("Action to perform"),
-  query: z5.string().optional().describe('For query: PromQL expression (e.g., "avg:system.cpu.user{*}"). For search: grep-like filter on metric names. For list: tag filter.'),
-  from: z5.string().optional().describe("Start time (ONLY for query action). Formats: ISO 8601, relative (30s, 15m, 2h, 7d), precise (3d@11:45:23)"),
+  query: z5.string().optional().describe(
+    'For query: PromQL expression (e.g., "avg:system.cpu.user{*}"). For search: grep-like filter on metric names. For list: tag filter.'
+  ),
+  from: z5.string().optional().describe(
+    "Start time (ONLY for query action). Formats: ISO 8601, relative (30s, 15m, 2h, 7d), precise (3d@11:45:23)"
+  ),
   to: z5.string().optional().describe('End time (ONLY for query action). Same formats as "from".'),
   metric: z5.string().optional().describe("Metric name (for metadata action)"),
   tag: z5.string().optional().describe("Filter by tag"),
@@ -1198,18 +1283,31 @@ Example: max:trace.{service}.request.duration{*}`,
         switch (action) {
           case "query": {
             const metricsQuery = requireParam(query, "query", "query");
-            return toolResult(await queryMetrics(metricsV1Api, {
-              query: metricsQuery,
-              from,
-              to
-            }, limits, site));
+            return toolResult(
+              await queryMetrics(
+                metricsV1Api,
+                {
+                  query: metricsQuery,
+                  from,
+                  to
+                },
+                limits,
+                site
+              )
+            );
           }
           case "search": {
             const searchQuery = requireParam(query, "query", "search");
-            return toolResult(await searchMetrics(metricsV1Api, {
-              query: searchQuery,
-              limit
-            }, limits));
+            return toolResult(
+              await searchMetrics(
+                metricsV1Api,
+                {
+                  query: searchQuery,
+                  limit
+                },
+                limits
+              )
+            );
           }
           case "list":
             return toolResult(await listMetrics(metricsV1Api, { query }, limits));
@@ -1245,17 +1343,25 @@ var RESERVED_SPAN_FACETS = /* @__PURE__ */ new Set([
 ]);
 var InputSchema5 = {
   action: ActionSchema5.describe("Action to perform"),
-  query: z6.string().optional().describe('APM trace search query (Datadog syntax). Example: "@http.status_code:500", "service:my-service status:error"'),
-  from: z6.string().optional().describe("Start time. Formats: ISO 8601, relative (30s, 15m, 2h, 7d), precise (3d@11:45:23, yesterday@14:00)"),
+  query: z6.string().optional().describe(
+    'APM trace search query (Datadog syntax). Example: "@http.status_code:500", "service:my-service status:error"'
+  ),
+  from: z6.string().optional().describe(
+    "Start time. Formats: ISO 8601, relative (30s, 15m, 2h, 7d), precise (3d@11:45:23, yesterday@14:00)"
+  ),
   to: z6.string().optional().describe('End time. Same formats as "from". Example: from="3d@11:45" to="3d@12:55"'),
   service: z6.string().optional().describe('Filter by service name. Example: "my-service", "postgres"'),
   operation: z6.string().optional().describe('Filter by operation name. Example: "express.request", "mongodb.query"'),
-  resource: z6.string().optional().describe('Filter by resource name (endpoint/query). Supports wildcards. Example: "GET /api/*", "*orders*"'),
+  resource: z6.string().optional().describe(
+    'Filter by resource name (endpoint/query). Supports wildcards. Example: "GET /api/*", "*orders*"'
+  ),
   status: z6.enum(["ok", "error"]).optional().describe('Filter by span status - "ok" for successful, "error" for failed spans'),
   env: z6.string().optional().describe('Filter by environment. Example: "production", "staging"'),
   minDuration: z6.string().optional().describe('Minimum span duration (find slow spans). Examples: "1s", "500ms", "100ms"'),
   maxDuration: z6.string().optional().describe('Maximum span duration. Examples: "5s", "1000ms"'),
-  httpStatus: z6.string().optional().describe('HTTP status code filter. Examples: "500", "5xx" (500-599), "4xx" (400-499), ">=400"'),
+  httpStatus: z6.string().optional().describe(
+    'HTTP status code filter. Examples: "500", "5xx" (500-599), "4xx" (400-499), ">=400"'
+  ),
   errorType: z6.string().optional().describe('Filter by error type (grep-like). Example: "TimeoutError", "ConnectionRefused"'),
   errorMessage: z6.string().optional().describe('Filter by error message (grep-like). Example: "timeout", "connection refused"'),
   limit: z6.number().optional().describe("Maximum number of results"),
@@ -1306,6 +1412,18 @@ function formatSpan(span) {
     tags
   };
 }
+function buildHttpStatusFilter(httpStatus) {
+  const status = httpStatus.toLowerCase();
+  if (status.endsWith("xx")) {
+    const base = Number.parseInt(status[0] ?? "0", 10) * 100;
+    return `@http.status_code:[${base} TO ${base + 99}]`;
+  }
+  if (status.startsWith(">=")) return `@http.status_code:>=${status.slice(2)}`;
+  if (status.startsWith(">")) return `@http.status_code:>${status.slice(1)}`;
+  if (status.startsWith("<=")) return `@http.status_code:<=${status.slice(2)}`;
+  if (status.startsWith("<")) return `@http.status_code:<${status.slice(1)}`;
+  return `@http.status_code:${httpStatus}`;
+}
 function buildTraceQuery(params) {
   const parts = [];
   if (params.query) {
@@ -1318,11 +1436,7 @@ function buildTraceQuery(params) {
     parts.push(`operation_name:${params.operation}`);
   }
   if (params.resource) {
-    if (params.resource.includes("*") || params.resource.includes(" ")) {
-      parts.push(`resource_name:${params.resource}`);
-    } else {
-      parts.push(`resource_name:${params.resource}`);
-    }
+    parts.push(`resource_name:${params.resource}`);
   }
   if (params.status) {
     parts.push(`status:${params.status}`);
@@ -1343,21 +1457,7 @@ function buildTraceQuery(params) {
     }
   }
   if (params.httpStatus) {
-    const status = params.httpStatus.toLowerCase();
-    if (status.endsWith("xx")) {
-      const base = parseInt(status[0] ?? "0", 10) * 100;
-      parts.push(`@http.status_code:[${base} TO ${base + 99}]`);
-    } else if (status.startsWith(">=")) {
-      parts.push(`@http.status_code:>=${status.slice(2)}`);
-    } else if (status.startsWith(">")) {
-      parts.push(`@http.status_code:>${status.slice(1)}`);
-    } else if (status.startsWith("<=")) {
-      parts.push(`@http.status_code:<=${status.slice(2)}`);
-    } else if (status.startsWith("<")) {
-      parts.push(`@http.status_code:<${status.slice(1)}`);
-    } else {
-      parts.push(`@http.status_code:${params.httpStatus}`);
-    }
+    parts.push(buildHttpStatusFilter(params.httpStatus));
   }
   if (params.errorType) {
     const escaped = params.errorType.replace(/"/g, '\\"');
@@ -1491,10 +1591,12 @@ async function listApmServices(api, params, limits) {
           to: toTime
         },
         compute: [{ aggregation: "count", type: "total" }],
-        groupBy: [{
-          facet: "service",
-          limit: limits.maxResults
-        }]
+        groupBy: [
+          {
+            facet: "service",
+            limit: limits.maxResults
+          }
+        ]
       }
     }
   };
@@ -1521,45 +1623,77 @@ function registerTracesTool(server, spansApi, _servicesApi, limits, site = "data
     `Analyze APM traces for request flow and latency debugging. Actions: search (find spans), aggregate (group stats), services (list APM services). Key filters: minDuration/maxDuration ("500ms", "2s"), httpStatus ("5xx", ">=400"), status (ok/error), errorMessage (grep).
 APM METRICS: Traces auto-generate metrics in trace.{service}.* namespace. Use metrics tool to query: avg:trace.{service}.request.duration{*}`,
     InputSchema5,
-    async ({ action, query, from, to, service, operation, resource, status, env, minDuration, maxDuration, httpStatus, errorType, errorMessage, limit, sort, groupBy }) => {
+    async ({
+      action,
+      query,
+      from,
+      to,
+      service,
+      operation,
+      resource,
+      status,
+      env,
+      minDuration,
+      maxDuration,
+      httpStatus,
+      errorType,
+      errorMessage,
+      limit,
+      sort,
+      groupBy
+    }) => {
       try {
         switch (action) {
           case "search": {
-            return toolResult(await searchTraces(spansApi, {
-              query,
-              from,
-              to,
-              service,
-              operation,
-              resource,
-              status,
-              env,
-              minDuration,
-              maxDuration,
-              httpStatus,
-              errorType,
-              errorMessage,
-              limit,
-              sort
-            }, limits, site));
+            return toolResult(
+              await searchTraces(
+                spansApi,
+                {
+                  query,
+                  from,
+                  to,
+                  service,
+                  operation,
+                  resource,
+                  status,
+                  env,
+                  minDuration,
+                  maxDuration,
+                  httpStatus,
+                  errorType,
+                  errorMessage,
+                  limit,
+                  sort
+                },
+                limits,
+                site
+              )
+            );
           }
           case "aggregate": {
-            return toolResult(await aggregateTraces(spansApi, {
-              query,
-              from,
-              to,
-              service,
-              operation,
-              resource,
-              status,
-              env,
-              minDuration,
-              maxDuration,
-              httpStatus,
-              errorType,
-              errorMessage,
-              groupBy
-            }, limits, site));
+            return toolResult(
+              await aggregateTraces(
+                spansApi,
+                {
+                  query,
+                  from,
+                  to,
+                  service,
+                  operation,
+                  resource,
+                  status,
+                  env,
+                  minDuration,
+                  maxDuration,
+                  httpStatus,
+                  errorType,
+                  errorMessage,
+                  groupBy
+                },
+                limits,
+                site
+              )
+            );
           }
           case "services":
             return toolResult(await listApmServices(spansApi, { env, from, to }, limits));
@@ -1575,7 +1709,16 @@ APM METRICS: Traces auto-generate metrics in trace.{service}.* namespace. Use me
 
 // src/tools/events.ts
 import { z as z7 } from "zod";
-var ActionSchema6 = z7.enum(["list", "get", "create", "search", "aggregate", "top", "timeseries", "incidents"]);
+var ActionSchema6 = z7.enum([
+  "list",
+  "get",
+  "create",
+  "search",
+  "aggregate",
+  "top",
+  "timeseries",
+  "incidents"
+]);
 var InputSchema6 = {
   action: ActionSchema6.describe("Action to perform"),
   id: z7.string().optional().describe("Event ID (for get action)"),
@@ -1619,14 +1762,14 @@ function extractTitleFromMessage(message) {
   if (!message) return "";
   const content = message.replace(/^%%%\s*\n?/, "").trim();
   const firstLine = content.split("\n")[0]?.trim() ?? "";
-  return firstLine.replace(/\s+!?\s*$/, "").trim();
+  return firstLine.replace(/\s*!?\s*$/, "").trim();
 }
 function extractMonitorIdFromMessage(message) {
   if (!message) return void 0;
   const match = message.match(/\/monitors\/(\d+)/);
-  if (match && match[1]) {
-    const id = parseInt(match[1], 10);
-    return isNaN(id) ? void 0 : id;
+  if (match?.[1]) {
+    const id = Number.parseInt(match[1], 10);
+    return Number.isNaN(id) ? void 0 : id;
   }
   return void 0;
 }
@@ -1745,8 +1888,8 @@ async function listEventsV1(api, params, limits) {
   };
 }
 async function getEventV1(api, id) {
-  const eventId = parseInt(id, 10);
-  if (isNaN(eventId)) {
+  const eventId = Number.parseInt(id, 10);
+  if (Number.isNaN(eventId)) {
     throw new Error(`Invalid event ID: ${id}`);
   }
   const response = await api.getEvent({ eventId });
@@ -1910,13 +2053,18 @@ async function aggregateEventsV2(api, params, limits, site) {
 async function topEventsV2(api, params, limits, site) {
   const effectiveQuery = params.query ?? "source:alert";
   const effectiveTags = params.tags ?? ["source:alert"];
-  const result = await aggregateEventsV2(api, {
-    ...params,
-    query: effectiveQuery,
-    tags: effectiveTags,
-    groupBy: params.groupBy ?? ["monitor_name"],
-    limit: params.limit ?? 10
-  }, limits, site);
+  const result = await aggregateEventsV2(
+    api,
+    {
+      ...params,
+      query: effectiveQuery,
+      tags: effectiveTags,
+      groupBy: params.groupBy ?? ["monitor_name"],
+      limit: params.limit ?? 10
+    },
+    limits,
+    site
+  );
   return {
     top: result.buckets.map((bucket, index) => ({
       rank: index + 1,
@@ -1949,7 +2097,7 @@ async function timeseriesEventsV2(api, params, limits, site) {
   const fullQuery = buildEventQuery({
     query: params.query ?? "source:alert",
     sources: params.sources,
-    tags: params.tags ?? ["source:alert"]
+    tags: params.tags
   });
   const intervalMs = parseIntervalToMs(params.interval);
   const groupByFields = params.groupBy ?? ["monitor_name"];
@@ -2034,7 +2182,7 @@ async function incidentsEventsV2(api, params, limits, site) {
   const fullQuery = buildEventQuery({
     query: params.query ?? "source:alert",
     sources: params.sources,
-    tags: params.tags ?? ["source:alert"]
+    tags: params.tags
   });
   const dedupeWindowNs = parseDurationToNs(params.dedupeWindow ?? "5m");
   const dedupeWindowMs = dedupeWindowNs ? Math.floor(dedupeWindowNs / 1e6) : 3e5;
@@ -2149,7 +2297,9 @@ async function incidentsEventsV2(api, params, limits, site) {
       sample: inc.sample
     };
   });
-  incidentList.sort((a, b) => new Date(b.firstTrigger).getTime() - new Date(a.firstTrigger).getTime());
+  incidentList.sort(
+    (a, b) => new Date(b.firstTrigger).getTime() - new Date(a.firstTrigger).getTime()
+  );
   const effectiveLimit = Math.min(params.limit ?? 100, 500);
   return {
     incidents: incidentList.slice(0, effectiveLimit),
@@ -2227,20 +2377,44 @@ Use action:"timeseries" with interval:"1h" to see alert trends over time.
 Use action:"incidents" with dedupeWindow:"5m" to deduplicate alerts into incidents.
 Use enrich:true with search to get monitor metadata (slower).`,
     InputSchema6,
-    async ({ action, id, query, from, to, priority, sources, tags, limit, title, text, alertType, groupBy, cursor, interval, dedupeWindow, enrich }) => {
+    async ({
+      action,
+      id,
+      query,
+      from,
+      to,
+      priority,
+      sources,
+      tags,
+      limit,
+      title,
+      text,
+      alertType,
+      groupBy,
+      cursor,
+      interval,
+      dedupeWindow,
+      enrich
+    }) => {
       try {
         checkReadOnly(action, readOnly);
         switch (action) {
           case "list":
-            return toolResult(await listEventsV1(apiV1, {
-              query,
-              from,
-              to,
-              priority,
-              sources,
-              tags,
-              limit
-            }, limits));
+            return toolResult(
+              await listEventsV1(
+                apiV1,
+                {
+                  query,
+                  from,
+                  to,
+                  priority,
+                  sources,
+                  tags,
+                  limit
+                },
+                limits
+              )
+            );
           case "get": {
             const eventId = requireParam(id, "id", "get");
             return toolResult(await getEventV1(apiV1, eventId));
@@ -2248,25 +2422,32 @@ Use enrich:true with search to get monitor metadata (slower).`,
           case "create": {
             const eventTitle = requireParam(title, "title", "create");
             const eventText = requireParam(text, "text", "create");
-            return toolResult(await createEventV1(apiV1, {
-              title: eventTitle,
-              text: eventText,
-              priority,
-              tags,
-              alertType
-            }));
+            return toolResult(
+              await createEventV1(apiV1, {
+                title: eventTitle,
+                text: eventText,
+                priority,
+                tags,
+                alertType
+              })
+            );
           }
           case "search": {
-            const result = await searchEventsV2(apiV2, {
-              query,
-              from,
-              to,
-              sources,
-              tags,
-              priority,
-              limit,
-              cursor
-            }, limits, site);
+            const result = await searchEventsV2(
+              apiV2,
+              {
+                query,
+                from,
+                to,
+                sources,
+                tags,
+                priority,
+                limit,
+                cursor
+              },
+              limits,
+              site
+            );
             if (enrich && result.events.length > 0) {
               const enrichedEvents = await enrichWithMonitorMetadata(result.events, monitorsApi);
               return toolResult({ ...result, events: enrichedEvents });
@@ -2274,46 +2455,74 @@ Use enrich:true with search to get monitor metadata (slower).`,
             return toolResult(result);
           }
           case "aggregate":
-            return toolResult(await aggregateEventsV2(apiV2, {
-              query,
-              from,
-              to,
-              sources,
-              tags,
-              groupBy,
-              limit
-            }, limits, site));
+            return toolResult(
+              await aggregateEventsV2(
+                apiV2,
+                {
+                  query,
+                  from,
+                  to,
+                  sources,
+                  tags,
+                  groupBy,
+                  limit
+                },
+                limits,
+                site
+              )
+            );
           case "top":
-            return toolResult(await topEventsV2(apiV2, {
-              query,
-              from,
-              to,
-              sources,
-              tags,
-              groupBy,
-              limit
-            }, limits, site));
+            return toolResult(
+              await topEventsV2(
+                apiV2,
+                {
+                  query,
+                  from,
+                  to,
+                  sources,
+                  tags,
+                  groupBy,
+                  limit
+                },
+                limits,
+                site
+              )
+            );
           case "timeseries":
-            return toolResult(await timeseriesEventsV2(apiV2, {
-              query,
-              from,
-              to,
-              sources,
-              tags,
-              groupBy,
-              interval,
-              limit
-            }, limits, site));
+            return toolResult(
+              await timeseriesEventsV2(
+                apiV2,
+                {
+                  query,
+                  from,
+                  to,
+                  sources,
+                  tags,
+                  groupBy,
+                  interval,
+                  limit
+                },
+                limits,
+                site
+              )
+            );
           case "incidents":
-            return toolResult(await incidentsEventsV2(apiV2, {
-              query,
-              from,
-              to,
-              sources,
-              tags,
-              dedupeWindow,
-              limit
-            }, limits, site));
+            return toolResult(
+              await incidentsEventsV2(
+                apiV2,
+                {
+                  query,
+                  from,
+                  to,
+                  sources,
+                  tags,
+                  dedupeWindow,
+                  limit
+                },
+                limits,
+                site
+              )
+            );
           default:
             throw new Error(`Unknown action: ${action}`);
         }
@@ -2333,7 +2542,9 @@ var InputSchema7 = {
   query: z8.string().optional().describe("Search query (for search action)"),
   status: z8.enum(["active", "stable", "resolved"]).optional().describe("Filter by status (for list)"),
   limit: z8.number().optional().describe("Maximum number of incidents to return"),
-  config: z8.record(z8.unknown()).optional().describe("Incident configuration (for create/update). Create requires: title. Update can modify: title, status, severity, fields.")
+  config: z8.record(z8.unknown()).optional().describe(
+    "Incident configuration (for create/update). Create requires: title. Update can modify: title, status, severity, fields."
+  )
 };
 function formatIncident(i) {
   const attrs = i.attributes;
@@ -2385,11 +2596,13 @@ async function searchIncidents(api, query, limits) {
     query,
     pageSize: limits.maxResults
   });
-  const incidents = (response.data?.attributes?.incidents ?? []).map((i) => ({
-    id: i.data?.id ?? "",
-    title: i.data?.attributes?.title ?? "",
-    state: i.data?.attributes?.state ?? "unknown"
-  }));
+  const incidents = (response.data?.attributes?.incidents ?? []).map(
+    (i) => ({
+      id: i.data?.id ?? "",
+      title: i.data?.attributes?.title ?? "",
+      state: i.data?.attributes?.state ?? "unknown"
+    })
+  );
   return {
     incidents,
     total: response.data?.attributes?.total ?? incidents.length
@@ -2429,7 +2642,7 @@ async function deleteIncident(api, id) {
     message: `Incident ${id} deleted`
   };
 }
-function registerIncidentsTool(server, api, limits, readOnly = false) {
+function registerIncidentsTool(server, api, limits, readOnly = false, _site = "datadoghq.com") {
   server.tool(
     "incidents",
     "Manage Datadog incidents for incident response. Actions: list, get, search, create, update, delete. Use for: incident management, on-call response, postmortems, tracking MTTR/MTTD.",
@@ -2606,7 +2819,7 @@ async function getSloHistory(api, id, params) {
     }
   };
 }
-function registerSlosTool(server, api, limits, readOnly = false) {
+function registerSlosTool(server, api, limits, readOnly = false, _site = "datadoghq.com") {
   server.tool(
     "slos",
     "Manage Datadog Service Level Objectives. Actions: list, get, create, update, delete, history. SLO types: metric-based, monitor-based. Use for: reliability tracking, error budgets, SLA compliance, performance targets.",
@@ -2659,7 +2872,9 @@ var InputSchema9 = {
   locations: z10.array(z10.string()).optional().describe("Filter by locations (for list)"),
   tags: z10.array(z10.string()).optional().describe("Filter by tags (for list)"),
   limit: z10.number().optional().describe("Maximum number of tests to return"),
-  config: z10.record(z10.unknown()).optional().describe("Test configuration (for create/update). Includes: name, type, config, options, locations, message.")
+  config: z10.record(z10.unknown()).optional().describe(
+    "Test configuration (for create/update). Includes: name, type, config, options, locations, message."
+  )
 };
 function formatTest(t) {
   return {
@@ -2750,7 +2965,7 @@ async function createTest(api, config, testType) {
 }
 async function updateTest(api, id, config) {
   const normalizedConfig = normalizeConfigKeys2(config);
-  let testType = "api";
+  let testType;
   try {
     await api.getAPITest({ publicId: id });
     testType = "api";
@@ -2820,7 +3035,7 @@ async function getTestResults(api, id) {
     return { results, testType: "browser" };
   }
 }
-function registerSyntheticsTool(server, api, limits, readOnly = false) {
+function registerSyntheticsTool(server, api, limits, readOnly = false, _site = "datadoghq.com") {
   server.tool(
     "synthetics",
     "Manage Datadog Synthetic tests (API and Browser). Actions: list, get, create, update, delete, trigger, results. Use for: uptime monitoring, API testing, user journey testing, performance testing, canary deployments.",
@@ -2933,9 +3148,10 @@ async function muteHost(api, hostName, params) {
       override: params.override
     }
   });
+  const muteEndMessage = params.end ? ` until ${new Date(params.end * 1e3).toISOString()}` : " indefinitely";
   return {
     success: true,
-    message: `Host ${hostName} muted${params.end ? ` until ${new Date(params.end * 1e3).toISOString()}` : " indefinitely"}`
+    message: `Host ${hostName} muted${muteEndMessage}`
   };
 }
 async function unmuteHost(api, hostName) {
@@ -2950,12 +3166,25 @@ function registerHostsTool(server, api, limits, readOnly = false) {
     "hosts",
     "Manage Datadog infrastructure hosts. Actions: list (with filters), totals (counts), mute (silence alerts), unmute. Use for: infrastructure inventory, host health, silencing noisy hosts during maintenance.",
     InputSchema10,
-    async ({ action, filter, from, count, sortField, sortDir, hostName, message, end, override }) => {
+    async ({
+      action,
+      filter,
+      from,
+      count,
+      sortField,
+      sortDir,
+      hostName,
+      message,
+      end,
+      override
+    }) => {
       try {
         checkReadOnly(action, readOnly);
         switch (action) {
           case "list":
-            return toolResult(await listHosts(api, { filter, from, count, sortField, sortDir }, limits));
+            return toolResult(
+              await listHosts(api, { filter, from, count, sortField, sortDir }, limits)
+            );
           case "totals":
             return toolResult(await getHostTotals(api));
           case "mute": {
@@ -3141,7 +3370,9 @@ var InputSchema12 = {
     interval: z13.string().optional()
   }).optional().describe("Compute configuration for aggregation"),
   // Performance action parameters
-  metrics: z13.array(z13.enum(["lcp", "fcp", "cls", "fid", "inp", "loading_time"])).optional().describe("Core Web Vitals metrics to retrieve (default: all). lcp=Largest Contentful Paint, fcp=First Contentful Paint, cls=Cumulative Layout Shift, fid=First Input Delay, inp=Interaction to Next Paint, loading_time=View loading time"),
+  metrics: z13.array(z13.enum(["lcp", "fcp", "cls", "fid", "inp", "loading_time"])).optional().describe(
+    "Core Web Vitals metrics to retrieve (default: all). lcp=Largest Contentful Paint, fcp=First Contentful Paint, cls=Cumulative Layout Shift, fid=First Input Delay, inp=Interaction to Next Paint, loading_time=View loading time"
+  ),
   // Waterfall action parameters
   applicationId: z13.string().optional().describe("Application ID for waterfall action"),
   sessionId: z13.string().optional().describe("Session ID for waterfall action"),
@@ -3443,10 +3674,7 @@ function formatWaterfallEvent(event) {
   };
 }
 async function getSessionWaterfall(api, params, limits, site) {
-  const queryParts = [
-    `@application.id:${params.applicationId}`,
-    `@session.id:${params.sessionId}`
-  ];
+  const queryParts = [`@application.id:${params.applicationId}`, `@session.id:${params.sessionId}`];
   if (params.viewId) {
     queryParts.push(`@view.id:${params.viewId}`);
   }
@@ -3480,22 +3708,44 @@ function registerRumTool(server, api, limits, site = "datadoghq.com") {
     "rum",
     "Query Datadog Real User Monitoring (RUM) data. Actions: applications (list RUM apps), events (search RUM events), aggregate (group and count events), performance (Core Web Vitals: LCP, FCP, CLS, FID, INP), waterfall (session timeline with resources/actions/errors). Use for: frontend performance, user sessions, page views, errors, resource loading.",
     InputSchema12,
-    async ({ action, query, from, to, type, sort, limit, groupBy, compute, metrics, applicationId, sessionId, viewId }) => {
+    async ({
+      action,
+      query,
+      from,
+      to,
+      type,
+      sort,
+      limit,
+      groupBy,
+      compute,
+      metrics,
+      applicationId,
+      sessionId,
+      viewId
+    }) => {
       try {
         switch (action) {
           case "applications":
             return toolResult(await listApplications(api));
           case "events":
-            return toolResult(await searchEvents(api, { query, from, to, type, sort, limit }, limits, site));
+            return toolResult(
+              await searchEvents(api, { query, from, to, type, sort, limit }, limits, site)
+            );
           case "aggregate":
-            return toolResult(await aggregateEvents(api, { query, from, to, groupBy, compute }, limits, site));
+            return toolResult(
+              await aggregateEvents(api, { query, from, to, groupBy, compute }, limits, site)
+            );
           case "performance":
-            return toolResult(await getPerformanceMetrics(api, { query, from, to, groupBy, metrics }, limits, site));
+            return toolResult(
+              await getPerformanceMetrics(api, { query, from, to, groupBy, metrics }, limits, site)
+            );
           case "waterfall":
             if (!applicationId || !sessionId) {
               throw new Error("waterfall action requires applicationId and sessionId parameters");
             }
-            return toolResult(await getSessionWaterfall(api, { applicationId, sessionId, viewId }, limits, site));
+            return toolResult(
+              await getSessionWaterfall(api, { applicationId, sessionId, viewId }, limits, site)
+            );
           default:
             throw new Error(`Unknown action: ${action}`);
         }
@@ -3653,7 +3903,13 @@ function registerSecurityTool(server, api, limits) {
             }
             return toolResult(await listRules(api, { pageSize, pageCursor }, limits));
           case "signals":
-            return toolResult(await searchSignals(api, { query, from, to, severity, status, pageSize, pageCursor }, limits));
+            return toolResult(
+              await searchSignals(
+                api,
+                { query, from, to, severity, status, pageSize, pageCursor },
+                limits
+              )
+            );
           case "findings":
             return toolResult(await listFindings(api, { query, pageSize, pageCursor }, limits));
           default:
@@ -3677,10 +3933,19 @@ var InputSchema14 = {
   excludeAuthorHandle: z15.string().optional().describe("Exclude notebooks by author handle"),
   includeCells: z15.boolean().optional().describe("Include cell content in response (default: true for get)"),
   name: z15.string().optional().describe("Notebook name (for create/update)"),
-  cells: z15.array(z15.object({
-    type: z15.enum(["markdown", "timeseries", "toplist", "heatmap", "distribution", "log_stream"]),
-    content: z15.unknown()
-  })).optional().describe("Notebook cells (for create/update)"),
+  cells: z15.array(
+    z15.object({
+      type: z15.enum([
+        "markdown",
+        "timeseries",
+        "toplist",
+        "heatmap",
+        "distribution",
+        "log_stream"
+      ]),
+      content: z15.unknown()
+    })
+  ).optional().describe("Notebook cells (for create/update)"),
   time: z15.object({
     liveSpan: z15.string().optional(),
     start: z15.number().optional(),
@@ -3845,7 +4110,9 @@ async function updateNotebook(api, notebookId, params) {
       };
     });
   }
-  const timeConfig = params.time?.liveSpan ? { liveSpan: params.time.liveSpan } : void 0;
+  const timeConfig = params.time?.liveSpan ? {
+    liveSpan: params.time.liveSpan
+  } : void 0;
   const response = await api.updateNotebook({
     notebookId,
     body: {
@@ -3880,38 +4147,61 @@ async function deleteNotebook(api, notebookId) {
     message: `Notebook ${notebookId} deleted successfully`
   };
 }
-function registerNotebooksTool(server, api, limits, readOnly = false) {
+function registerNotebooksTool(server, api, limits, readOnly = false, _site = "datadoghq.com") {
   server.tool(
     "notebooks",
     "Manage Datadog Notebooks. Actions: list (search notebooks), get (by ID with cells), create (new notebook), update (modify notebook), delete (remove notebook). Use for: runbooks, incident documentation, investigation notes, dashboards as code.",
     InputSchema14,
-    async ({ action, id, query, authorHandle, excludeAuthorHandle, includeCells, name, cells, time, status, pageSize, pageNumber }) => {
+    async ({
+      action,
+      id,
+      query,
+      authorHandle,
+      excludeAuthorHandle,
+      includeCells,
+      name,
+      cells,
+      time,
+      status,
+      pageSize,
+      pageNumber
+    }) => {
       try {
         checkReadOnly(action, readOnly);
         switch (action) {
           case "list":
-            return toolResult(await listNotebooks(api, { query, authorHandle, excludeAuthorHandle, includeCells, pageSize, pageNumber }, limits));
+            return toolResult(
+              await listNotebooks(
+                api,
+                { query, authorHandle, excludeAuthorHandle, includeCells, pageSize, pageNumber },
+                limits
+              )
+            );
           case "get": {
             const notebookId = requireParam(id, "id", "get");
             return toolResult(await getNotebook(api, notebookId));
           }
           case "create": {
             const notebookName = requireParam(name, "name", "create");
-            return toolResult(await createNotebook(api, {
-              name: notebookName,
-              cells,
-              time,
-              status
-            }));
+            return toolResult(
+              await createNotebook(api, {
+                name: notebookName,
+                cells,
+                time,
+                status
+              })
+            );
           }
           case "update": {
             const notebookId = requireParam(id, "id", "update");
-            return toolResult(await updateNotebook(api, notebookId, {
-              name,
-              cells,
-              time,
-              status
-            }));
+            return toolResult(
+              await updateNotebook(api, notebookId, {
+                name,
+                cells,
+                time,
+                status
+              })
+            );
           }
           case "delete": {
             const notebookId = requireParam(id, "id", "delete");
@@ -3993,7 +4283,9 @@ function registerUsersTool(server, api, limits) {
       try {
         switch (action) {
           case "list":
-            return toolResult(await listUsers(api, { filter, status, pageSize, pageNumber }, limits));
+            return toolResult(
+              await listUsers(api, { filter, status, pageSize, pageNumber }, limits)
+            );
           case "get": {
             const userId = requireParam(id, "id", "get");
             return toolResult(await getUser(api, userId));
@@ -4224,9 +4516,18 @@ function registerTagsTool(server, api, _limits, readOnly = false) {
 
 // src/tools/usage.ts
 import { z as z19 } from "zod";
-var ActionSchema18 = z19.enum(["summary", "hosts", "logs", "custom_metrics", "indexed_spans", "ingested_spans"]);
+var ActionSchema18 = z19.enum([
+  "summary",
+  "hosts",
+  "logs",
+  "custom_metrics",
+  "indexed_spans",
+  "ingested_spans"
+]);
 var InputSchema18 = {
-  action: ActionSchema18.describe("Action to perform: summary (overall usage), hosts, logs, custom_metrics, indexed_spans, ingested_spans"),
+  action: ActionSchema18.describe(
+    "Action to perform: summary (overall usage), hosts, logs, custom_metrics, indexed_spans, ingested_spans"
+  ),
   from: z19.string().optional().describe('Start time (ISO 8601 date like "2024-01-01", or relative like "30d")'),
   to: z19.string().optional().describe('End time (ISO 8601 date like "2024-01-31", or relative like "now")'),
   includeOrgDetails: z19.boolean().optional().describe("Include usage breakdown by organization (for multi-org accounts)")
@@ -4238,7 +4539,7 @@ function parseDate(dateStr, defaultDate) {
     return new Date(seconds * 1e3);
   }
   const parsed = new Date(dateStr);
-  if (!isNaN(parsed.getTime())) {
+  if (!Number.isNaN(parsed.getTime())) {
     return parsed;
   }
   return defaultDate;
@@ -4395,7 +4696,9 @@ function registerUsageTool(server, api, _limits) {
 import { z as z20 } from "zod";
 var ActionSchema19 = z20.enum(["validate"]);
 var InputSchema19 = {
-  action: ActionSchema19.describe("Action to perform: validate - test if API key and App key are valid")
+  action: ActionSchema19.describe(
+    "Action to perform: validate - test if API key and App key are valid"
+  )
 };
 function registerAuthTool(server, clients) {
   server.tool(
@@ -4455,14 +4758,26 @@ function registerAllTools(server, clients, limits, features, site = "datadoghq.c
   const { readOnly, disabledTools } = features;
   const enabled = (tool) => !disabledTools.includes(tool);
   if (enabled("monitors")) registerMonitorsTool(server, clients.monitors, limits, readOnly, site);
-  if (enabled("dashboards")) registerDashboardsTool(server, clients.dashboards, limits, readOnly, site);
+  if (enabled("dashboards"))
+    registerDashboardsTool(server, clients.dashboards, limits, readOnly, site);
   if (enabled("logs")) registerLogsTool(server, clients.logs, limits, site);
-  if (enabled("metrics")) registerMetricsTool(server, clients.metricsV1, clients.metricsV2, limits, site);
+  if (enabled("metrics"))
+    registerMetricsTool(server, clients.metricsV1, clients.metricsV2, limits, site);
   if (enabled("traces")) registerTracesTool(server, clients.spans, clients.services, limits, site);
-  if (enabled("events")) registerEventsTool(server, clients.eventsV1, clients.eventsV2, clients.monitors, limits, readOnly, site);
+  if (enabled("events"))
+    registerEventsTool(
+      server,
+      clients.eventsV1,
+      clients.eventsV2,
+      clients.monitors,
+      limits,
+      readOnly,
+      site
+    );
   if (enabled("incidents")) registerIncidentsTool(server, clients.incidents, limits, readOnly, site);
   if (enabled("slos")) registerSlosTool(server, clients.slo, limits, readOnly, site);
-  if (enabled("synthetics")) registerSyntheticsTool(server, clients.synthetics, limits, readOnly, site);
+  if (enabled("synthetics"))
+    registerSyntheticsTool(server, clients.synthetics, limits, readOnly, site);
   if (enabled("hosts")) registerHostsTool(server, clients.hosts, limits, readOnly);
   if (enabled("downtimes")) registerDowntimesTool(server, clients.downtimes, limits, readOnly);
   if (enabled("rum")) registerRumTool(server, clients.rum, limits, site);
@@ -4500,8 +4815,9 @@ import { randomUUID } from "crypto";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
 var transports = {};
-async function connectHttp(server, config) {
+function createExpressApp(server, config) {
   const app = express();
+  app.disable("x-powered-by");
   app.use(express.json());
   app.get("/health", (_req, res) => {
     res.json({ status: "ok", name: config.name, version: config.version });
@@ -4554,6 +4870,10 @@ async function connectHttp(server, config) {
       res.status(400).json({ error: "Invalid session" });
     }
   });
+  return app;
+}
+async function connectHttp(server, config) {
+  const app = createExpressApp(server, config);
   app.listen(config.port, config.host, () => {
     console.error(`[MCP] Datadog MCP server running on http://${config.host}:${config.port}/mcp`);
     console.error(`[MCP] Health check available at http://${config.host}:${config.port}/health`);
@@ -4561,19 +4881,16 @@ async function connectHttp(server, config) {
 }
 
 // src/index.ts
-async function main() {
-  try {
-    const config = loadConfig();
-    const server = createServer(config);
-    if (config.server.transport === "http") {
-      await connectHttp(server, config.server);
-    } else {
-      await connectStdio(server);
-    }
-  } catch (error) {
-    console.error("[MCP] Failed to start server:", error);
-    process.exit(1);
+try {
+  const config = loadConfig();
+  const server = createServer(config);
+  if (config.server.transport === "http") {
+    await connectHttp(server, config.server);
+  } else {
+    await connectStdio(server);
   }
+} catch (error) {
+  console.error("[MCP] Failed to start server:", error);
+  process.exit(1);
 }
-main();
 //# sourceMappingURL=index.js.map