@usex/mikrotik-mcp 3.59.0 → 3.60.0

package/dist/cli.js

@@ -106,7 +106,7 @@ import {
   updateAaaEntity,
   updateSummaryLine,
   writeBackup
-} from "./shared/cli-jq168zrj.js";
+} from "./shared/cli-ghatyv7e.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-21t1cncr.js";
+} from "./shared/library-7j22z9a8.js";
 // src/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";

package/dist/shared/{cli-2dyvnv9v.js → cli-7yjsmkwg.js}

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

package/dist/shared/{cli-jq168zrj.js → cli-ghatyv7e.js}

@@ -8208,7 +8208,7 @@ var rawCommandTools = [
       if (!cmd)
         return "Provide a RouterOS command to run.";
       ctx.info(`Running raw RouterOS command: ${cmd}`);
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = await executeMikrotikCommand(cmd, ctx, { maxMs: 30000 });
       if (looksLikeError(result))
         return `RouterOS command error: ${result}`;
       return result.trim() ? result : "(command completed with no output)";
@@ -8330,7 +8330,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./cli-2dyvnv9v.js");
+  const { moduleCatalog } = await import("./cli-7yjsmkwg.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -10527,7 +10527,30 @@ ${results.join(`
 
 // src/tools/firewall-nat.ts
 import { z as z29 } from "zod";
+
+// src/tools/_resolve-rule-id.ts
+function ruleResolver(scope) {
+  return async function resolveRuleId(ruleId, ctx) {
+    if (/^\d+$/.test(ruleId)) {
+      const id = `*${ruleId}`;
+      const byId = await executeMikrotikCommand(`${scope} print count-only where .id=${id}`, ctx);
+      if (byId.trim() !== "0")
+        return id;
+      const idsRaw = await executeMikrotikCommand(`:foreach i in=[${scope} find] do={:put $i}`, ctx);
+      if (isEmpty(idsRaw))
+        return null;
+      const ids = idsRaw.trim().split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+      const pos = Number.parseInt(ruleId, 10);
+      return pos >= 0 && pos < ids.length ? ids[pos] : null;
+    }
+    const count = await executeMikrotikCommand(`${scope} print count-only where .id=${ruleId}`, ctx);
+    return count.trim() !== "0" ? ruleId : null;
+  };
+}
+
+// src/tools/firewall-nat.ts
 var isDigits2 = (s) => /^\d+$/.test(s);
+var resolveNatRuleId = ruleResolver("/ip firewall nat");
 async function updateNatRule(a, ctx) {
   ctx.info(`Updating NAT rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -10603,11 +10626,14 @@ async function updateNatRule(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ip firewall nat set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveNatRuleId(a.rule_id, ctx);
+  if (!id)
+    return `NAT rule '${a.rule_id}' not found.`;
+  const cmd = `/ip firewall nat set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update NAT rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ip firewall nat print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ip firewall nat print detail where .id=${id}`, ctx);
   return `NAT rule updated successfully:
 
 ${details}`;
@@ -10785,8 +10811,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting NAT rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ip firewall nat print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `NAT rule with ID '${a.rule_id}' not found.` : `NAT RULE DETAILS:
+      const id = await resolveNatRuleId(a.rule_id, ctx);
+      if (!id)
+        return `NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall nat print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `NAT rule '${a.rule_id}' not found.` : `NAT RULE DETAILS:
 
 ${result}`;
     }
@@ -10868,13 +10897,13 @@ ${result}`;
     inputSchema: { rule_id: z29.string() },
     async handler(a, ctx) {
       ctx.info(`Removing NAT rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ip firewall nat print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `NAT rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ip firewall nat remove ${a.rule_id}`, ctx);
+      const id = await resolveNatRuleId(a.rule_id, ctx);
+      if (!id)
+        return `NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall nat remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove NAT rule: ${result}`;
-      return `NAT rule with ID '${a.rule_id}' removed successfully.`;
+      return `NAT rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -10888,13 +10917,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving NAT rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ip firewall nat print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `NAT rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ip firewall nat move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveNatRuleId(a.rule_id, ctx);
+      if (!id)
+        return `NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall nat move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move NAT rule: ${result}`;
-      return `NAT rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `NAT rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -10922,6 +10951,7 @@ ${result}`;
 // src/tools/firewall-mangle.ts
 import { z as z30 } from "zod";
 var isDigits3 = (s) => /^\d+$/.test(s);
+var resolveMangleRuleId = ruleResolver("/ip firewall mangle");
 async function updateMangleRule(a, ctx) {
   ctx.info(`Updating mangle rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -11007,11 +11037,14 @@ async function updateMangleRule(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ip firewall mangle set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveMangleRuleId(a.rule_id, ctx);
+  if (!id)
+    return `Mangle rule '${a.rule_id}' not found.`;
+  const cmd = `/ip firewall mangle set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update mangle rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ip firewall mangle print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ip firewall mangle print detail where .id=${id}`, ctx);
   return `Mangle rule updated successfully:
 
 ${details}`;
@@ -11186,8 +11219,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting mangle rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ip firewall mangle print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `Mangle rule with ID '${a.rule_id}' not found.` : `MANGLE RULE DETAILS:
+      const id = await resolveMangleRuleId(a.rule_id, ctx);
+      if (!id)
+        return `Mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall mangle print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `Mangle rule '${a.rule_id}' not found.` : `MANGLE RULE DETAILS:
 
 ${result}`;
     }
@@ -11278,13 +11314,13 @@ ${result}`;
     inputSchema: { rule_id: z30.string() },
     async handler(a, ctx) {
       ctx.info(`Removing mangle rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ip firewall mangle print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `Mangle rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ip firewall mangle remove ${a.rule_id}`, ctx);
+      const id = await resolveMangleRuleId(a.rule_id, ctx);
+      if (!id)
+        return `Mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall mangle remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove mangle rule: ${result}`;
-      return `Mangle rule with ID '${a.rule_id}' removed successfully.`;
+      return `Mangle rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -11298,13 +11334,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving mangle rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ip firewall mangle print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `Mangle rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ip firewall mangle move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveMangleRuleId(a.rule_id, ctx);
+      if (!id)
+        return `Mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall mangle move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move mangle rule: ${result}`;
-      return `Mangle rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `Mangle rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -13440,6 +13476,7 @@ ${result}`;
 // src/tools/ipv6-firewall-filter.ts
 import { z as z44 } from "zod";
 var isDigits4 = (s) => /^\d+$/.test(s);
+var resolveRuleId = ruleResolver("/ipv6 firewall filter");
 async function updateFilterRule2(a, ctx) {
   ctx.info(`Updating IPv6 firewall filter rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -13508,11 +13545,14 @@ async function updateFilterRule2(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ipv6 firewall filter set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveRuleId(a.rule_id, ctx);
+  if (!id)
+    return `IPv6 firewall filter rule '${a.rule_id}' not found.`;
+  const cmd = `/ipv6 firewall filter set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update IPv6 firewall filter rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ipv6 firewall filter print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ipv6 firewall filter print detail where .id=${id}`, ctx);
   return `IPv6 firewall filter rule updated successfully:
 
 ${details}`;
@@ -13669,8 +13709,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting IPv6 firewall filter rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ipv6 firewall filter print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `IPv6 firewall filter rule with ID '${a.rule_id}' not found.` : `IPV6 FIREWALL FILTER RULE DETAILS:
+      const id = await resolveRuleId(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall filter rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall filter print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `IPv6 firewall filter rule '${a.rule_id}' not found.` : `IPV6 FIREWALL FILTER RULE DETAILS:
 
 ${result}`;
     }
@@ -13746,13 +13789,13 @@ ${result}`;
     inputSchema: { rule_id: z44.string() },
     async handler(a, ctx) {
       ctx.info(`Removing IPv6 firewall filter rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall filter print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall filter rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall filter remove ${a.rule_id}`, ctx);
+      const id = await resolveRuleId(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall filter rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall filter remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove IPv6 firewall filter rule: ${result}`;
-      return `IPv6 firewall filter rule with ID '${a.rule_id}' removed successfully.`;
+      return `IPv6 firewall filter rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -13766,13 +13809,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving IPv6 firewall filter rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall filter print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall filter rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall filter move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveRuleId(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall filter rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall filter move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move IPv6 firewall filter rule: ${result}`;
-      return `IPv6 firewall filter rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `IPv6 firewall filter rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -13800,6 +13843,7 @@ ${result}`;
 // src/tools/ipv6-firewall-nat.ts
 import { z as z45 } from "zod";
 var isDigits5 = (s) => /^\d+$/.test(s);
+var resolveRuleId2 = ruleResolver("/ipv6 firewall nat");
 async function updateNatRule2(a, ctx) {
   ctx.info(`Updating IPv6 firewall NAT rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -13867,11 +13911,14 @@ async function updateNatRule2(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ipv6 firewall nat set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveRuleId2(a.rule_id, ctx);
+  if (!id)
+    return `IPv6 NAT rule '${a.rule_id}' not found.`;
+  const cmd = `/ipv6 firewall nat set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update IPv6 firewall NAT rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ipv6 firewall nat print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ipv6 firewall nat print detail where .id=${id}`, ctx);
   return `IPv6 firewall NAT rule updated successfully:
 
 ${details}`;
@@ -14022,8 +14069,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting IPv6 firewall NAT rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ipv6 firewall nat print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `IPv6 firewall NAT rule with ID '${a.rule_id}' not found.` : `IPV6 FIREWALL NAT RULE DETAILS:
+      const id = await resolveRuleId2(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall nat print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `IPv6 firewall NAT rule '${a.rule_id}' not found.` : `IPV6 FIREWALL NAT RULE DETAILS:
 
 ${result}`;
     }
@@ -14098,13 +14148,13 @@ ${result}`;
     inputSchema: { rule_id: z45.string() },
     async handler(a, ctx) {
       ctx.info(`Removing IPv6 firewall NAT rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall nat print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall NAT rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall nat remove ${a.rule_id}`, ctx);
+      const id = await resolveRuleId2(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall nat remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove IPv6 firewall NAT rule: ${result}`;
-      return `IPv6 firewall NAT rule with ID '${a.rule_id}' removed successfully.`;
+      return `IPv6 firewall NAT rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -14118,13 +14168,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving IPv6 firewall NAT rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall nat print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall NAT rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall nat move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveRuleId2(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall nat move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move IPv6 firewall NAT rule: ${result}`;
-      return `IPv6 firewall NAT rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `IPv6 firewall NAT rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -14152,6 +14202,7 @@ ${result}`;
 // src/tools/ipv6-firewall-mangle.ts
 import { z as z46 } from "zod";
 var isDigits6 = (s) => /^\d+$/.test(s);
+var resolveRuleId3 = ruleResolver("/ipv6 firewall mangle");
 async function updateMangleRule2(a, ctx) {
   ctx.info(`Updating IPv6 firewall mangle rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -14227,11 +14278,14 @@ async function updateMangleRule2(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ipv6 firewall mangle set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveRuleId3(a.rule_id, ctx);
+  if (!id)
+    return `IPv6 mangle rule '${a.rule_id}' not found.`;
+  const cmd = `/ipv6 firewall mangle set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update IPv6 firewall mangle rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ipv6 firewall mangle print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ipv6 firewall mangle print detail where .id=${id}`, ctx);
   return `IPv6 firewall mangle rule updated successfully:
 
 ${details}`;
@@ -14390,8 +14444,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting IPv6 firewall mangle rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ipv6 firewall mangle print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `IPv6 firewall mangle rule with ID '${a.rule_id}' not found.` : `IPV6 FIREWALL MANGLE RULE DETAILS:
+      const id = await resolveRuleId3(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall mangle print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `IPv6 mangle rule '${a.rule_id}' not found.` : `IPV6 FIREWALL MANGLE RULE DETAILS:
 
 ${result}`;
     }
@@ -14473,13 +14530,13 @@ ${result}`;
     inputSchema: { rule_id: z46.string() },
     async handler(a, ctx) {
       ctx.info(`Removing IPv6 firewall mangle rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall mangle print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall mangle rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall mangle remove ${a.rule_id}`, ctx);
+      const id = await resolveRuleId3(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall mangle remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove IPv6 firewall mangle rule: ${result}`;
-      return `IPv6 firewall mangle rule with ID '${a.rule_id}' removed successfully.`;
+      return `IPv6 mangle rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -14493,13 +14550,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving IPv6 firewall mangle rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall mangle print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall mangle rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall mangle move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveRuleId3(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall mangle move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move IPv6 firewall mangle rule: ${result}`;
-      return `IPv6 firewall mangle rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `IPv6 mangle rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -14527,6 +14584,7 @@ ${result}`;
 // src/tools/ipv6-firewall-raw.ts
 import { z as z47 } from "zod";
 var isDigits7 = (s) => /^\d+$/.test(s);
+var resolveRuleId4 = ruleResolver("/ipv6 firewall raw");
 async function updateRawRule(a, ctx) {
   ctx.info(`Updating IPv6 firewall raw rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -14572,11 +14630,14 @@ async function updateRawRule(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ipv6 firewall raw set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveRuleId4(a.rule_id, ctx);
+  if (!id)
+    return `IPv6 raw rule '${a.rule_id}' not found.`;
+  const cmd = `/ipv6 firewall raw set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update IPv6 firewall raw rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ipv6 firewall raw print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ipv6 firewall raw print detail where .id=${id}`, ctx);
   return `IPv6 firewall raw rule updated successfully:
 
 ${details}`;
@@ -14691,7 +14752,10 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting IPv6 firewall raw rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ipv6 firewall raw print detail where .id=${a.rule_id}`, ctx);
+      const id = await resolveRuleId4(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall raw rule with ID '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall raw print detail where .id=${id}`, ctx);
       return isEmpty(result) ? `IPv6 firewall raw rule with ID '${a.rule_id}' not found.` : `IPV6 FIREWALL RAW RULE DETAILS:
 
 ${result}`;
@@ -14745,13 +14809,13 @@ ${result}`;
     inputSchema: { rule_id: z47.string() },
     async handler(a, ctx) {
       ctx.info(`Removing IPv6 firewall raw rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall raw print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
+      const id = await resolveRuleId4(a.rule_id, ctx);
+      if (!id)
         return `IPv6 firewall raw rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall raw remove ${a.rule_id}`, ctx);
+      const result = await executeMikrotikCommand(`/ipv6 firewall raw remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove IPv6 firewall raw rule: ${result}`;
-      return `IPv6 firewall raw rule with ID '${a.rule_id}' removed successfully.`;
+      return `IPv6 firewall raw rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -14765,13 +14829,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving IPv6 firewall raw rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall raw print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
+      const id = await resolveRuleId4(a.rule_id, ctx);
+      if (!id)
         return `IPv6 firewall raw rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall raw move ${a.rule_id} destination=${a.destination}`, ctx);
+      const result = await executeMikrotikCommand(`/ipv6 firewall raw move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move IPv6 firewall raw rule: ${result}`;
-      return `IPv6 firewall raw rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `IPv6 firewall raw rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -22133,7 +22197,7 @@ ${result}`;
 ${v6Result}`;
       }
       const where = [`dst-address in ${a.destination}`, "active=yes"];
-      if (table)
+      if (table && table !== "main")
         where.push(`routing-table=${quoteValue(table)}`);
       const v7Cmd = `/ip route print detail where ${where.join(" ")}`;
       const v7Result = await executeMikrotikCommand(v7Cmd, ctx);

package/dist/shared/{library-0zd2tej9.js → library-1hs18tmh.js}

@@ -4,7 +4,7 @@ import {
   allToolModules,
   moduleCatalog,
   selectToolModules
-} from "./library-21t1cncr.js";
+} from "./library-7j22z9a8.js";
 export {
   selectToolModules,
   moduleCatalog,

package/dist/shared/{library-21t1cncr.js → library-7j22z9a8.js}

@@ -8138,7 +8138,7 @@ var rawCommandTools = [
       if (!cmd)
         return "Provide a RouterOS command to run.";
       ctx.info(`Running raw RouterOS command: ${cmd}`);
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = await executeMikrotikCommand(cmd, ctx, { maxMs: 30000 });
       if (looksLikeError(result))
         return `RouterOS command error: ${result}`;
       return result.trim() ? result : "(command completed with no output)";
@@ -8260,7 +8260,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./library-0zd2tej9.js");
+  const { moduleCatalog } = await import("./library-1hs18tmh.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -10457,7 +10457,30 @@ ${results.join(`
 
 // src/tools/firewall-nat.ts
 import { z as z29 } from "zod";
+
+// src/tools/_resolve-rule-id.ts
+function ruleResolver(scope) {
+  return async function resolveRuleId(ruleId, ctx) {
+    if (/^\d+$/.test(ruleId)) {
+      const id = `*${ruleId}`;
+      const byId = await executeMikrotikCommand(`${scope} print count-only where .id=${id}`, ctx);
+      if (byId.trim() !== "0")
+        return id;
+      const idsRaw = await executeMikrotikCommand(`:foreach i in=[${scope} find] do={:put $i}`, ctx);
+      if (isEmpty(idsRaw))
+        return null;
+      const ids = idsRaw.trim().split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+      const pos = Number.parseInt(ruleId, 10);
+      return pos >= 0 && pos < ids.length ? ids[pos] : null;
+    }
+    const count = await executeMikrotikCommand(`${scope} print count-only where .id=${ruleId}`, ctx);
+    return count.trim() !== "0" ? ruleId : null;
+  };
+}
+
+// src/tools/firewall-nat.ts
 var isDigits2 = (s) => /^\d+$/.test(s);
+var resolveNatRuleId = ruleResolver("/ip firewall nat");
 async function updateNatRule(a, ctx) {
   ctx.info(`Updating NAT rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -10533,11 +10556,14 @@ async function updateNatRule(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ip firewall nat set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveNatRuleId(a.rule_id, ctx);
+  if (!id)
+    return `NAT rule '${a.rule_id}' not found.`;
+  const cmd = `/ip firewall nat set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update NAT rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ip firewall nat print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ip firewall nat print detail where .id=${id}`, ctx);
   return `NAT rule updated successfully:
 
 ${details}`;
@@ -10715,8 +10741,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting NAT rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ip firewall nat print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `NAT rule with ID '${a.rule_id}' not found.` : `NAT RULE DETAILS:
+      const id = await resolveNatRuleId(a.rule_id, ctx);
+      if (!id)
+        return `NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall nat print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `NAT rule '${a.rule_id}' not found.` : `NAT RULE DETAILS:
 
 ${result}`;
     }
@@ -10798,13 +10827,13 @@ ${result}`;
     inputSchema: { rule_id: z29.string() },
     async handler(a, ctx) {
       ctx.info(`Removing NAT rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ip firewall nat print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `NAT rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ip firewall nat remove ${a.rule_id}`, ctx);
+      const id = await resolveNatRuleId(a.rule_id, ctx);
+      if (!id)
+        return `NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall nat remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove NAT rule: ${result}`;
-      return `NAT rule with ID '${a.rule_id}' removed successfully.`;
+      return `NAT rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -10818,13 +10847,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving NAT rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ip firewall nat print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `NAT rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ip firewall nat move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveNatRuleId(a.rule_id, ctx);
+      if (!id)
+        return `NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall nat move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move NAT rule: ${result}`;
-      return `NAT rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `NAT rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -10852,6 +10881,7 @@ ${result}`;
 // src/tools/firewall-mangle.ts
 import { z as z30 } from "zod";
 var isDigits3 = (s) => /^\d+$/.test(s);
+var resolveMangleRuleId = ruleResolver("/ip firewall mangle");
 async function updateMangleRule(a, ctx) {
   ctx.info(`Updating mangle rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -10937,11 +10967,14 @@ async function updateMangleRule(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ip firewall mangle set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveMangleRuleId(a.rule_id, ctx);
+  if (!id)
+    return `Mangle rule '${a.rule_id}' not found.`;
+  const cmd = `/ip firewall mangle set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update mangle rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ip firewall mangle print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ip firewall mangle print detail where .id=${id}`, ctx);
   return `Mangle rule updated successfully:
 
 ${details}`;
@@ -11116,8 +11149,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting mangle rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ip firewall mangle print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `Mangle rule with ID '${a.rule_id}' not found.` : `MANGLE RULE DETAILS:
+      const id = await resolveMangleRuleId(a.rule_id, ctx);
+      if (!id)
+        return `Mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall mangle print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `Mangle rule '${a.rule_id}' not found.` : `MANGLE RULE DETAILS:
 
 ${result}`;
     }
@@ -11208,13 +11244,13 @@ ${result}`;
     inputSchema: { rule_id: z30.string() },
     async handler(a, ctx) {
       ctx.info(`Removing mangle rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ip firewall mangle print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `Mangle rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ip firewall mangle remove ${a.rule_id}`, ctx);
+      const id = await resolveMangleRuleId(a.rule_id, ctx);
+      if (!id)
+        return `Mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall mangle remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove mangle rule: ${result}`;
-      return `Mangle rule with ID '${a.rule_id}' removed successfully.`;
+      return `Mangle rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -11228,13 +11264,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving mangle rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ip firewall mangle print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `Mangle rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ip firewall mangle move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveMangleRuleId(a.rule_id, ctx);
+      if (!id)
+        return `Mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ip firewall mangle move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move mangle rule: ${result}`;
-      return `Mangle rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `Mangle rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -13370,6 +13406,7 @@ ${result}`;
 // src/tools/ipv6-firewall-filter.ts
 import { z as z44 } from "zod";
 var isDigits4 = (s) => /^\d+$/.test(s);
+var resolveRuleId = ruleResolver("/ipv6 firewall filter");
 async function updateFilterRule2(a, ctx) {
   ctx.info(`Updating IPv6 firewall filter rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -13438,11 +13475,14 @@ async function updateFilterRule2(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ipv6 firewall filter set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveRuleId(a.rule_id, ctx);
+  if (!id)
+    return `IPv6 firewall filter rule '${a.rule_id}' not found.`;
+  const cmd = `/ipv6 firewall filter set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update IPv6 firewall filter rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ipv6 firewall filter print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ipv6 firewall filter print detail where .id=${id}`, ctx);
   return `IPv6 firewall filter rule updated successfully:
 
 ${details}`;
@@ -13599,8 +13639,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting IPv6 firewall filter rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ipv6 firewall filter print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `IPv6 firewall filter rule with ID '${a.rule_id}' not found.` : `IPV6 FIREWALL FILTER RULE DETAILS:
+      const id = await resolveRuleId(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall filter rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall filter print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `IPv6 firewall filter rule '${a.rule_id}' not found.` : `IPV6 FIREWALL FILTER RULE DETAILS:
 
 ${result}`;
     }
@@ -13676,13 +13719,13 @@ ${result}`;
     inputSchema: { rule_id: z44.string() },
     async handler(a, ctx) {
       ctx.info(`Removing IPv6 firewall filter rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall filter print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall filter rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall filter remove ${a.rule_id}`, ctx);
+      const id = await resolveRuleId(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall filter rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall filter remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove IPv6 firewall filter rule: ${result}`;
-      return `IPv6 firewall filter rule with ID '${a.rule_id}' removed successfully.`;
+      return `IPv6 firewall filter rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -13696,13 +13739,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving IPv6 firewall filter rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall filter print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall filter rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall filter move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveRuleId(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall filter rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall filter move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move IPv6 firewall filter rule: ${result}`;
-      return `IPv6 firewall filter rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `IPv6 firewall filter rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -13730,6 +13773,7 @@ ${result}`;
 // src/tools/ipv6-firewall-nat.ts
 import { z as z45 } from "zod";
 var isDigits5 = (s) => /^\d+$/.test(s);
+var resolveRuleId2 = ruleResolver("/ipv6 firewall nat");
 async function updateNatRule2(a, ctx) {
   ctx.info(`Updating IPv6 firewall NAT rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -13797,11 +13841,14 @@ async function updateNatRule2(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ipv6 firewall nat set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveRuleId2(a.rule_id, ctx);
+  if (!id)
+    return `IPv6 NAT rule '${a.rule_id}' not found.`;
+  const cmd = `/ipv6 firewall nat set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update IPv6 firewall NAT rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ipv6 firewall nat print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ipv6 firewall nat print detail where .id=${id}`, ctx);
   return `IPv6 firewall NAT rule updated successfully:
 
 ${details}`;
@@ -13952,8 +13999,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting IPv6 firewall NAT rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ipv6 firewall nat print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `IPv6 firewall NAT rule with ID '${a.rule_id}' not found.` : `IPV6 FIREWALL NAT RULE DETAILS:
+      const id = await resolveRuleId2(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall nat print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `IPv6 firewall NAT rule '${a.rule_id}' not found.` : `IPV6 FIREWALL NAT RULE DETAILS:
 
 ${result}`;
     }
@@ -14028,13 +14078,13 @@ ${result}`;
     inputSchema: { rule_id: z45.string() },
     async handler(a, ctx) {
       ctx.info(`Removing IPv6 firewall NAT rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall nat print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall NAT rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall nat remove ${a.rule_id}`, ctx);
+      const id = await resolveRuleId2(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall nat remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove IPv6 firewall NAT rule: ${result}`;
-      return `IPv6 firewall NAT rule with ID '${a.rule_id}' removed successfully.`;
+      return `IPv6 firewall NAT rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -14048,13 +14098,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving IPv6 firewall NAT rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall nat print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall NAT rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall nat move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveRuleId2(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall NAT rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall nat move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move IPv6 firewall NAT rule: ${result}`;
-      return `IPv6 firewall NAT rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `IPv6 firewall NAT rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -14082,6 +14132,7 @@ ${result}`;
 // src/tools/ipv6-firewall-mangle.ts
 import { z as z46 } from "zod";
 var isDigits6 = (s) => /^\d+$/.test(s);
+var resolveRuleId3 = ruleResolver("/ipv6 firewall mangle");
 async function updateMangleRule2(a, ctx) {
   ctx.info(`Updating IPv6 firewall mangle rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -14157,11 +14208,14 @@ async function updateMangleRule2(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ipv6 firewall mangle set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveRuleId3(a.rule_id, ctx);
+  if (!id)
+    return `IPv6 mangle rule '${a.rule_id}' not found.`;
+  const cmd = `/ipv6 firewall mangle set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update IPv6 firewall mangle rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ipv6 firewall mangle print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ipv6 firewall mangle print detail where .id=${id}`, ctx);
   return `IPv6 firewall mangle rule updated successfully:
 
 ${details}`;
@@ -14320,8 +14374,11 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting IPv6 firewall mangle rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ipv6 firewall mangle print detail where .id=${a.rule_id}`, ctx);
-      return isEmpty(result) ? `IPv6 firewall mangle rule with ID '${a.rule_id}' not found.` : `IPV6 FIREWALL MANGLE RULE DETAILS:
+      const id = await resolveRuleId3(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall mangle print detail where .id=${id}`, ctx);
+      return isEmpty(result) ? `IPv6 mangle rule '${a.rule_id}' not found.` : `IPV6 FIREWALL MANGLE RULE DETAILS:
 
 ${result}`;
     }
@@ -14403,13 +14460,13 @@ ${result}`;
     inputSchema: { rule_id: z46.string() },
     async handler(a, ctx) {
       ctx.info(`Removing IPv6 firewall mangle rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall mangle print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall mangle rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall mangle remove ${a.rule_id}`, ctx);
+      const id = await resolveRuleId3(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall mangle remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove IPv6 firewall mangle rule: ${result}`;
-      return `IPv6 firewall mangle rule with ID '${a.rule_id}' removed successfully.`;
+      return `IPv6 mangle rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -14423,13 +14480,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving IPv6 firewall mangle rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall mangle print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
-        return `IPv6 firewall mangle rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall mangle move ${a.rule_id} destination=${a.destination}`, ctx);
+      const id = await resolveRuleId3(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 mangle rule '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall mangle move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move IPv6 firewall mangle rule: ${result}`;
-      return `IPv6 firewall mangle rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `IPv6 mangle rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -14457,6 +14514,7 @@ ${result}`;
 // src/tools/ipv6-firewall-raw.ts
 import { z as z47 } from "zod";
 var isDigits7 = (s) => /^\d+$/.test(s);
+var resolveRuleId4 = ruleResolver("/ipv6 firewall raw");
 async function updateRawRule(a, ctx) {
   ctx.info(`Updating IPv6 firewall raw rule: rule_id=${a.rule_id}`);
   const updates = [];
@@ -14502,11 +14560,14 @@ async function updateRawRule(a, ctx) {
   }
   if (updates.length === 0)
     return "No updates specified.";
-  const cmd = `/ipv6 firewall raw set ${a.rule_id} ${updates.join(" ")}`;
+  const id = await resolveRuleId4(a.rule_id, ctx);
+  if (!id)
+    return `IPv6 raw rule '${a.rule_id}' not found.`;
+  const cmd = `/ipv6 firewall raw set ${id} ${updates.join(" ")}`;
   const result = await executeMikrotikCommand(cmd, ctx);
   if (looksLikeError(result))
     return `Failed to update IPv6 firewall raw rule: ${result}`;
-  const details = await executeMikrotikCommand(`/ipv6 firewall raw print detail where .id=${a.rule_id}`, ctx);
+  const details = await executeMikrotikCommand(`/ipv6 firewall raw print detail where .id=${id}`, ctx);
   return `IPv6 firewall raw rule updated successfully:
 
 ${details}`;
@@ -14621,7 +14682,10 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Getting IPv6 firewall raw rule details: rule_id=${a.rule_id}`);
-      const result = await executeMikrotikCommand(`/ipv6 firewall raw print detail where .id=${a.rule_id}`, ctx);
+      const id = await resolveRuleId4(a.rule_id, ctx);
+      if (!id)
+        return `IPv6 firewall raw rule with ID '${a.rule_id}' not found.`;
+      const result = await executeMikrotikCommand(`/ipv6 firewall raw print detail where .id=${id}`, ctx);
       return isEmpty(result) ? `IPv6 firewall raw rule with ID '${a.rule_id}' not found.` : `IPV6 FIREWALL RAW RULE DETAILS:
 
 ${result}`;
@@ -14675,13 +14739,13 @@ ${result}`;
     inputSchema: { rule_id: z47.string() },
     async handler(a, ctx) {
       ctx.info(`Removing IPv6 firewall raw rule: rule_id=${a.rule_id}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall raw print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
+      const id = await resolveRuleId4(a.rule_id, ctx);
+      if (!id)
         return `IPv6 firewall raw rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall raw remove ${a.rule_id}`, ctx);
+      const result = await executeMikrotikCommand(`/ipv6 firewall raw remove ${id}`, ctx);
       if (looksLikeError(result))
         return `Failed to remove IPv6 firewall raw rule: ${result}`;
-      return `IPv6 firewall raw rule with ID '${a.rule_id}' removed successfully.`;
+      return `IPv6 firewall raw rule '${a.rule_id}' (${id}) removed successfully.`;
     }
   }),
   defineTool({
@@ -14695,13 +14759,13 @@ ${result}`;
     },
     async handler(a, ctx) {
       ctx.info(`Moving IPv6 firewall raw rule: rule_id=${a.rule_id} to position ${a.destination}`);
-      const count = await executeMikrotikCommand(`/ipv6 firewall raw print count-only where .id=${a.rule_id}`, ctx);
-      if (count.trim() === "0")
+      const id = await resolveRuleId4(a.rule_id, ctx);
+      if (!id)
         return `IPv6 firewall raw rule with ID '${a.rule_id}' not found.`;
-      const result = await executeMikrotikCommand(`/ipv6 firewall raw move ${a.rule_id} destination=${a.destination}`, ctx);
+      const result = await executeMikrotikCommand(`/ipv6 firewall raw move ${id} destination=${a.destination}`, ctx);
       if (looksLikeError(result))
         return `Failed to move IPv6 firewall raw rule: ${result}`;
-      return `IPv6 firewall raw rule with ID '${a.rule_id}' moved to position ${a.destination}.`;
+      return `IPv6 firewall raw rule '${a.rule_id}' (${id}) moved to position ${a.destination}.`;
     }
   }),
   defineTool({
@@ -22063,7 +22127,7 @@ ${result}`;
 ${v6Result}`;
       }
       const where = [`dst-address in ${a.destination}`, "active=yes"];
-      if (table)
+      if (table && table !== "main")
         where.push(`routing-table=${quoteValue(table)}`);
       const v7Cmd = `/ip route print detail where ${where.join(" ")}`;
       const v7Result = await executeMikrotikCommand(v7Cmd, ctx);

package/package.json

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