@usex/mikrotik-mcp 3.40.0 → 3.42.0

package/dist/cli.js

@@ -84,7 +84,7 @@ import {
   toggleAaaEntity,
   updateAaaEntity,
   writeBackup
-} from "./shared/cli-jsf7zy89.js";
+} from "./shared/cli-sq4trv31.js";
 
 // src/cli.ts
 import { existsSync as existsSync2 } from "fs";
@@ -2242,7 +2242,7 @@ function registerPrompts(server) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.40.0",
+  version: "3.42.0",
   description: "MCP server for MikroTik RouterOS \u2014 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   keywords: [
     "ai",

package/dist/index.js

@@ -21,7 +21,7 @@ import {
   resolveDeviceName,
   selectToolModules,
   setConfig
-} from "./shared/library-0x8fc0rw.js";
+} from "./shared/library-5cjmn0n7.js";
 // src/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
@@ -131,7 +131,7 @@ function registerPrompts(server) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.40.0",
+  version: "3.42.0",
   description: "MCP server for MikroTik RouterOS \u2014 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   keywords: [
     "ai",

package/dist/shared/{cli-28w9b076.js → cli-rptenaf7.js}

@@ -4,7 +4,7 @@ import {
   allToolModules,
   moduleCatalog,
   selectToolModules
-} from "./cli-jsf7zy89.js";
+} from "./cli-sq4trv31.js";
 export {
   selectToolModules,
   moduleCatalog,

package/dist/shared/{cli-jsf7zy89.js → cli-sq4trv31.js}

@@ -6141,7 +6141,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./cli-28w9b076.js");
+  const { moduleCatalog } = await import("./cli-rptenaf7.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -18147,21 +18147,34 @@ ${result}`;
     name: "check_route_path",
     title: "Check IPv4 Route Path",
     annotations: READ,
-    description: "Resolves which nexthop RouterOS would use for a given IPv4 destination (`/ip route check`) " + '\u2014 answers "which gateway will this packet take?" without sending any traffic. ' + "Optionally scoped by `source` address and `routing_mark` for policy-routing table lookups. " + "For listing all known routes use list_routes; for a named-table view use get_routing_table. " + "Returns the resolved nexthop and interface detail.",
+    description: "Resolves which nexthop RouterOS would use for a given IPv4 destination " + '\u2014 answers "which gateway will this packet take?" without sending any traffic. ' + "Version-aware: uses `/ip route check` on v6, falls back to " + "`/ip route print where dst-address in <dest> active=yes` on v7+ where the check " + "command was removed. Optionally scoped by `routing_table` (v7) / `routing_mark` (v6) " + "for policy-routing table lookups. " + "For listing all known routes use list_routes; for a named-table view use get_routing_table. " + "Returns the resolved nexthop and interface detail.",
     inputSchema: {
       destination: z83.string(),
-      source: z83.string().optional(),
-      routing_mark: z83.string().optional()
+      routing_table: z83.string().optional().describe('Policy-routing table name (v7) or routing-mark (v6), e.g. "VPN"')
     },
     async handler(a, ctx) {
       ctx.info(`Checking route path to: ${a.destination}`);
-      const cmd = new Cmd(`/ip route check ${a.destination}`).opt("src-address", a.source).opt("routing-mark", a.routing_mark).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
-      if (!result)
-        return `Unable to check route to ${a.destination}`;
+      const table = a.routing_table;
+      const v6Cmd = new Cmd(`/ip route check ${a.destination}`).opt("routing-mark", table).build();
+      const v6Result = await executeMikrotikCommand(v6Cmd, ctx);
+      if (!commandUnsupported(v6Result) && !looksLikeError(v6Result) && !isEmpty(v6Result)) {
+        return `ROUTE PATH TO ${a.destination}:
+
+${v6Result}`;
+      }
+      const where = [`dst-address in ${a.destination}`, "active=yes"];
+      if (table)
+        where.push(`routing-table=${quoteValue(table)}`);
+      const v7Cmd = `/ip route print detail where ${where.join(" ")}`;
+      const v7Result = await executeMikrotikCommand(v7Cmd, ctx);
+      if (looksLikeError(v7Result))
+        return `Failed to check route to ${a.destination}: ${v7Result}`;
+      if (isEmpty(v7Result)) {
+        return `No active route to ${a.destination}${table ? ` in table '${table}'` : ""}.`;
+      }
       return `ROUTE PATH TO ${a.destination}:
 
-${result}`;
+${v7Result}`;
     }
   }),
   defineTool({
@@ -20650,7 +20663,7 @@ var drDrillTools = [
     name: "run_failover_drill",
     title: "Run Failover DR Drill",
     annotations: DANGEROUS,
-    description: "Rehearses a disaster safely: INSIDE SAFE MODE it disables a target (a WAN/tunnel interface, or " + "a route), pings `verify_host` to check the backup path actually carries traffic, then ROLLS " + "BACK \u2014 Safe Mode auto-reverts, so the change is never committed. Proves your failover works " + "without a real outage. Requires `confirm=true` to run (it briefly disrupts traffic on the " + "target); with confirm=false it just describes the drill. SSH-only (Safe Mode is unavailable on " + "MAC-Telnet). Returns whether connectivity held during the simulated failure.",
+    description: "Rehearses a disaster: disables a target (a WAN/tunnel interface, or a route), pings " + "`verify_host` to check the backup path actually carries traffic, then RE-ENABLES the target. " + "Prefers Safe Mode (auto-revert on disconnect) but falls back to direct commands when Safe " + "Mode is unavailable. Proves your failover works without a real outage. Requires `confirm=true` " + "to run (it briefly disrupts traffic on the target); with confirm=false it just describes the " + "drill. Returns whether connectivity held during the simulated failure.",
     inputSchema: {
       target_type: z98.enum(["interface", "route"]).default("interface"),
       target: z98.string().describe("Interface name (e.g. 'ether1-wan') or, for route, a find expression / .id"),
@@ -20659,37 +20672,66 @@ var drDrillTools = [
       confirm: z98.boolean().default(false).describe("Must be true to actually run the drill")
     },
     async handler(a, ctx) {
-      const disableCmd = a.target_type === "interface" ? `/interface disable "${a.target}"` : `/ip route disable [find ${a.target.startsWith("*") ? `.id=${a.target}` : a.target}]`;
+      const findExpr = a.target.startsWith("*") ? `.id=${a.target}` : a.target;
+      const disableCmd = a.target_type === "interface" ? `/interface disable "${a.target}"` : `/ip route disable [find ${findExpr}]`;
+      const enableCmd = a.target_type === "interface" ? `/interface enable "${a.target}"` : `/ip route enable [find ${findExpr}]`;
+      const pingCmd = `/ping address=${a.verify_host} count=${a.ping_count}`;
       if (!a.confirm) {
-        return `DRY RUN \u2014 would, inside Safe Mode: (1) ${disableCmd}; (2) /ping address=${a.verify_host} count=${a.ping_count}; (3) roll back (auto-revert). Set confirm=true to run the drill.`;
+        return `DRY RUN \u2014 would: (1) ${disableCmd}; (2) ${pingCmd}; (3) re-enable. ` + "Set confirm=true to run the drill.";
       }
       const device = resolveDeviceName(ctx.device);
-      if (getDevice(device).mac) {
-        return "DR Drill needs Safe Mode, which is SSH-only \u2014 this device is reached over MAC-Telnet.";
+      const isMac = !!getDevice(device).mac;
+      let usedSafeMode = false;
+      if (!isMac) {
+        const mgr = getSafeModeManager(device);
+        try {
+          const en = await mgr.enable();
+          if (!en.startsWith("Error")) {
+            usedSafeMode = true;
+            try {
+              const disableOut2 = await mgr.execute(disableCmd);
+              if (/no such item|failure:|syntax error/i.test(disableOut2)) {
+                return `Could not disable target '${a.target}': ${disableOut2.trim()} (Safe Mode rolled back).`;
+              }
+              const pingOut = await mgr.execute(pingCmd);
+              return formatResult(a, pingOut, "The change has been rolled back (Safe Mode); nothing was committed.");
+            } finally {
+              await mgr.rollback();
+            }
+          }
+        } catch {
+          try {
+            await mgr.rollback();
+          } catch {}
+        }
+      }
+      if (!usedSafeMode) {
+        ctx.info("Safe Mode unavailable \u2014 using direct disable/enable fallback");
+      }
+      const disableOut = await executeMikrotikCommand(disableCmd, ctx);
+      if (looksLikeError(disableOut) || /no such item/i.test(disableOut)) {
+        return `Could not disable target '${a.target}': ${disableOut.trim()}`;
       }
-      const mgr = getSafeModeManager(device);
-      const en = await mgr.enable();
-      if (en.startsWith("Error"))
-        return `Could not enter Safe Mode: ${en}`;
       try {
-        const disableOut = await mgr.execute(disableCmd);
-        if (/no such item|failure:|syntax error/i.test(disableOut)) {
-          return `Could not disable target '${a.target}': ${disableOut.trim()} (Safe Mode rolled back).`;
-        }
-        const pingOut = await mgr.execute(`/ping address=${a.verify_host} count=${a.ping_count}`);
-        const summary = parsePingSummary(pingOut);
-        const held = summary != null && summary.received > 0;
-        const detail = summary ? `${summary.received}/${summary.sent} replies (${summary.lossPct}% loss)` : "could not parse ping result";
-        const verdict = held ? "\u2705 Backup path HELD \u2014 failover works." : "\u26D4 NO connectivity during the outage \u2014 failover did NOT carry traffic.";
-        return `DR DRILL \u2014 disabled ${a.target_type} '${a.target}', pinged ${a.verify_host}: ${detail}.
-${verdict}
-The change has been rolled back (Safe Mode); nothing was committed.`;
+        const pingOut = await executeMikrotikCommand(pingCmd, ctx, {
+          maxMs: (a.ping_count + 2) * 1500
+        });
+        return formatResult(a, pingOut, "The target has been re-enabled (direct command); the drill is complete.");
       } finally {
-        await mgr.rollback();
+        await executeMikrotikCommand(enableCmd, ctx);
       }
     }
   })
 ];
+function formatResult(a, pingOut, footer) {
+  const summary = parsePingSummary(pingOut);
+  const held = summary != null && summary.received > 0;
+  const detail = summary ? `${summary.received}/${summary.sent} replies (${summary.lossPct}% loss)` : "could not parse ping result";
+  const verdict = held ? "PASS \u2014 Backup path HELD, failover works." : "FAIL \u2014 NO connectivity during the outage, failover did NOT carry traffic.";
+  return `DR DRILL \u2014 disabled ${a.target_type} '${a.target}', pinged ${a.verify_host}: ${detail}.
+${verdict}
+${footer}`;
+}
 
 // src/tools/safe-mode.ts
 var safeModeTools = [

package/dist/shared/{library-0x8fc0rw.js → library-5cjmn0n7.js}

@@ -6117,7 +6117,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./library-ke4kdmyj.js");
+  const { moduleCatalog } = await import("./library-z22txcv0.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -18123,21 +18123,34 @@ ${result}`;
     name: "check_route_path",
     title: "Check IPv4 Route Path",
     annotations: READ,
-    description: "Resolves which nexthop RouterOS would use for a given IPv4 destination (`/ip route check`) " + '\u2014 answers "which gateway will this packet take?" without sending any traffic. ' + "Optionally scoped by `source` address and `routing_mark` for policy-routing table lookups. " + "For listing all known routes use list_routes; for a named-table view use get_routing_table. " + "Returns the resolved nexthop and interface detail.",
+    description: "Resolves which nexthop RouterOS would use for a given IPv4 destination " + '\u2014 answers "which gateway will this packet take?" without sending any traffic. ' + "Version-aware: uses `/ip route check` on v6, falls back to " + "`/ip route print where dst-address in <dest> active=yes` on v7+ where the check " + "command was removed. Optionally scoped by `routing_table` (v7) / `routing_mark` (v6) " + "for policy-routing table lookups. " + "For listing all known routes use list_routes; for a named-table view use get_routing_table. " + "Returns the resolved nexthop and interface detail.",
     inputSchema: {
       destination: z83.string(),
-      source: z83.string().optional(),
-      routing_mark: z83.string().optional()
+      routing_table: z83.string().optional().describe('Policy-routing table name (v7) or routing-mark (v6), e.g. "VPN"')
     },
     async handler(a, ctx) {
       ctx.info(`Checking route path to: ${a.destination}`);
-      const cmd = new Cmd(`/ip route check ${a.destination}`).opt("src-address", a.source).opt("routing-mark", a.routing_mark).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
-      if (!result)
-        return `Unable to check route to ${a.destination}`;
+      const table = a.routing_table;
+      const v6Cmd = new Cmd(`/ip route check ${a.destination}`).opt("routing-mark", table).build();
+      const v6Result = await executeMikrotikCommand(v6Cmd, ctx);
+      if (!commandUnsupported(v6Result) && !looksLikeError(v6Result) && !isEmpty(v6Result)) {
+        return `ROUTE PATH TO ${a.destination}:
+
+${v6Result}`;
+      }
+      const where = [`dst-address in ${a.destination}`, "active=yes"];
+      if (table)
+        where.push(`routing-table=${quoteValue(table)}`);
+      const v7Cmd = `/ip route print detail where ${where.join(" ")}`;
+      const v7Result = await executeMikrotikCommand(v7Cmd, ctx);
+      if (looksLikeError(v7Result))
+        return `Failed to check route to ${a.destination}: ${v7Result}`;
+      if (isEmpty(v7Result)) {
+        return `No active route to ${a.destination}${table ? ` in table '${table}'` : ""}.`;
+      }
       return `ROUTE PATH TO ${a.destination}:
 
-${result}`;
+${v7Result}`;
     }
   }),
   defineTool({
@@ -20626,7 +20639,7 @@ var drDrillTools = [
     name: "run_failover_drill",
     title: "Run Failover DR Drill",
     annotations: DANGEROUS,
-    description: "Rehearses a disaster safely: INSIDE SAFE MODE it disables a target (a WAN/tunnel interface, or " + "a route), pings `verify_host` to check the backup path actually carries traffic, then ROLLS " + "BACK \u2014 Safe Mode auto-reverts, so the change is never committed. Proves your failover works " + "without a real outage. Requires `confirm=true` to run (it briefly disrupts traffic on the " + "target); with confirm=false it just describes the drill. SSH-only (Safe Mode is unavailable on " + "MAC-Telnet). Returns whether connectivity held during the simulated failure.",
+    description: "Rehearses a disaster: disables a target (a WAN/tunnel interface, or a route), pings " + "`verify_host` to check the backup path actually carries traffic, then RE-ENABLES the target. " + "Prefers Safe Mode (auto-revert on disconnect) but falls back to direct commands when Safe " + "Mode is unavailable. Proves your failover works without a real outage. Requires `confirm=true` " + "to run (it briefly disrupts traffic on the target); with confirm=false it just describes the " + "drill. Returns whether connectivity held during the simulated failure.",
     inputSchema: {
       target_type: z98.enum(["interface", "route"]).default("interface"),
       target: z98.string().describe("Interface name (e.g. 'ether1-wan') or, for route, a find expression / .id"),
@@ -20635,37 +20648,66 @@ var drDrillTools = [
       confirm: z98.boolean().default(false).describe("Must be true to actually run the drill")
     },
     async handler(a, ctx) {
-      const disableCmd = a.target_type === "interface" ? `/interface disable "${a.target}"` : `/ip route disable [find ${a.target.startsWith("*") ? `.id=${a.target}` : a.target}]`;
+      const findExpr = a.target.startsWith("*") ? `.id=${a.target}` : a.target;
+      const disableCmd = a.target_type === "interface" ? `/interface disable "${a.target}"` : `/ip route disable [find ${findExpr}]`;
+      const enableCmd = a.target_type === "interface" ? `/interface enable "${a.target}"` : `/ip route enable [find ${findExpr}]`;
+      const pingCmd = `/ping address=${a.verify_host} count=${a.ping_count}`;
       if (!a.confirm) {
-        return `DRY RUN \u2014 would, inside Safe Mode: (1) ${disableCmd}; (2) /ping address=${a.verify_host} count=${a.ping_count}; (3) roll back (auto-revert). Set confirm=true to run the drill.`;
+        return `DRY RUN \u2014 would: (1) ${disableCmd}; (2) ${pingCmd}; (3) re-enable. ` + "Set confirm=true to run the drill.";
       }
       const device = resolveDeviceName(ctx.device);
-      if (getDevice(device).mac) {
-        return "DR Drill needs Safe Mode, which is SSH-only \u2014 this device is reached over MAC-Telnet.";
+      const isMac = !!getDevice(device).mac;
+      let usedSafeMode = false;
+      if (!isMac) {
+        const mgr = getSafeModeManager(device);
+        try {
+          const en = await mgr.enable();
+          if (!en.startsWith("Error")) {
+            usedSafeMode = true;
+            try {
+              const disableOut2 = await mgr.execute(disableCmd);
+              if (/no such item|failure:|syntax error/i.test(disableOut2)) {
+                return `Could not disable target '${a.target}': ${disableOut2.trim()} (Safe Mode rolled back).`;
+              }
+              const pingOut = await mgr.execute(pingCmd);
+              return formatResult(a, pingOut, "The change has been rolled back (Safe Mode); nothing was committed.");
+            } finally {
+              await mgr.rollback();
+            }
+          }
+        } catch {
+          try {
+            await mgr.rollback();
+          } catch {}
+        }
+      }
+      if (!usedSafeMode) {
+        ctx.info("Safe Mode unavailable \u2014 using direct disable/enable fallback");
+      }
+      const disableOut = await executeMikrotikCommand(disableCmd, ctx);
+      if (looksLikeError(disableOut) || /no such item/i.test(disableOut)) {
+        return `Could not disable target '${a.target}': ${disableOut.trim()}`;
       }
-      const mgr = getSafeModeManager(device);
-      const en = await mgr.enable();
-      if (en.startsWith("Error"))
-        return `Could not enter Safe Mode: ${en}`;
       try {
-        const disableOut = await mgr.execute(disableCmd);
-        if (/no such item|failure:|syntax error/i.test(disableOut)) {
-          return `Could not disable target '${a.target}': ${disableOut.trim()} (Safe Mode rolled back).`;
-        }
-        const pingOut = await mgr.execute(`/ping address=${a.verify_host} count=${a.ping_count}`);
-        const summary = parsePingSummary(pingOut);
-        const held = summary != null && summary.received > 0;
-        const detail = summary ? `${summary.received}/${summary.sent} replies (${summary.lossPct}% loss)` : "could not parse ping result";
-        const verdict = held ? "\u2705 Backup path HELD \u2014 failover works." : "\u26D4 NO connectivity during the outage \u2014 failover did NOT carry traffic.";
-        return `DR DRILL \u2014 disabled ${a.target_type} '${a.target}', pinged ${a.verify_host}: ${detail}.
-${verdict}
-The change has been rolled back (Safe Mode); nothing was committed.`;
+        const pingOut = await executeMikrotikCommand(pingCmd, ctx, {
+          maxMs: (a.ping_count + 2) * 1500
+        });
+        return formatResult(a, pingOut, "The target has been re-enabled (direct command); the drill is complete.");
       } finally {
-        await mgr.rollback();
+        await executeMikrotikCommand(enableCmd, ctx);
       }
     }
   })
 ];
+function formatResult(a, pingOut, footer) {
+  const summary = parsePingSummary(pingOut);
+  const held = summary != null && summary.received > 0;
+  const detail = summary ? `${summary.received}/${summary.sent} replies (${summary.lossPct}% loss)` : "could not parse ping result";
+  const verdict = held ? "PASS \u2014 Backup path HELD, failover works." : "FAIL \u2014 NO connectivity during the outage, failover did NOT carry traffic.";
+  return `DR DRILL \u2014 disabled ${a.target_type} '${a.target}', pinged ${a.verify_host}: ${detail}.
+${verdict}
+${footer}`;
+}
 
 // src/tools/safe-mode.ts
 var safeModeTools = [

package/dist/shared/{library-ke4kdmyj.js → library-z22txcv0.js}

@@ -4,7 +4,7 @@ import {
   allToolModules,
   moduleCatalog,
   selectToolModules
-} from "./library-0x8fc0rw.js";
+} from "./library-5cjmn0n7.js";
 export {
   selectToolModules,
   moduleCatalog,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usex/mikrotik-mcp",
-  "version": "3.40.0",
+  "version": "3.42.0",
   "description": "MCP server for MikroTik RouterOS — 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   "keywords": [
     "ai",