@usex/mikrotik-mcp 4.5.0 → 4.7.0

package/dist/cli.js

@@ -106,7 +106,7 @@ import {
   updateAaaEntity,
   updateSummaryLine,
   writeBackup
-} from "./shared/cli-hfhmh1qe.js";
+} from "./shared/cli-38m6waxx.js";
 
 // src/cli.ts
 import { existsSync as existsSync2 } from "fs";

package/dist/index.js

@@ -29,7 +29,7 @@ import {
   selectToolModules,
   setConfig,
   updateSummaryLine
-} from "./shared/library-399v2azd.js";
+} from "./shared/library-fs4nps73.js";
 // src/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";

package/dist/shared/{cli-hfhmh1qe.js → cli-38m6waxx.js}

@@ -8489,7 +8489,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./cli-6xcbh1kn.js");
+  const { moduleCatalog } = await import("./cli-jd7xqp2f.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -12247,22 +12247,51 @@ ${details}`;
 
 // src/tools/ip-address.ts
 import { z as z34 } from "zod";
+
+// src/utils/ip-overlap.ts
+function cidrsOverlap(a, b) {
+  return cidrContains(a, b) || cidrContains(b, a);
+}
+async function findAddressConflicts(basePath, address, ctx) {
+  const existing = await executeMikrotikCommand(`${basePath} print terse`, ctx);
+  const conflicts = [];
+  for (const line of existing.split(`
+`)) {
+    const addr = line.match(/address=([^\s]+)/)?.[1];
+    if (!addr)
+      continue;
+    if (cidrsOverlap(address, addr)) {
+      const iface = line.match(/interface=([^\s]+)/)?.[1] ?? "?";
+      conflicts.push(`${addr} on ${iface}`);
+    }
+  }
+  return conflicts;
+}
+
+// src/tools/ip-address.ts
 var ipAddressTools = [
   defineTool({
     name: "add_ip_address",
     title: "Add IPv4 Address to Interface",
     annotations: WRITE,
-    description: "Assigns an IPv4 address to an interface (`/ip address add`). Use this to add a CIDR" + " address (e.g. '192.168.1.1/24') as the router's own address on a network segment \u2014" + " sets the interface's local address, optional network, and broadcast. For IPv6 use" + " add_ipv6_address. Returns the full detail of the new address entry including its `.id`.",
+    description: "Assigns an IPv4 address to an interface (`/ip address add`). Use this to add a CIDR" + " address (e.g. '192.168.1.1/24') as the router's own address on a network segment \u2014" + " sets the interface's local address, optional network, and broadcast. For IPv6 use" + " add_ipv6_address. Before creating, this checks the existing `/ip address` list and" + " REFUSES to add an address that duplicates or overlaps an already-assigned subnet," + " returning the conflicting entries so you can pick a non-overlapping address. To" + " intentionally add an overlapping/secondary address, set `allow_overlap: true`." + " Returns the full detail of the new address entry including its `.id`.",
     inputSchema: {
       address: z34.string().describe("Address with CIDR, e.g. '192.168.1.1/24'"),
       interface: z34.string(),
       network: z34.string().optional(),
       broadcast: z34.string().optional(),
       comment: z34.string().optional(),
-      disabled: z34.boolean().default(false)
+      disabled: z34.boolean().default(false),
+      allow_overlap: z34.boolean().default(false).describe("Bypass the duplicate/overlap guard to add a secondary address in an existing subnet")
     },
     async handler(a, ctx) {
       ctx.info(`Adding IP address: address=${a.address}, interface=${a.interface}`);
+      if (!a.allow_overlap) {
+        const conflicts = await findAddressConflicts("/ip address", a.address, ctx);
+        if (conflicts.length > 0) {
+          return `Refused: ${a.address} duplicates or overlaps ${conflicts.length} existing` + ` address(es): ${conflicts.join(", ")}. Choose a non-overlapping address, or` + ` re-run with allow_overlap=true to add it intentionally.`;
+        }
+      }
       const cmd = new Cmd("/ip address add").set("address", a.address).set("interface", a.interface).opt("network", a.network).opt("broadcast", a.broadcast).opt("comment", a.comment).flag("disabled", a.disabled).build();
       const result = await executeMikrotikCommand(cmd, ctx);
       if (looksLikeError(result))
@@ -13000,7 +13029,7 @@ var ipv6AddressTools = [
     name: "add_ipv6_address",
     title: "Add IPv6 Address to Interface",
     annotations: WRITE,
-    description: "Assigns an IPv6 address to an interface (`/ipv6 address add`) \u2014 use this to give an interface a static or pool-derived IPv6 address and optionally advertise the prefix via Router Advertisements (ND). " + "For IPv4 address assignment use add_ip_address. For IPv6 routing entries (next-hop/gateway records) use add_ipv6_route. " + "Returns the created entry's full detail including its `.id`.\n\n" + `Notes:
+    description: "Assigns an IPv6 address to an interface (`/ipv6 address add`) \u2014 use this to give an interface a static or pool-derived IPv6 address and optionally advertise the prefix via Router Advertisements (ND). " + "For IPv4 address assignment use add_ip_address. For IPv6 routing entries (next-hop/gateway records) use add_ipv6_route. " + "Returns the created entry's full detail including its `.id`.\n\n" + "Before creating, this checks the existing `/ipv6 address` list and REFUSES to add an" + " address that duplicates or overlaps an already-assigned prefix, returning the" + " conflicting entries so you can pick a non-overlapping address. To intentionally add" + " an overlapping/secondary address set `allow_overlap: true`.\n\n" + `Notes:
 ` + `    address: IPv6 with prefix length, e.g. '2001:db8::1/64'. When from_pool
 ` + `        is set the host part may be omitted and is taken from the pool.
 ` + `    eui_64: derive the host part from the interface MAC (modified EUI-64).
@@ -13013,10 +13042,17 @@ var ipv6AddressTools = [
       from_pool: z40.string().optional().describe("IPv6 pool name to take the prefix from"),
       no_dad: z40.boolean().optional().describe("Skip Duplicate Address Detection for this address"),
       comment: z40.string().optional(),
-      disabled: z40.boolean().default(false)
+      disabled: z40.boolean().default(false),
+      allow_overlap: z40.boolean().default(false).describe("Bypass the duplicate/overlap guard to add a secondary address in an existing prefix")
     },
     async handler(a, ctx) {
       ctx.info(`Adding IPv6 address: address=${a.address}, interface=${a.interface}`);
+      if (!a.allow_overlap && !a.eui_64 && !a.from_pool) {
+        const conflicts = await findAddressConflicts("/ipv6 address", a.address, ctx);
+        if (conflicts.length > 0) {
+          return `Refused: ${a.address} duplicates or overlaps ${conflicts.length} existing` + ` address(es): ${conflicts.join(", ")}. Choose a non-overlapping address, or` + ` re-run with allow_overlap=true to add it intentionally.`;
+        }
+      }
       const cmd = new Cmd("/ipv6 address add").set("address", a.address).set("interface", a.interface).bool("advertise", a.advertise).bool("eui-64", a.eui_64).opt("from-pool", a.from_pool).bool("no-dad", a.no_dad).opt("comment", a.comment).flag("disabled", a.disabled).build();
       const result = await executeMikrotikCommand(cmd, ctx);
       if (looksLikeError(result))

package/dist/shared/{cli-6xcbh1kn.js → cli-jd7xqp2f.js}

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

package/dist/shared/{library-8hq0qqwm.js → library-31wz8hdh.js}

@@ -4,7 +4,7 @@ import {
   allToolModules,
   moduleCatalog,
   selectToolModules
-} from "./library-399v2azd.js";
+} from "./library-fs4nps73.js";
 export {
   selectToolModules,
   moduleCatalog,

package/dist/shared/{library-399v2azd.js → library-fs4nps73.js}

@@ -8298,7 +8298,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./library-8hq0qqwm.js");
+  const { moduleCatalog } = await import("./library-31wz8hdh.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -12056,22 +12056,51 @@ ${details}`;
 
 // src/tools/ip-address.ts
 import { z as z34 } from "zod";
+
+// src/utils/ip-overlap.ts
+function cidrsOverlap(a, b) {
+  return cidrContains(a, b) || cidrContains(b, a);
+}
+async function findAddressConflicts(basePath, address, ctx) {
+  const existing = await executeMikrotikCommand(`${basePath} print terse`, ctx);
+  const conflicts = [];
+  for (const line of existing.split(`
+`)) {
+    const addr = line.match(/address=([^\s]+)/)?.[1];
+    if (!addr)
+      continue;
+    if (cidrsOverlap(address, addr)) {
+      const iface = line.match(/interface=([^\s]+)/)?.[1] ?? "?";
+      conflicts.push(`${addr} on ${iface}`);
+    }
+  }
+  return conflicts;
+}
+
+// src/tools/ip-address.ts
 var ipAddressTools = [
   defineTool({
     name: "add_ip_address",
     title: "Add IPv4 Address to Interface",
     annotations: WRITE,
-    description: "Assigns an IPv4 address to an interface (`/ip address add`). Use this to add a CIDR" + " address (e.g. '192.168.1.1/24') as the router's own address on a network segment \u2014" + " sets the interface's local address, optional network, and broadcast. For IPv6 use" + " add_ipv6_address. Returns the full detail of the new address entry including its `.id`.",
+    description: "Assigns an IPv4 address to an interface (`/ip address add`). Use this to add a CIDR" + " address (e.g. '192.168.1.1/24') as the router's own address on a network segment \u2014" + " sets the interface's local address, optional network, and broadcast. For IPv6 use" + " add_ipv6_address. Before creating, this checks the existing `/ip address` list and" + " REFUSES to add an address that duplicates or overlaps an already-assigned subnet," + " returning the conflicting entries so you can pick a non-overlapping address. To" + " intentionally add an overlapping/secondary address, set `allow_overlap: true`." + " Returns the full detail of the new address entry including its `.id`.",
     inputSchema: {
       address: z34.string().describe("Address with CIDR, e.g. '192.168.1.1/24'"),
       interface: z34.string(),
       network: z34.string().optional(),
       broadcast: z34.string().optional(),
       comment: z34.string().optional(),
-      disabled: z34.boolean().default(false)
+      disabled: z34.boolean().default(false),
+      allow_overlap: z34.boolean().default(false).describe("Bypass the duplicate/overlap guard to add a secondary address in an existing subnet")
     },
     async handler(a, ctx) {
       ctx.info(`Adding IP address: address=${a.address}, interface=${a.interface}`);
+      if (!a.allow_overlap) {
+        const conflicts = await findAddressConflicts("/ip address", a.address, ctx);
+        if (conflicts.length > 0) {
+          return `Refused: ${a.address} duplicates or overlaps ${conflicts.length} existing` + ` address(es): ${conflicts.join(", ")}. Choose a non-overlapping address, or` + ` re-run with allow_overlap=true to add it intentionally.`;
+        }
+      }
       const cmd = new Cmd("/ip address add").set("address", a.address).set("interface", a.interface).opt("network", a.network).opt("broadcast", a.broadcast).opt("comment", a.comment).flag("disabled", a.disabled).build();
       const result = await executeMikrotikCommand(cmd, ctx);
       if (looksLikeError(result))
@@ -12809,7 +12838,7 @@ var ipv6AddressTools = [
     name: "add_ipv6_address",
     title: "Add IPv6 Address to Interface",
     annotations: WRITE,
-    description: "Assigns an IPv6 address to an interface (`/ipv6 address add`) \u2014 use this to give an interface a static or pool-derived IPv6 address and optionally advertise the prefix via Router Advertisements (ND). " + "For IPv4 address assignment use add_ip_address. For IPv6 routing entries (next-hop/gateway records) use add_ipv6_route. " + "Returns the created entry's full detail including its `.id`.\n\n" + `Notes:
+    description: "Assigns an IPv6 address to an interface (`/ipv6 address add`) \u2014 use this to give an interface a static or pool-derived IPv6 address and optionally advertise the prefix via Router Advertisements (ND). " + "For IPv4 address assignment use add_ip_address. For IPv6 routing entries (next-hop/gateway records) use add_ipv6_route. " + "Returns the created entry's full detail including its `.id`.\n\n" + "Before creating, this checks the existing `/ipv6 address` list and REFUSES to add an" + " address that duplicates or overlaps an already-assigned prefix, returning the" + " conflicting entries so you can pick a non-overlapping address. To intentionally add" + " an overlapping/secondary address set `allow_overlap: true`.\n\n" + `Notes:
 ` + `    address: IPv6 with prefix length, e.g. '2001:db8::1/64'. When from_pool
 ` + `        is set the host part may be omitted and is taken from the pool.
 ` + `    eui_64: derive the host part from the interface MAC (modified EUI-64).
@@ -12822,10 +12851,17 @@ var ipv6AddressTools = [
       from_pool: z40.string().optional().describe("IPv6 pool name to take the prefix from"),
       no_dad: z40.boolean().optional().describe("Skip Duplicate Address Detection for this address"),
       comment: z40.string().optional(),
-      disabled: z40.boolean().default(false)
+      disabled: z40.boolean().default(false),
+      allow_overlap: z40.boolean().default(false).describe("Bypass the duplicate/overlap guard to add a secondary address in an existing prefix")
     },
     async handler(a, ctx) {
       ctx.info(`Adding IPv6 address: address=${a.address}, interface=${a.interface}`);
+      if (!a.allow_overlap && !a.eui_64 && !a.from_pool) {
+        const conflicts = await findAddressConflicts("/ipv6 address", a.address, ctx);
+        if (conflicts.length > 0) {
+          return `Refused: ${a.address} duplicates or overlaps ${conflicts.length} existing` + ` address(es): ${conflicts.join(", ")}. Choose a non-overlapping address, or` + ` re-run with allow_overlap=true to add it intentionally.`;
+        }
+      }
       const cmd = new Cmd("/ipv6 address add").set("address", a.address).set("interface", a.interface).bool("advertise", a.advertise).bool("eui-64", a.eui_64).opt("from-pool", a.from_pool).bool("no-dad", a.no_dad).opt("comment", a.comment).flag("disabled", a.disabled).build();
       const result = await executeMikrotikCommand(cmd, ctx);
       if (looksLikeError(result))