@yawlabs/caddy-mcp 1.2.2 → 1.2.3

package/README.md

@@ -8,7 +8,7 @@
 
 Built and maintained by [Yaw Labs](https://yaw.sh).
 
-[![Add to mcp.hosting](https://mcp.hosting/install-button.svg)](https://mcp.hosting/install?name=Caddy&command=npx&args=-y%2C%40yawlabs%2Fcaddy-mcp&env=CADDY_ADMIN_URL%2CCADDY_API_TOKEN&description=Manage%20Caddy%20web%20servers%20-%20config%2C%20routes%2C%20TLS%2C%20PKI&source=https%3A%2F%2Fgithub.com%2FYawLabs%2Fcaddy-mcp)
+[![Add to mcp.hosting](https://mcp.hosting/install-button.svg)](https://mcp.hosting/install?name=Caddy&command=npx&args=-y%2C%40yawlabs%2Fcaddy-mcp&description=Manage%20Caddy%20web%20servers%20-%20config%2C%20routes%2C%20TLS%2C%20PKI&source=https%3A%2F%2Fgithub.com%2FYawLabs%2Fcaddy-mcp)
 
 One click adds this to your [mcp.hosting](https://mcp.hosting) account so it syncs to every MCP client you use. Or install manually below.
 

package/dist/index.js

@@ -60,11 +60,15 @@ function isTransientFailure(res) {
   if (res.status >= 500 && res.status <= 599) return true;
   return false;
 }
+function isRetryableMethod(method, path) {
+  if (method !== "POST") return true;
+  return !path.startsWith("/config/") && !path.startsWith("/id/");
+}
 async function caddyRequest(method, path, body, contentType, timeout) {
   const maxRetries = getMaxRetries();
   let attempt = 0;
   let res = await attemptRequest(method, path, body, contentType, timeout);
-  while (isTransientFailure(res) && attempt < maxRetries) {
+  while (isRetryableMethod(method, path) && isTransientFailure(res) && attempt < maxRetries) {
     attempt++;
     const backoff = Math.min(RETRY_BASE_MS * 2 ** (attempt - 1), RETRY_MAX_DELAY_MS);
     const delay = backoff + Math.random() * RETRY_MAX_JITTER_MS;
@@ -236,6 +240,179 @@ function getMetrics() {
   return caddyRequest("GET", "/metrics");
 }
 
+// src/tools/operational.ts
+import { z } from "zod";
+
+// src/format.ts
+function formatResult(res) {
+  if (!res.ok) {
+    return {
+      isError: true,
+      content: [{ type: "text", text: `Error: ${res.error || `HTTP ${res.status}`}` }]
+    };
+  }
+  const raw = res.data !== void 0 ? typeof res.data === "string" ? res.data : JSON.stringify(res.data, null, 2) : "";
+  const text = raw || "OK";
+  return { content: [{ type: "text", text }] };
+}
+
+// src/tools/operational.ts
+function describeServer(raw) {
+  const listen = Array.isArray(raw.listen) ? raw.listen : [];
+  const routes = Array.isArray(raw.routes) ? raw.routes : [];
+  const hasExplicitTls = !!raw.tls_connection_policies;
+  const listensHttps = listen.some((l) => typeof l === "string" && l.includes(":443"));
+  const tls = hasExplicitTls ? "enabled" : listensHttps ? "auto (HTTPS)" : "off (HTTP only)";
+  const listenStr = listen.length > 0 ? listen.map(String).join(", ") : "default";
+  return `${routes.length} route(s), listen: ${listenStr}, TLS: ${tls}`;
+}
+var METRICS_DEFAULT_MAX_LINES = 500;
+function metricNameFromLine(line) {
+  const trimmed = line.trimStart();
+  if (trimmed === "") return void 0;
+  if (trimmed.startsWith("#")) {
+    const m2 = trimmed.match(/^#\s+(?:HELP|TYPE)\s+([A-Za-z_:][A-Za-z0-9_:]*)/);
+    return m2 ? m2[1] : void 0;
+  }
+  const m = trimmed.match(/^([A-Za-z_:][A-Za-z0-9_:]*)/);
+  return m ? m[1] : void 0;
+}
+function applyMetricsControls(raw, filter, maxLines) {
+  const lines = raw.split("\n");
+  if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
+  let filtered;
+  if (filter && filter.length > 0) {
+    filtered = lines.filter((line) => {
+      if (line.trim() === "# EOF") return true;
+      const name = metricNameFromLine(line);
+      return name?.includes(filter) ?? false;
+    });
+  } else {
+    filtered = lines;
+  }
+  if (filtered.length <= maxLines) return filtered.join("\n");
+  const dropped = filtered.length - maxLines;
+  const kept = filtered.slice(0, maxLines);
+  kept.push(`# [truncated, ${dropped} lines omitted -- use filter to narrow]`);
+  const keptHasEof = kept.some((l) => l.trim() === "# EOF");
+  if (!keptHasEof && filtered.slice(maxLines).some((l) => l.trim() === "# EOF")) {
+    kept.push("# EOF");
+  }
+  return kept.join("\n");
+}
+function findAcmeEmail(policies) {
+  if (!Array.isArray(policies) || policies.length === 0) return void 0;
+  const rawPolicy = policies[0];
+  if (!rawPolicy || typeof rawPolicy !== "object" || Array.isArray(rawPolicy)) return void 0;
+  const policy = rawPolicy;
+  if (!Array.isArray(policy.issuers) || policy.issuers.length === 0) return void 0;
+  const rawIssuer = policy.issuers[0];
+  if (!rawIssuer || typeof rawIssuer !== "object" || Array.isArray(rawIssuer)) return void 0;
+  const issuer = rawIssuer;
+  return typeof issuer.email === "string" ? issuer.email : void 0;
+}
+function registerOperationalTools(server) {
+  server.tool(
+    "caddy_status",
+    "Check Caddy connectivity and get a config summary: servers, routes, listen addresses, and TLS status.",
+    {},
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async () => {
+      const res = await configGet();
+      if (!res.ok) return formatResult(res);
+      const config = res.data ?? {};
+      const servers = config.apps?.http?.servers ?? {};
+      const serverNames = Object.keys(servers);
+      const lines = ["Caddy is running", ""];
+      if (serverNames.length === 0) {
+        lines.push("No HTTP servers configured");
+      } else {
+        for (const name of serverNames) {
+          lines.push(`Server "${name}": ${describeServer(servers[name])}`);
+        }
+      }
+      const email = findAcmeEmail(config.apps?.tls?.automation?.policies);
+      if (email) lines.push(`
+ACME email: ${email}`);
+      return { content: [{ type: "text", text: lines.join("\n") }] };
+    }
+  );
+  server.tool(
+    "caddy_list_servers",
+    "List all configured HTTP servers with their names, listen addresses, route counts, and TLS status. Use this to discover server names before calling route tools.",
+    {},
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async () => {
+      const res = await configGet("apps/http/servers");
+      if (!res.ok) return formatResult(res);
+      const servers = res.data ?? {};
+      const names = Object.keys(servers);
+      if (names.length === 0) {
+        return { content: [{ type: "text", text: "No HTTP servers configured" }] };
+      }
+      const lines = names.map((name) => `  ${name}: ${describeServer(servers[name])}`);
+      return {
+        content: [{ type: "text", text: `HTTP Servers:
+${lines.join("\n")}` }]
+      };
+    }
+  );
+  server.tool(
+    "caddy_upstreams",
+    "Get the current health status of all reverse proxy upstreams. Shows address, active requests, and failure counts.",
+    {},
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async () => formatResult(await getUpstreams())
+  );
+  server.tool(
+    "caddy_pki",
+    "Get PKI certificate authority info or the CA certificate chain.",
+    {
+      ca: z.string().regex(/^[\w-]{1,128}$/).optional().default("local").describe("CA ID (default: 'local')"),
+      certificates: z.boolean().optional().default(false).describe("If true, return the full CA certificate chain")
+    },
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async ({ ca, certificates }) => {
+      const res = certificates ? await getPkiCertificates(ca) : await getPki(ca);
+      return formatResult(res);
+    }
+  );
+  server.tool(
+    "caddy_metrics",
+    "Get Prometheus metrics from Caddy. Shows request counts, durations, TLS handshake stats, active connections, and more. Output can be megabytes on busy servers -- use `filter` to keep only metrics whose name contains a substring (e.g. 'http_requests' or 'tls'); HELP/TYPE comment lines for retained metrics are kept. Filter-mode drops blank lines and free-form '# comment' lines (including '# EOF'); only '# HELP'/'# TYPE' lines for matching metrics are kept. Use `max_lines` to cap the response (default 500); a trailing comment reports how many lines were dropped.",
+    {
+      filter: z.string().optional().describe(
+        "Substring to match against metric names. Keeps sample lines whose metric name contains this substring, plus their `# HELP` and `# TYPE` comment lines. Empty/absent = no filtering. Label values are NOT matched -- use a Prometheus-aware client for label filtering."
+      ),
+      max_lines: z.number().int().positive().optional().describe("Maximum number of output lines (default 500). Excess lines are dropped and a summary is appended.")
+    },
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async ({ filter, max_lines }) => {
+      const res = await getMetrics();
+      if (!res.ok) return formatResult(res);
+      const raw = typeof res.data === "string" ? res.data : res.data !== void 0 ? String(res.data) : "";
+      const limit = max_lines ?? METRICS_DEFAULT_MAX_LINES;
+      const text = applyMetricsControls(raw, filter, limit);
+      return { content: [{ type: "text", text: text || "OK" }] };
+    }
+  );
+  server.tool(
+    "caddy_stop",
+    "Gracefully shut down the Caddy server. Requires confirm=true to prevent accidental shutdown.",
+    { confirm: z.boolean().describe("Must be true to confirm shutdown") },
+    { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    async ({ confirm }) => {
+      if (!confirm) {
+        return {
+          isError: true,
+          content: [{ type: "text", text: "Error: confirm must be true to shut down Caddy" }]
+        };
+      }
+      return formatResult(await stop());
+    }
+  );
+}
+
 // src/resources.ts
 function registerResources(server) {
   server.resource("caddy-config", "caddy://config", { description: "Current Caddy JSON configuration" }, async () => {
@@ -270,15 +447,29 @@ function registerResources(server) {
   server.resource(
     "caddy-metrics",
     "caddy://metrics",
-    { description: "Prometheus metrics (text exposition format)" },
+    {
+      description: "Prometheus metrics (text exposition format). Capped at the same default line count as the caddy_metrics tool -- on busy servers the raw body can be megabytes. Use the caddy_metrics tool for filtered or larger output."
+    },
     async () => {
       const res = await getMetrics();
+      if (!res.ok) {
+        return {
+          contents: [
+            {
+              uri: "caddy://metrics",
+              mimeType: "text/plain",
+              text: `Error: ${res.error}`
+            }
+          ]
+        };
+      }
+      const raw = typeof res.data === "string" ? res.data : res.data !== void 0 ? String(res.data) : "";
       return {
         contents: [
           {
             uri: "caddy://metrics",
             mimeType: "text/plain",
-            text: res.ok ? String(res.data ?? "") : `Error: ${res.error}`
+            text: applyMetricsControls(raw, void 0, METRICS_DEFAULT_MAX_LINES)
           }
         ]
       };
@@ -304,22 +495,7 @@ function registerResources(server) {
 }
 
 // src/tools/adapt.ts
-import { z } from "zod";
-
-// src/format.ts
-function formatResult(res) {
-  if (!res.ok) {
-    return {
-      isError: true,
-      content: [{ type: "text", text: `Error: ${res.error || `HTTP ${res.status}`}` }]
-    };
-  }
-  const raw = res.data !== void 0 ? typeof res.data === "string" ? res.data : JSON.stringify(res.data, null, 2) : "";
-  const text = raw || "OK";
-  return { content: [{ type: "text", text }] };
-}
-
-// src/tools/adapt.ts
+import { z as z2 } from "zod";
 function formatWarning(w) {
   if (!w || typeof w !== "object") return `  - unknown: ${JSON.stringify(w)}`;
   const obj = w;
@@ -332,8 +508,8 @@ function registerAdaptTools(server) {
     "caddy_adapt",
     "Convert a config in any registered adapter format to Caddy JSON without loading it. Useful for previewing what a Caddyfile produces, or for porting from nginx/yaml configs when Caddy is built with the matching adapter module ('caddyfile' is built-in; 'nginx', 'yaml', etc. require their adapter modules to be compiled into the Caddy binary). Returns the adapted JSON and any warnings separately.",
     {
-      config: z.string().describe("The raw config text (e.g., Caddyfile contents, nginx.conf, yaml)"),
-      adapter: z.string().regex(/^[a-z0-9_-]+$/i, "Adapter must be alphanumeric, hyphens, or underscores").max(64).optional().default("caddyfile").describe(
+      config: z2.string().describe("The raw config text (e.g., Caddyfile contents, nginx.conf, yaml)"),
+      adapter: z2.string().regex(/^[a-z0-9_-]+$/, "Adapter must be lowercase alphanumeric, hyphens, or underscores").max(64).optional().default("caddyfile").describe(
         "Config format adapter. Must match an adapter Caddy was built with. Built-in: 'caddyfile' (default). Common external adapters: 'nginx' (caddy-nginx-adapter), 'yaml' (caddy-yaml)."
       )
     },
@@ -360,7 +536,7 @@ ${warnLines.join("\n")}` });
 }
 
 // src/tools/config.ts
-import { z as z2 } from "zod";
+import { z as z3 } from "zod";
 
 // src/snapshots.ts
 var MAX_SNAPSHOTS = 10;
@@ -386,7 +562,7 @@ function registerConfigTools(server) {
   server.tool(
     "caddy_config_get",
     "Read Caddy config at any JSON path. Returns the full config when path is empty, or a subtree at a specific path (e.g., 'apps/http/servers/srv0/routes').",
-    { path: z2.string().optional().default("").describe("Config path (e.g., 'apps/http/servers/srv0')") },
+    { path: z3.string().optional().default("").describe("Config path (e.g., 'apps/http/servers/srv0')") },
     { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
     async ({ path }) => formatResult(await configGet(path))
   );
@@ -394,9 +570,9 @@ function registerConfigTools(server) {
     "caddy_config_set",
     "Write config at a JSON path. Mode 'overwrite' (default) replaces existing values (PATCH) \u2014 safe and idempotent. Mode 'append' adds to arrays or creates keys (POST) \u2014 NOT idempotent: calling twice with the same route duplicates it. Mode 'insert' places at a specific array index (PUT) \u2014 useful for route ordering.",
     {
-      path: z2.string().describe("Config path to write to (e.g., 'apps/http/servers/srv0/routes')"),
-      value: z2.any().describe("The JSON value to set at the path"),
-      mode: z2.enum(["append", "overwrite", "insert"]).optional().default("overwrite").describe(
+      path: z3.string().describe("Config path to write to (e.g., 'apps/http/servers/srv0/routes')"),
+      value: z3.any().describe("The JSON value to set at the path"),
+      mode: z3.enum(["append", "overwrite", "insert"]).optional().default("overwrite").describe(
         "'overwrite' = PATCH (replace existing, default, idempotent), 'append' = POST (add to arrays / create keys, NOT idempotent), 'insert' = PUT (insert at array index)"
       )
     },
@@ -409,7 +585,7 @@ function registerConfigTools(server) {
   server.tool(
     "caddy_config_delete",
     "Delete config at a JSON path. Removes the config node at the specified path.",
-    { path: z2.string().describe("Config path to delete (e.g., 'apps/http/servers/srv0/routes/0')") },
+    { path: z3.string().describe("Config path to delete (e.g., 'apps/http/servers/srv0/routes/0')") },
     { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false },
     async ({ path }) => formatResult(await configDelete(path))
   );
@@ -417,26 +593,27 @@ function registerConfigTools(server) {
     "caddy_load",
     "Replace the entire Caddy configuration atomically. Accepts a JSON config object, or a Caddyfile string with format='caddyfile'. This is the safest way to make large config changes. Has a 60-second timeout to allow for TLS provisioning.",
     {
-      config: z2.union([z2.record(z2.string(), z2.any()), z2.string()]).describe("Full config \u2014 JSON object or Caddyfile text string"),
-      format: z2.enum(["json", "caddyfile"]).optional().default("json").describe("Config format: 'json' (default) or 'caddyfile'")
+      config: z3.union([z3.record(z3.string(), z3.any()), z3.string()]).describe("Full config \u2014 JSON object or Caddyfile text string"),
+      format: z3.enum(["json", "caddyfile"]).optional().default("json").describe("Config format: 'json' (default) or 'caddyfile'")
     },
     { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false },
     async ({ config, format }) => {
       const contentType = format === "caddyfile" ? "text/caddyfile" : "application/json";
       const current = await configGet();
-      if (current.ok && isSnapshotableConfig(current.data)) {
+      const res = await loadConfig(config, contentType);
+      if (res.ok && current.ok && isSnapshotableConfig(current.data)) {
         saveSnapshot(current.data, "caddy_load");
       }
-      return formatResult(await loadConfig(config, contentType));
+      return formatResult(res);
     }
   );
   server.tool(
     "caddy_revert",
     "Manage config snapshots for rollback. Snapshots are auto-captured before caddy_load and kept in-memory (last 10). Actions: 'list' shows snapshots with timestamps, 'save' manually captures the current config, 'apply' restores a snapshot (requires confirm=true).",
     {
-      action: z2.enum(["list", "save", "apply"]).describe("Action to perform"),
-      index: z2.number().int().nonnegative().optional().default(0).describe("Snapshot index for 'apply' (0 = most recent, default)"),
-      confirm: z2.boolean().optional().default(false).describe("Must be true to actually apply a snapshot (safety)")
+      action: z3.enum(["list", "save", "apply"]).describe("Action to perform"),
+      index: z3.number().int().nonnegative().optional().default(0).describe("Snapshot index for 'apply' (0 = most recent, default)"),
+      confirm: z3.boolean().optional().default(false).describe("Must be true to actually apply a snapshot (safety)")
     },
     { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
     async ({ action, index, confirm }) => {
@@ -511,11 +688,11 @@ ${lines.join("\n")}` }] };
     "caddy_config_by_id",
     "Access config by @id tag. Any config object with an '@id' field can be read, updated, or deleted by its ID instead of needing its full path. This is the recommended way to manage individual routes and config objects.",
     {
-      id: z2.string().regex(/^[\w-]{1,128}$/).describe("The @id value of the config object"),
-      action: z2.enum(["get", "set", "delete"]).optional().default("get").describe("Action to perform"),
-      value: z2.any().optional().describe("New value (required for 'set' action)"),
-      subpath: z2.string().optional().default("").describe("Optional sub-path within the identified object"),
-      mode: z2.enum(["append", "overwrite", "insert"]).optional().default("overwrite").describe(
+      id: z3.string().regex(/^[\w-]{1,128}$/).describe("The @id value of the config object"),
+      action: z3.enum(["get", "set", "delete"]).optional().default("get").describe("Action to perform"),
+      value: z3.any().optional().describe("New value (required for 'set' action)"),
+      subpath: z3.string().optional().default("").describe("Optional sub-path within the identified object"),
+      mode: z3.enum(["append", "overwrite", "insert"]).optional().default("overwrite").describe(
         "For 'set' action: 'overwrite' = PATCH (replace existing, default), 'append' = POST (add to arrays, create on objects), 'insert' = PUT (insert at array index)"
       )
     },
@@ -542,172 +719,30 @@ ${lines.join("\n")}` }] };
   );
 }
 
-// src/tools/operational.ts
-import { z as z3 } from "zod";
-function describeServer(raw) {
-  const listen = Array.isArray(raw.listen) ? raw.listen : [];
-  const routes = Array.isArray(raw.routes) ? raw.routes : [];
-  const hasExplicitTls = !!raw.tls_connection_policies;
-  const listensHttps = listen.some((l) => typeof l === "string" && l.includes(":443"));
-  const tls = hasExplicitTls ? "enabled" : listensHttps ? "auto (HTTPS)" : "off (HTTP only)";
-  const listenStr = listen.length > 0 ? listen.map(String).join(", ") : "default";
-  return `${routes.length} route(s), listen: ${listenStr}, TLS: ${tls}`;
-}
-var METRICS_DEFAULT_MAX_LINES = 500;
-function metricNameFromLine(line) {
-  const trimmed = line.trimStart();
-  if (trimmed === "") return void 0;
-  if (trimmed.startsWith("#")) {
-    const m2 = trimmed.match(/^#\s+(?:HELP|TYPE)\s+([A-Za-z_:][A-Za-z0-9_:]*)/);
-    return m2 ? m2[1] : void 0;
-  }
-  const m = trimmed.match(/^([A-Za-z_:][A-Za-z0-9_:]*)/);
-  return m ? m[1] : void 0;
-}
-function applyMetricsControls(raw, filter, maxLines) {
-  const lines = raw.split("\n");
-  if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
-  let filtered;
-  if (filter && filter.length > 0) {
-    filtered = lines.filter((line) => {
-      if (line.trim() === "# EOF") return true;
-      const name = metricNameFromLine(line);
-      return name?.includes(filter) ?? false;
-    });
-  } else {
-    filtered = lines;
-  }
-  if (filtered.length <= maxLines) return filtered.join("\n");
-  const dropped = filtered.length - maxLines;
-  const kept = filtered.slice(0, maxLines);
-  kept.push(`# [truncated, ${dropped} lines omitted -- use filter to narrow]`);
-  return kept.join("\n");
-}
-function findAcmeEmail(policies) {
-  if (!Array.isArray(policies) || policies.length === 0) return void 0;
-  const rawPolicy = policies[0];
-  if (!rawPolicy || typeof rawPolicy !== "object" || Array.isArray(rawPolicy)) return void 0;
-  const policy = rawPolicy;
-  if (!Array.isArray(policy.issuers) || policy.issuers.length === 0) return void 0;
-  const rawIssuer = policy.issuers[0];
-  if (!rawIssuer || typeof rawIssuer !== "object" || Array.isArray(rawIssuer)) return void 0;
-  const issuer = rawIssuer;
-  return typeof issuer.email === "string" ? issuer.email : void 0;
-}
-function registerOperationalTools(server) {
-  server.tool(
-    "caddy_status",
-    "Check Caddy connectivity and get a config summary: servers, routes, listen addresses, and TLS status.",
-    {},
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async () => {
-      const res = await configGet();
-      if (!res.ok) return formatResult(res);
-      const config = res.data ?? {};
-      const servers = config.apps?.http?.servers ?? {};
-      const serverNames = Object.keys(servers);
-      const lines = ["Caddy is running", ""];
-      if (serverNames.length === 0) {
-        lines.push("No HTTP servers configured");
-      } else {
-        for (const name of serverNames) {
-          lines.push(`Server "${name}": ${describeServer(servers[name])}`);
-        }
-      }
-      const email = findAcmeEmail(config.apps?.tls?.automation?.policies);
-      if (email) lines.push(`
-ACME email: ${email}`);
-      return { content: [{ type: "text", text: lines.join("\n") }] };
-    }
-  );
-  server.tool(
-    "caddy_list_servers",
-    "List all configured HTTP servers with their names, listen addresses, route counts, and TLS status. Use this to discover server names before calling route tools.",
-    {},
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async () => {
-      const res = await configGet("apps/http/servers");
-      if (!res.ok) return formatResult(res);
-      const servers = res.data ?? {};
-      const names = Object.keys(servers);
-      if (names.length === 0) {
-        return { content: [{ type: "text", text: "No HTTP servers configured" }] };
-      }
-      const lines = names.map((name) => `  ${name}: ${describeServer(servers[name])}`);
-      return {
-        content: [{ type: "text", text: `HTTP Servers:
-${lines.join("\n")}` }]
-      };
-    }
-  );
-  server.tool(
-    "caddy_upstreams",
-    "Get the current health status of all reverse proxy upstreams. Shows address, active requests, and failure counts.",
-    {},
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async () => formatResult(await getUpstreams())
-  );
-  server.tool(
-    "caddy_pki",
-    "Get PKI certificate authority info or the CA certificate chain.",
-    {
-      ca: z3.string().regex(/^[\w-]{1,128}$/).optional().default("local").describe("CA ID (default: 'local')"),
-      certificates: z3.boolean().optional().default(false).describe("If true, return the full CA certificate chain")
-    },
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async ({ ca, certificates }) => {
-      const res = certificates ? await getPkiCertificates(ca) : await getPki(ca);
-      return formatResult(res);
-    }
-  );
-  server.tool(
-    "caddy_metrics",
-    "Get Prometheus metrics from Caddy. Shows request counts, durations, TLS handshake stats, active connections, and more. Output can be megabytes on busy servers -- use `filter` to keep only metrics whose name contains a substring (e.g. 'http_requests' or 'tls'); HELP/TYPE comment lines for retained metrics are kept. Filter-mode drops blank lines and free-form '# comment' lines (including '# EOF'); only '# HELP'/'# TYPE' lines for matching metrics are kept. Use `max_lines` to cap the response (default 500); a trailing comment reports how many lines were dropped.",
-    {
-      filter: z3.string().optional().describe(
-        "Substring to match against metric names. Keeps sample lines whose metric name contains this substring, plus their `# HELP` and `# TYPE` comment lines. Empty/absent = no filtering. Label values are NOT matched -- use a Prometheus-aware client for label filtering."
-      ),
-      max_lines: z3.number().int().positive().optional().describe("Maximum number of output lines (default 500). Excess lines are dropped and a summary is appended.")
-    },
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async ({ filter, max_lines }) => {
-      const res = await getMetrics();
-      if (!res.ok) return formatResult(res);
-      const raw = typeof res.data === "string" ? res.data : res.data !== void 0 ? String(res.data) : "";
-      const limit = max_lines ?? METRICS_DEFAULT_MAX_LINES;
-      const text = applyMetricsControls(raw, filter, limit);
-      return { content: [{ type: "text", text: text || "OK" }] };
-    }
-  );
-  server.tool(
-    "caddy_stop",
-    "Gracefully shut down the Caddy server. Requires confirm=true to prevent accidental shutdown.",
-    { confirm: z3.boolean().describe("Must be true to confirm shutdown") },
-    { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
-    async ({ confirm }) => {
-      if (!confirm) {
-        return {
-          isError: true,
-          content: [{ type: "text", text: "Error: confirm must be true to shut down Caddy" }]
-        };
-      }
-      return formatResult(await stop());
-    }
-  );
-}
-
 // src/tools/routes.ts
 import { z as z4 } from "zod";
 function safeJoin(value) {
   if (!Array.isArray(value)) return "";
   return value.filter((v) => v !== null && v !== void 0).map(String).join(",");
 }
+function stripPort(host) {
+  if (host.startsWith("[")) {
+    const closeIdx = host.indexOf("]");
+    if (closeIdx !== -1) return host.substring(0, closeIdx + 1);
+    return host;
+  }
+  const colonIdx = host.lastIndexOf(":");
+  if (colonIdx === -1) return host;
+  const portCandidate = host.substring(colonIdx + 1);
+  if (portCandidate.length === 0 || !/^\d+$/.test(portCandidate)) return host;
+  return host.substring(0, colonIdx);
+}
 function parseFrom(from) {
   const cleaned = from.replace(/^https?:\/\//, "");
   const match = {};
   const slashIdx = cleaned.indexOf("/");
   if (slashIdx > 0) {
-    match.host = [cleaned.substring(0, slashIdx)];
+    match.host = [stripPort(cleaned.substring(0, slashIdx))];
     const path = cleaned.substring(slashIdx);
     if (path !== "/") {
       match.path = [path];
@@ -715,7 +750,7 @@ function parseFrom(from) {
   } else if (cleaned.startsWith("/")) {
     match.path = [cleaned];
   } else {
-    match.host = [cleaned];
+    match.host = [stripPort(cleaned)];
   }
   return match;
 }

package/dist/server.js

@@ -58,11 +58,15 @@ function isTransientFailure(res) {
   if (res.status >= 500 && res.status <= 599) return true;
   return false;
 }
+function isRetryableMethod(method, path) {
+  if (method !== "POST") return true;
+  return !path.startsWith("/config/") && !path.startsWith("/id/");
+}
 async function caddyRequest(method, path, body, contentType, timeout) {
   const maxRetries = getMaxRetries();
   let attempt = 0;
   let res = await attemptRequest(method, path, body, contentType, timeout);
-  while (isTransientFailure(res) && attempt < maxRetries) {
+  while (isRetryableMethod(method, path) && isTransientFailure(res) && attempt < maxRetries) {
     attempt++;
     const backoff = Math.min(RETRY_BASE_MS * 2 ** (attempt - 1), RETRY_MAX_DELAY_MS);
     const delay = backoff + Math.random() * RETRY_MAX_JITTER_MS;
@@ -234,6 +238,179 @@ function getMetrics() {
   return caddyRequest("GET", "/metrics");
 }
 
+// src/tools/operational.ts
+import { z } from "zod";
+
+// src/format.ts
+function formatResult(res) {
+  if (!res.ok) {
+    return {
+      isError: true,
+      content: [{ type: "text", text: `Error: ${res.error || `HTTP ${res.status}`}` }]
+    };
+  }
+  const raw = res.data !== void 0 ? typeof res.data === "string" ? res.data : JSON.stringify(res.data, null, 2) : "";
+  const text = raw || "OK";
+  return { content: [{ type: "text", text }] };
+}
+
+// src/tools/operational.ts
+function describeServer(raw) {
+  const listen = Array.isArray(raw.listen) ? raw.listen : [];
+  const routes = Array.isArray(raw.routes) ? raw.routes : [];
+  const hasExplicitTls = !!raw.tls_connection_policies;
+  const listensHttps = listen.some((l) => typeof l === "string" && l.includes(":443"));
+  const tls = hasExplicitTls ? "enabled" : listensHttps ? "auto (HTTPS)" : "off (HTTP only)";
+  const listenStr = listen.length > 0 ? listen.map(String).join(", ") : "default";
+  return `${routes.length} route(s), listen: ${listenStr}, TLS: ${tls}`;
+}
+var METRICS_DEFAULT_MAX_LINES = 500;
+function metricNameFromLine(line) {
+  const trimmed = line.trimStart();
+  if (trimmed === "") return void 0;
+  if (trimmed.startsWith("#")) {
+    const m2 = trimmed.match(/^#\s+(?:HELP|TYPE)\s+([A-Za-z_:][A-Za-z0-9_:]*)/);
+    return m2 ? m2[1] : void 0;
+  }
+  const m = trimmed.match(/^([A-Za-z_:][A-Za-z0-9_:]*)/);
+  return m ? m[1] : void 0;
+}
+function applyMetricsControls(raw, filter, maxLines) {
+  const lines = raw.split("\n");
+  if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
+  let filtered;
+  if (filter && filter.length > 0) {
+    filtered = lines.filter((line) => {
+      if (line.trim() === "# EOF") return true;
+      const name = metricNameFromLine(line);
+      return name?.includes(filter) ?? false;
+    });
+  } else {
+    filtered = lines;
+  }
+  if (filtered.length <= maxLines) return filtered.join("\n");
+  const dropped = filtered.length - maxLines;
+  const kept = filtered.slice(0, maxLines);
+  kept.push(`# [truncated, ${dropped} lines omitted -- use filter to narrow]`);
+  const keptHasEof = kept.some((l) => l.trim() === "# EOF");
+  if (!keptHasEof && filtered.slice(maxLines).some((l) => l.trim() === "# EOF")) {
+    kept.push("# EOF");
+  }
+  return kept.join("\n");
+}
+function findAcmeEmail(policies) {
+  if (!Array.isArray(policies) || policies.length === 0) return void 0;
+  const rawPolicy = policies[0];
+  if (!rawPolicy || typeof rawPolicy !== "object" || Array.isArray(rawPolicy)) return void 0;
+  const policy = rawPolicy;
+  if (!Array.isArray(policy.issuers) || policy.issuers.length === 0) return void 0;
+  const rawIssuer = policy.issuers[0];
+  if (!rawIssuer || typeof rawIssuer !== "object" || Array.isArray(rawIssuer)) return void 0;
+  const issuer = rawIssuer;
+  return typeof issuer.email === "string" ? issuer.email : void 0;
+}
+function registerOperationalTools(server) {
+  server.tool(
+    "caddy_status",
+    "Check Caddy connectivity and get a config summary: servers, routes, listen addresses, and TLS status.",
+    {},
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async () => {
+      const res = await configGet();
+      if (!res.ok) return formatResult(res);
+      const config = res.data ?? {};
+      const servers = config.apps?.http?.servers ?? {};
+      const serverNames = Object.keys(servers);
+      const lines = ["Caddy is running", ""];
+      if (serverNames.length === 0) {
+        lines.push("No HTTP servers configured");
+      } else {
+        for (const name of serverNames) {
+          lines.push(`Server "${name}": ${describeServer(servers[name])}`);
+        }
+      }
+      const email = findAcmeEmail(config.apps?.tls?.automation?.policies);
+      if (email) lines.push(`
+ACME email: ${email}`);
+      return { content: [{ type: "text", text: lines.join("\n") }] };
+    }
+  );
+  server.tool(
+    "caddy_list_servers",
+    "List all configured HTTP servers with their names, listen addresses, route counts, and TLS status. Use this to discover server names before calling route tools.",
+    {},
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async () => {
+      const res = await configGet("apps/http/servers");
+      if (!res.ok) return formatResult(res);
+      const servers = res.data ?? {};
+      const names = Object.keys(servers);
+      if (names.length === 0) {
+        return { content: [{ type: "text", text: "No HTTP servers configured" }] };
+      }
+      const lines = names.map((name) => `  ${name}: ${describeServer(servers[name])}`);
+      return {
+        content: [{ type: "text", text: `HTTP Servers:
+${lines.join("\n")}` }]
+      };
+    }
+  );
+  server.tool(
+    "caddy_upstreams",
+    "Get the current health status of all reverse proxy upstreams. Shows address, active requests, and failure counts.",
+    {},
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async () => formatResult(await getUpstreams())
+  );
+  server.tool(
+    "caddy_pki",
+    "Get PKI certificate authority info or the CA certificate chain.",
+    {
+      ca: z.string().regex(/^[\w-]{1,128}$/).optional().default("local").describe("CA ID (default: 'local')"),
+      certificates: z.boolean().optional().default(false).describe("If true, return the full CA certificate chain")
+    },
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async ({ ca, certificates }) => {
+      const res = certificates ? await getPkiCertificates(ca) : await getPki(ca);
+      return formatResult(res);
+    }
+  );
+  server.tool(
+    "caddy_metrics",
+    "Get Prometheus metrics from Caddy. Shows request counts, durations, TLS handshake stats, active connections, and more. Output can be megabytes on busy servers -- use `filter` to keep only metrics whose name contains a substring (e.g. 'http_requests' or 'tls'); HELP/TYPE comment lines for retained metrics are kept. Filter-mode drops blank lines and free-form '# comment' lines (including '# EOF'); only '# HELP'/'# TYPE' lines for matching metrics are kept. Use `max_lines` to cap the response (default 500); a trailing comment reports how many lines were dropped.",
+    {
+      filter: z.string().optional().describe(
+        "Substring to match against metric names. Keeps sample lines whose metric name contains this substring, plus their `# HELP` and `# TYPE` comment lines. Empty/absent = no filtering. Label values are NOT matched -- use a Prometheus-aware client for label filtering."
+      ),
+      max_lines: z.number().int().positive().optional().describe("Maximum number of output lines (default 500). Excess lines are dropped and a summary is appended.")
+    },
+    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+    async ({ filter, max_lines }) => {
+      const res = await getMetrics();
+      if (!res.ok) return formatResult(res);
+      const raw = typeof res.data === "string" ? res.data : res.data !== void 0 ? String(res.data) : "";
+      const limit = max_lines ?? METRICS_DEFAULT_MAX_LINES;
+      const text = applyMetricsControls(raw, filter, limit);
+      return { content: [{ type: "text", text: text || "OK" }] };
+    }
+  );
+  server.tool(
+    "caddy_stop",
+    "Gracefully shut down the Caddy server. Requires confirm=true to prevent accidental shutdown.",
+    { confirm: z.boolean().describe("Must be true to confirm shutdown") },
+    { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
+    async ({ confirm }) => {
+      if (!confirm) {
+        return {
+          isError: true,
+          content: [{ type: "text", text: "Error: confirm must be true to shut down Caddy" }]
+        };
+      }
+      return formatResult(await stop());
+    }
+  );
+}
+
 // src/resources.ts
 function registerResources(server) {
   server.resource("caddy-config", "caddy://config", { description: "Current Caddy JSON configuration" }, async () => {
@@ -268,15 +445,29 @@ function registerResources(server) {
   server.resource(
     "caddy-metrics",
     "caddy://metrics",
-    { description: "Prometheus metrics (text exposition format)" },
+    {
+      description: "Prometheus metrics (text exposition format). Capped at the same default line count as the caddy_metrics tool -- on busy servers the raw body can be megabytes. Use the caddy_metrics tool for filtered or larger output."
+    },
     async () => {
       const res = await getMetrics();
+      if (!res.ok) {
+        return {
+          contents: [
+            {
+              uri: "caddy://metrics",
+              mimeType: "text/plain",
+              text: `Error: ${res.error}`
+            }
+          ]
+        };
+      }
+      const raw = typeof res.data === "string" ? res.data : res.data !== void 0 ? String(res.data) : "";
       return {
         contents: [
           {
             uri: "caddy://metrics",
             mimeType: "text/plain",
-            text: res.ok ? String(res.data ?? "") : `Error: ${res.error}`
+            text: applyMetricsControls(raw, void 0, METRICS_DEFAULT_MAX_LINES)
           }
         ]
       };
@@ -302,22 +493,7 @@ function registerResources(server) {
 }
 
 // src/tools/adapt.ts
-import { z } from "zod";
-
-// src/format.ts
-function formatResult(res) {
-  if (!res.ok) {
-    return {
-      isError: true,
-      content: [{ type: "text", text: `Error: ${res.error || `HTTP ${res.status}`}` }]
-    };
-  }
-  const raw = res.data !== void 0 ? typeof res.data === "string" ? res.data : JSON.stringify(res.data, null, 2) : "";
-  const text = raw || "OK";
-  return { content: [{ type: "text", text }] };
-}
-
-// src/tools/adapt.ts
+import { z as z2 } from "zod";
 function formatWarning(w) {
   if (!w || typeof w !== "object") return `  - unknown: ${JSON.stringify(w)}`;
   const obj = w;
@@ -330,8 +506,8 @@ function registerAdaptTools(server) {
     "caddy_adapt",
     "Convert a config in any registered adapter format to Caddy JSON without loading it. Useful for previewing what a Caddyfile produces, or for porting from nginx/yaml configs when Caddy is built with the matching adapter module ('caddyfile' is built-in; 'nginx', 'yaml', etc. require their adapter modules to be compiled into the Caddy binary). Returns the adapted JSON and any warnings separately.",
     {
-      config: z.string().describe("The raw config text (e.g., Caddyfile contents, nginx.conf, yaml)"),
-      adapter: z.string().regex(/^[a-z0-9_-]+$/i, "Adapter must be alphanumeric, hyphens, or underscores").max(64).optional().default("caddyfile").describe(
+      config: z2.string().describe("The raw config text (e.g., Caddyfile contents, nginx.conf, yaml)"),
+      adapter: z2.string().regex(/^[a-z0-9_-]+$/, "Adapter must be lowercase alphanumeric, hyphens, or underscores").max(64).optional().default("caddyfile").describe(
         "Config format adapter. Must match an adapter Caddy was built with. Built-in: 'caddyfile' (default). Common external adapters: 'nginx' (caddy-nginx-adapter), 'yaml' (caddy-yaml)."
       )
     },
@@ -358,7 +534,7 @@ ${warnLines.join("\n")}` });
 }
 
 // src/tools/config.ts
-import { z as z2 } from "zod";
+import { z as z3 } from "zod";
 
 // src/snapshots.ts
 var MAX_SNAPSHOTS = 10;
@@ -384,7 +560,7 @@ function registerConfigTools(server) {
   server.tool(
     "caddy_config_get",
     "Read Caddy config at any JSON path. Returns the full config when path is empty, or a subtree at a specific path (e.g., 'apps/http/servers/srv0/routes').",
-    { path: z2.string().optional().default("").describe("Config path (e.g., 'apps/http/servers/srv0')") },
+    { path: z3.string().optional().default("").describe("Config path (e.g., 'apps/http/servers/srv0')") },
     { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
     async ({ path }) => formatResult(await configGet(path))
   );
@@ -392,9 +568,9 @@ function registerConfigTools(server) {
     "caddy_config_set",
     "Write config at a JSON path. Mode 'overwrite' (default) replaces existing values (PATCH) \u2014 safe and idempotent. Mode 'append' adds to arrays or creates keys (POST) \u2014 NOT idempotent: calling twice with the same route duplicates it. Mode 'insert' places at a specific array index (PUT) \u2014 useful for route ordering.",
     {
-      path: z2.string().describe("Config path to write to (e.g., 'apps/http/servers/srv0/routes')"),
-      value: z2.any().describe("The JSON value to set at the path"),
-      mode: z2.enum(["append", "overwrite", "insert"]).optional().default("overwrite").describe(
+      path: z3.string().describe("Config path to write to (e.g., 'apps/http/servers/srv0/routes')"),
+      value: z3.any().describe("The JSON value to set at the path"),
+      mode: z3.enum(["append", "overwrite", "insert"]).optional().default("overwrite").describe(
         "'overwrite' = PATCH (replace existing, default, idempotent), 'append' = POST (add to arrays / create keys, NOT idempotent), 'insert' = PUT (insert at array index)"
       )
     },
@@ -407,7 +583,7 @@ function registerConfigTools(server) {
   server.tool(
     "caddy_config_delete",
     "Delete config at a JSON path. Removes the config node at the specified path.",
-    { path: z2.string().describe("Config path to delete (e.g., 'apps/http/servers/srv0/routes/0')") },
+    { path: z3.string().describe("Config path to delete (e.g., 'apps/http/servers/srv0/routes/0')") },
     { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false },
     async ({ path }) => formatResult(await configDelete(path))
   );
@@ -415,26 +591,27 @@ function registerConfigTools(server) {
     "caddy_load",
     "Replace the entire Caddy configuration atomically. Accepts a JSON config object, or a Caddyfile string with format='caddyfile'. This is the safest way to make large config changes. Has a 60-second timeout to allow for TLS provisioning.",
     {
-      config: z2.union([z2.record(z2.string(), z2.any()), z2.string()]).describe("Full config \u2014 JSON object or Caddyfile text string"),
-      format: z2.enum(["json", "caddyfile"]).optional().default("json").describe("Config format: 'json' (default) or 'caddyfile'")
+      config: z3.union([z3.record(z3.string(), z3.any()), z3.string()]).describe("Full config \u2014 JSON object or Caddyfile text string"),
+      format: z3.enum(["json", "caddyfile"]).optional().default("json").describe("Config format: 'json' (default) or 'caddyfile'")
     },
     { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false },
     async ({ config, format }) => {
       const contentType = format === "caddyfile" ? "text/caddyfile" : "application/json";
       const current = await configGet();
-      if (current.ok && isSnapshotableConfig(current.data)) {
+      const res = await loadConfig(config, contentType);
+      if (res.ok && current.ok && isSnapshotableConfig(current.data)) {
         saveSnapshot(current.data, "caddy_load");
       }
-      return formatResult(await loadConfig(config, contentType));
+      return formatResult(res);
     }
   );
   server.tool(
     "caddy_revert",
     "Manage config snapshots for rollback. Snapshots are auto-captured before caddy_load and kept in-memory (last 10). Actions: 'list' shows snapshots with timestamps, 'save' manually captures the current config, 'apply' restores a snapshot (requires confirm=true).",
     {
-      action: z2.enum(["list", "save", "apply"]).describe("Action to perform"),
-      index: z2.number().int().nonnegative().optional().default(0).describe("Snapshot index for 'apply' (0 = most recent, default)"),
-      confirm: z2.boolean().optional().default(false).describe("Must be true to actually apply a snapshot (safety)")
+      action: z3.enum(["list", "save", "apply"]).describe("Action to perform"),
+      index: z3.number().int().nonnegative().optional().default(0).describe("Snapshot index for 'apply' (0 = most recent, default)"),
+      confirm: z3.boolean().optional().default(false).describe("Must be true to actually apply a snapshot (safety)")
     },
     { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
     async ({ action, index, confirm }) => {
@@ -509,11 +686,11 @@ ${lines.join("\n")}` }] };
     "caddy_config_by_id",
     "Access config by @id tag. Any config object with an '@id' field can be read, updated, or deleted by its ID instead of needing its full path. This is the recommended way to manage individual routes and config objects.",
     {
-      id: z2.string().regex(/^[\w-]{1,128}$/).describe("The @id value of the config object"),
-      action: z2.enum(["get", "set", "delete"]).optional().default("get").describe("Action to perform"),
-      value: z2.any().optional().describe("New value (required for 'set' action)"),
-      subpath: z2.string().optional().default("").describe("Optional sub-path within the identified object"),
-      mode: z2.enum(["append", "overwrite", "insert"]).optional().default("overwrite").describe(
+      id: z3.string().regex(/^[\w-]{1,128}$/).describe("The @id value of the config object"),
+      action: z3.enum(["get", "set", "delete"]).optional().default("get").describe("Action to perform"),
+      value: z3.any().optional().describe("New value (required for 'set' action)"),
+      subpath: z3.string().optional().default("").describe("Optional sub-path within the identified object"),
+      mode: z3.enum(["append", "overwrite", "insert"]).optional().default("overwrite").describe(
         "For 'set' action: 'overwrite' = PATCH (replace existing, default), 'append' = POST (add to arrays, create on objects), 'insert' = PUT (insert at array index)"
       )
     },
@@ -540,172 +717,30 @@ ${lines.join("\n")}` }] };
   );
 }
 
-// src/tools/operational.ts
-import { z as z3 } from "zod";
-function describeServer(raw) {
-  const listen = Array.isArray(raw.listen) ? raw.listen : [];
-  const routes = Array.isArray(raw.routes) ? raw.routes : [];
-  const hasExplicitTls = !!raw.tls_connection_policies;
-  const listensHttps = listen.some((l) => typeof l === "string" && l.includes(":443"));
-  const tls = hasExplicitTls ? "enabled" : listensHttps ? "auto (HTTPS)" : "off (HTTP only)";
-  const listenStr = listen.length > 0 ? listen.map(String).join(", ") : "default";
-  return `${routes.length} route(s), listen: ${listenStr}, TLS: ${tls}`;
-}
-var METRICS_DEFAULT_MAX_LINES = 500;
-function metricNameFromLine(line) {
-  const trimmed = line.trimStart();
-  if (trimmed === "") return void 0;
-  if (trimmed.startsWith("#")) {
-    const m2 = trimmed.match(/^#\s+(?:HELP|TYPE)\s+([A-Za-z_:][A-Za-z0-9_:]*)/);
-    return m2 ? m2[1] : void 0;
-  }
-  const m = trimmed.match(/^([A-Za-z_:][A-Za-z0-9_:]*)/);
-  return m ? m[1] : void 0;
-}
-function applyMetricsControls(raw, filter, maxLines) {
-  const lines = raw.split("\n");
-  if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
-  let filtered;
-  if (filter && filter.length > 0) {
-    filtered = lines.filter((line) => {
-      if (line.trim() === "# EOF") return true;
-      const name = metricNameFromLine(line);
-      return name?.includes(filter) ?? false;
-    });
-  } else {
-    filtered = lines;
-  }
-  if (filtered.length <= maxLines) return filtered.join("\n");
-  const dropped = filtered.length - maxLines;
-  const kept = filtered.slice(0, maxLines);
-  kept.push(`# [truncated, ${dropped} lines omitted -- use filter to narrow]`);
-  return kept.join("\n");
-}
-function findAcmeEmail(policies) {
-  if (!Array.isArray(policies) || policies.length === 0) return void 0;
-  const rawPolicy = policies[0];
-  if (!rawPolicy || typeof rawPolicy !== "object" || Array.isArray(rawPolicy)) return void 0;
-  const policy = rawPolicy;
-  if (!Array.isArray(policy.issuers) || policy.issuers.length === 0) return void 0;
-  const rawIssuer = policy.issuers[0];
-  if (!rawIssuer || typeof rawIssuer !== "object" || Array.isArray(rawIssuer)) return void 0;
-  const issuer = rawIssuer;
-  return typeof issuer.email === "string" ? issuer.email : void 0;
-}
-function registerOperationalTools(server) {
-  server.tool(
-    "caddy_status",
-    "Check Caddy connectivity and get a config summary: servers, routes, listen addresses, and TLS status.",
-    {},
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async () => {
-      const res = await configGet();
-      if (!res.ok) return formatResult(res);
-      const config = res.data ?? {};
-      const servers = config.apps?.http?.servers ?? {};
-      const serverNames = Object.keys(servers);
-      const lines = ["Caddy is running", ""];
-      if (serverNames.length === 0) {
-        lines.push("No HTTP servers configured");
-      } else {
-        for (const name of serverNames) {
-          lines.push(`Server "${name}": ${describeServer(servers[name])}`);
-        }
-      }
-      const email = findAcmeEmail(config.apps?.tls?.automation?.policies);
-      if (email) lines.push(`
-ACME email: ${email}`);
-      return { content: [{ type: "text", text: lines.join("\n") }] };
-    }
-  );
-  server.tool(
-    "caddy_list_servers",
-    "List all configured HTTP servers with their names, listen addresses, route counts, and TLS status. Use this to discover server names before calling route tools.",
-    {},
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async () => {
-      const res = await configGet("apps/http/servers");
-      if (!res.ok) return formatResult(res);
-      const servers = res.data ?? {};
-      const names = Object.keys(servers);
-      if (names.length === 0) {
-        return { content: [{ type: "text", text: "No HTTP servers configured" }] };
-      }
-      const lines = names.map((name) => `  ${name}: ${describeServer(servers[name])}`);
-      return {
-        content: [{ type: "text", text: `HTTP Servers:
-${lines.join("\n")}` }]
-      };
-    }
-  );
-  server.tool(
-    "caddy_upstreams",
-    "Get the current health status of all reverse proxy upstreams. Shows address, active requests, and failure counts.",
-    {},
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async () => formatResult(await getUpstreams())
-  );
-  server.tool(
-    "caddy_pki",
-    "Get PKI certificate authority info or the CA certificate chain.",
-    {
-      ca: z3.string().regex(/^[\w-]{1,128}$/).optional().default("local").describe("CA ID (default: 'local')"),
-      certificates: z3.boolean().optional().default(false).describe("If true, return the full CA certificate chain")
-    },
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async ({ ca, certificates }) => {
-      const res = certificates ? await getPkiCertificates(ca) : await getPki(ca);
-      return formatResult(res);
-    }
-  );
-  server.tool(
-    "caddy_metrics",
-    "Get Prometheus metrics from Caddy. Shows request counts, durations, TLS handshake stats, active connections, and more. Output can be megabytes on busy servers -- use `filter` to keep only metrics whose name contains a substring (e.g. 'http_requests' or 'tls'); HELP/TYPE comment lines for retained metrics are kept. Filter-mode drops blank lines and free-form '# comment' lines (including '# EOF'); only '# HELP'/'# TYPE' lines for matching metrics are kept. Use `max_lines` to cap the response (default 500); a trailing comment reports how many lines were dropped.",
-    {
-      filter: z3.string().optional().describe(
-        "Substring to match against metric names. Keeps sample lines whose metric name contains this substring, plus their `# HELP` and `# TYPE` comment lines. Empty/absent = no filtering. Label values are NOT matched -- use a Prometheus-aware client for label filtering."
-      ),
-      max_lines: z3.number().int().positive().optional().describe("Maximum number of output lines (default 500). Excess lines are dropped and a summary is appended.")
-    },
-    { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
-    async ({ filter, max_lines }) => {
-      const res = await getMetrics();
-      if (!res.ok) return formatResult(res);
-      const raw = typeof res.data === "string" ? res.data : res.data !== void 0 ? String(res.data) : "";
-      const limit = max_lines ?? METRICS_DEFAULT_MAX_LINES;
-      const text = applyMetricsControls(raw, filter, limit);
-      return { content: [{ type: "text", text: text || "OK" }] };
-    }
-  );
-  server.tool(
-    "caddy_stop",
-    "Gracefully shut down the Caddy server. Requires confirm=true to prevent accidental shutdown.",
-    { confirm: z3.boolean().describe("Must be true to confirm shutdown") },
-    { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: false },
-    async ({ confirm }) => {
-      if (!confirm) {
-        return {
-          isError: true,
-          content: [{ type: "text", text: "Error: confirm must be true to shut down Caddy" }]
-        };
-      }
-      return formatResult(await stop());
-    }
-  );
-}
-
 // src/tools/routes.ts
 import { z as z4 } from "zod";
 function safeJoin(value) {
   if (!Array.isArray(value)) return "";
   return value.filter((v) => v !== null && v !== void 0).map(String).join(",");
 }
+function stripPort(host) {
+  if (host.startsWith("[")) {
+    const closeIdx = host.indexOf("]");
+    if (closeIdx !== -1) return host.substring(0, closeIdx + 1);
+    return host;
+  }
+  const colonIdx = host.lastIndexOf(":");
+  if (colonIdx === -1) return host;
+  const portCandidate = host.substring(colonIdx + 1);
+  if (portCandidate.length === 0 || !/^\d+$/.test(portCandidate)) return host;
+  return host.substring(0, colonIdx);
+}
 function parseFrom(from) {
   const cleaned = from.replace(/^https?:\/\//, "");
   const match = {};
   const slashIdx = cleaned.indexOf("/");
   if (slashIdx > 0) {
-    match.host = [cleaned.substring(0, slashIdx)];
+    match.host = [stripPort(cleaned.substring(0, slashIdx))];
     const path = cleaned.substring(slashIdx);
     if (path !== "/") {
       match.path = [path];
@@ -713,7 +748,7 @@ function parseFrom(from) {
   } else if (cleaned.startsWith("/")) {
     match.path = [cleaned];
   } else {
-    match.host = [cleaned];
+    match.host = [stripPort(cleaned)];
   }
   return match;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/caddy-mcp",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "MCP server for managing Caddy web servers via the admin API",
   "license": "MIT",
   "author": "Yaw Labs <contact@yaw.sh> (https://yaw.sh)",