@usex/mikrotik-mcp 4.17.0 → 4.18.0

package/dist/cli.js

@@ -81,6 +81,7 @@ import {
   moduleCatalog,
   normalizeExport,
   openSnapshotStore,
+  parseDisks,
   parseKeyValues,
   parseLeadingNumber,
   parseRecords,
@@ -122,7 +123,7 @@ import {
   updateAaaEntity,
   updateSummaryLine,
   writeBackup
-} from "./shared/cli-v75jtv6p.js";
+} from "./shared/cli-dv2kmsh2.js";
 
 // src/cli.ts
 import { existsSync as existsSync2 } from "fs";
@@ -764,6 +765,9 @@ async function probeDevice(name, dc) {
       try {
         neighbors.set(name, parseNeighbors(await client.run("/ip neighbor print detail")));
       } catch {}
+      try {
+        status.disks = parseDisks(await client.run("/disk print detail"));
+      } catch {}
     }
   } catch (e) {
     status = {

package/dist/index.js

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

package/dist/shared/{cli-1ftjz1jx.js → cli-7jxnfmp0.js}

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

package/dist/shared/{cli-v75jtv6p.js → cli-dv2kmsh2.js}

@@ -1802,9 +1802,16 @@ function parseFlagLegend(text) {
 }
 function parseKvTokens(chunk) {
   const out = {};
-  const re = /([A-Za-z][\w.-]*)=("(?:[^"\\]|\\.)*"|[^\s]*)/g;
+  const re = /(\.?[A-Za-z][\w.-]*)=("(?:[^"\\]|\\.)*"|[^\s]*)/g;
+  let prefix = "";
   for (const m of chunk.matchAll(re)) {
-    const key = m[1];
+    let key = m[1];
+    if (key.startsWith(".")) {
+      key = prefix + key;
+    } else {
+      const dot = key.indexOf(".");
+      prefix = dot > 0 ? key.slice(0, dot) : "";
+    }
     let value = m[2];
     if (value.startsWith('"') && value.endsWith('"')) {
       value = value.slice(1, -1).replace(/\\(.)/g, "$1");
@@ -1984,6 +1991,33 @@ function parseSizeToBytes(value) {
   };
   return n * (factor[unit] ?? 1);
 }
+function parseDisks(text) {
+  const collapsed = text.replace(/(\d) (?=\d)/g, "$1");
+  const { rows } = parseRecords(collapsed);
+  const disks = [];
+  for (const r of rows) {
+    const slot = r.slot ?? r.name ?? "";
+    if (!slot)
+      continue;
+    if (/E/.test(r.flags ?? ""))
+      continue;
+    const size = parseLeadingNumber(r.size);
+    if (size == null || size <= 0)
+      continue;
+    const free = parseLeadingNumber(r.free);
+    const usePct = parseLeadingNumber(r.use);
+    disks.push({
+      slot,
+      model: r.model,
+      fs: r.fs,
+      size,
+      free: free ?? undefined,
+      mountPoint: r["mount-point"],
+      usedPct: usePct ?? (free != null && size > 0 ? Math.round((size - free) / size * 100) : undefined)
+    });
+  }
+  return disks;
+}
 
 // src/core/ui-meta.ts
 var UI_META_KEY = "ui";
@@ -8995,7 +9029,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./cli-1ftjz1jx.js");
+  const { moduleCatalog } = await import("./cli-7jxnfmp0.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -31752,12 +31786,12 @@ function num2(v) {
   return Number.isFinite(n) ? n : undefined;
 }
 function bandFromRow(row) {
-  const b = (row.band ?? row["configuration.mode"] ?? "").toLowerCase();
+  const b = (row["channel.band"] ?? row.band ?? row.bands ?? row["configuration.band"] ?? "").toLowerCase();
   if (b.includes("2ghz") || b.includes("2.4"))
     return "2ghz";
   if (b.includes("5ghz") || b.includes("5."))
     return "5ghz";
-  const ch = num2(row.channel ?? row.frequency ?? row["channel.frequency"]);
+  const ch = num2(row["channel.frequency"] ?? row.channel ?? row.frequency);
   if (ch != null) {
     if (ch >= 5000 || ch >= 36 && ch <= 177)
       return "5ghz";
@@ -31767,7 +31801,7 @@ function bandFromRow(row) {
   return "unknown";
 }
 function channelOf(row) {
-  return num2(row.channel ?? row.frequency ?? row["channel.frequency"]);
+  return num2(row["channel.frequency"] ?? row.channel ?? row.frequency);
 }
 function normalizeCapsmanState(raw) {
   if (!raw)
@@ -31778,9 +31812,12 @@ function normalizeCapsmanState(raw) {
     if (rid)
       clientsByRadio.set(rid, (clientsByRadio.get(rid) ?? 0) + 1);
   }
-  const radios = raw.radios.map((row) => {
-    const cap = row["remote-cap-identity"] ?? row.identity ?? row["cap-name"] ?? row.name ?? "?";
-    const radioId = row.interface ?? row.name ?? row["radio-mac"] ?? cap;
+  const interfaceRows = raw.interfaces ?? [];
+  const useInterfaces = interfaceRows.length > 0;
+  const radioRows = useInterfaces ? interfaceRows : raw.radios;
+  const radios = radioRows.map((row) => {
+    const cap = useInterfaces ? row.name ?? row["radio-mac"] ?? "?" : row["remote-cap-identity"] ?? row.identity ?? row["cap-name"] ?? row.name ?? "?";
+    const radioId = useInterfaces ? row.name ?? row["radio-mac"] ?? cap : row.interface ?? row.name ?? row["radio-mac"] ?? cap;
     const tag = parseFloorTag(`${cap} ${row.comment ?? ""}`);
     const res = raw.resources[cap] ?? {};
     return {
@@ -31788,7 +31825,7 @@ function normalizeCapsmanState(raw) {
       radioId,
       band: bandFromRow(row),
       channel: channelOf(row),
-      width: row.width ?? row["channel.width"],
+      width: row["channel.width"] ?? row.width,
       txPower: num2(row["tx-power"] ?? row["tx-power-dbm"]),
       clientCount: clientsByRadio.get(radioId) ?? num2(row["registered-clients"]) ?? 0,
       floor: tag.floor,
@@ -31865,10 +31902,11 @@ async function fetchCapsmanState(ctx) {
   if (!path)
     return normalizeCapsmanState(null);
   const isCapsman = path === "/caps-man";
-  const [manager, remoteCaps, radios, registrations, securityConfigs, accessList] = await Promise.all([
+  const [manager, remoteCaps, radios, interfaces, registrations, securityConfigs, accessList] = await Promise.all([
     fetchKv(isCapsman ? "/caps-man manager print" : `${path} capsman print`, ctx),
     fetchRows(isCapsman ? "/caps-man remote-cap print detail" : `${path} capsman remote-cap print detail`, ctx),
     fetchRows(isCapsman ? "/caps-man radio print detail" : `${path} radio print detail`, ctx),
+    isCapsman ? Promise.resolve([]) : fetchRows(`${path} print detail`, ctx),
     fetchRows(isCapsman ? "/caps-man registration-table print detail" : `${path} registration-table print detail`, ctx),
     fetchRows(isCapsman ? "/caps-man security print detail" : `${path} security print detail`, ctx),
     fetchRows(isCapsman ? "/caps-man access-list print detail" : `${path} access-list print detail`, ctx)
@@ -31878,6 +31916,7 @@ async function fetchCapsmanState(ctx) {
     manager,
     remoteCaps,
     radios,
+    interfaces,
     registrations,
     securityConfigs,
     accessList,
@@ -33266,4 +33305,4 @@ function selectToolModules(filter = {}, catalog = moduleCatalog) {
   }).map((m) => m.tools);
 }
 
-export { __require, DEFAULT_SNAPSHOT_DB, DEFAULT_CONFIG_HISTORY_DIR, DeviceConfigSchema, ToolFilterSchema, MikrotikConfigSchema, getConfigSource, loadConfig, logger, setConfig, getConfig, listDevices, deviceLabels, resolveDeviceName, deviceDirectory, isMacTelnetDevice, createDeviceClient, describeTransport, isPoolEnabled, closeAll, poolStatus, getMemoryStore, closeMemoryStore, reopenMemoryStore, executeMikrotikCommand, createContext, Cmd, isEmpty, looksLikeError, commandUnsupported, parseKeyValues, parseRouterosDate, parseSize, parseSystemResource, parseRecords, parseLeadingNumber, riskOf, REDACTED, redact, configureRecorder, getEventStore, subscribe, subscriberCount, registerTools, fetchDevices, sampleDeviceTraffic, sampleAllTraffic, setDeviceLimits, blockDevice, allowDevice, makeDeviceStatic, setDeviceIp, setDeviceLabel, removeDeviceLease, devicesView, PROMPTS_DIR, UI_DIST_DIR, registerUiResources, backupDir, listBackups, readBackup, writeBackup, deleteBackup, renameBackup, createLocalBackup, restoreLocalBackup, isS3Configured, getS3Client, presignExpiresIn, s3Target, splitCommands, buildChangePlan, renderPlan, diffLines, normalizeExport, analyzeDrift, attributeChanges, openSnapshotStore, applyWritesSafely, captureSnapshot, DEFAULT_TZSP_PORT, capture2 as capture, AAA_ENTITIES, listAaaEntity, addAaaEntity, updateAaaEntity, removeAaaEntity, toggleAaaEntity, getRadiusIncoming, setRadiusIncoming, resetRadiusCounters, getUmSettings, setUmSettings, VERSION, WEBSITE_URL, LOGO_URL, SERVER_TITLE, SERVER_DESCRIPTION, SERVER_NAME, PKG_META, loadFileCacheSync, fetchLatestRelease, checkForUpdate, updateSummaryLine, fetchAllReleases, buildChannelPlanCommands, reportWeakClients, runCapsmanAudit, steerAlreadyPresent, buildSteerCommands, loadBalancePlan, buildLoadBalanceCommands, buildFtCommands, buildHaCommands, haGuidance, capsmanOverview, fetchCapsmanState, moduleCatalog, allToolModules, ALWAYS_ON_MODULES, selectToolModules };
+export { __require, DEFAULT_SNAPSHOT_DB, DEFAULT_CONFIG_HISTORY_DIR, DeviceConfigSchema, ToolFilterSchema, MikrotikConfigSchema, getConfigSource, loadConfig, logger, setConfig, getConfig, listDevices, deviceLabels, resolveDeviceName, deviceDirectory, isMacTelnetDevice, createDeviceClient, describeTransport, isPoolEnabled, closeAll, poolStatus, getMemoryStore, closeMemoryStore, reopenMemoryStore, executeMikrotikCommand, createContext, Cmd, isEmpty, looksLikeError, commandUnsupported, parseKeyValues, parseRouterosDate, parseSize, parseSystemResource, parseRecords, parseLeadingNumber, parseDisks, riskOf, REDACTED, redact, configureRecorder, getEventStore, subscribe, subscriberCount, registerTools, fetchDevices, sampleDeviceTraffic, sampleAllTraffic, setDeviceLimits, blockDevice, allowDevice, makeDeviceStatic, setDeviceIp, setDeviceLabel, removeDeviceLease, devicesView, PROMPTS_DIR, UI_DIST_DIR, registerUiResources, backupDir, listBackups, readBackup, writeBackup, deleteBackup, renameBackup, createLocalBackup, restoreLocalBackup, isS3Configured, getS3Client, presignExpiresIn, s3Target, splitCommands, buildChangePlan, renderPlan, diffLines, normalizeExport, analyzeDrift, attributeChanges, openSnapshotStore, applyWritesSafely, captureSnapshot, DEFAULT_TZSP_PORT, capture2 as capture, AAA_ENTITIES, listAaaEntity, addAaaEntity, updateAaaEntity, removeAaaEntity, toggleAaaEntity, getRadiusIncoming, setRadiusIncoming, resetRadiusCounters, getUmSettings, setUmSettings, VERSION, WEBSITE_URL, LOGO_URL, SERVER_TITLE, SERVER_DESCRIPTION, SERVER_NAME, PKG_META, loadFileCacheSync, fetchLatestRelease, checkForUpdate, updateSummaryLine, fetchAllReleases, buildChannelPlanCommands, reportWeakClients, runCapsmanAudit, steerAlreadyPresent, buildSteerCommands, loadBalancePlan, buildLoadBalanceCommands, buildFtCommands, buildHaCommands, haGuidance, capsmanOverview, fetchCapsmanState, moduleCatalog, allToolModules, ALWAYS_ON_MODULES, selectToolModules };

package/dist/shared/{library-ydfn3v4j.js → library-77r1j24d.js}

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

package/dist/shared/{library-qma8metz.js → library-7m2c1g1y.js}

@@ -1783,9 +1783,16 @@ function parseFlagLegend(text) {
 }
 function parseKvTokens(chunk) {
   const out = {};
-  const re = /([A-Za-z][\w.-]*)=("(?:[^"\\]|\\.)*"|[^\s]*)/g;
+  const re = /(\.?[A-Za-z][\w.-]*)=("(?:[^"\\]|\\.)*"|[^\s]*)/g;
+  let prefix = "";
   for (const m of chunk.matchAll(re)) {
-    const key = m[1];
+    let key = m[1];
+    if (key.startsWith(".")) {
+      key = prefix + key;
+    } else {
+      const dot = key.indexOf(".");
+      prefix = dot > 0 ? key.slice(0, dot) : "";
+    }
     let value = m[2];
     if (value.startsWith('"') && value.endsWith('"')) {
       value = value.slice(1, -1).replace(/\\(.)/g, "$1");
@@ -8804,7 +8811,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./library-ydfn3v4j.js");
+  const { moduleCatalog } = await import("./library-77r1j24d.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -31482,12 +31489,12 @@ function num2(v) {
   return Number.isFinite(n) ? n : undefined;
 }
 function bandFromRow(row) {
-  const b = (row.band ?? row["configuration.mode"] ?? "").toLowerCase();
+  const b = (row["channel.band"] ?? row.band ?? row.bands ?? row["configuration.band"] ?? "").toLowerCase();
   if (b.includes("2ghz") || b.includes("2.4"))
     return "2ghz";
   if (b.includes("5ghz") || b.includes("5."))
     return "5ghz";
-  const ch = num2(row.channel ?? row.frequency ?? row["channel.frequency"]);
+  const ch = num2(row["channel.frequency"] ?? row.channel ?? row.frequency);
   if (ch != null) {
     if (ch >= 5000 || ch >= 36 && ch <= 177)
       return "5ghz";
@@ -31497,7 +31504,7 @@ function bandFromRow(row) {
   return "unknown";
 }
 function channelOf(row) {
-  return num2(row.channel ?? row.frequency ?? row["channel.frequency"]);
+  return num2(row["channel.frequency"] ?? row.channel ?? row.frequency);
 }
 function normalizeCapsmanState(raw) {
   if (!raw)
@@ -31508,9 +31515,12 @@ function normalizeCapsmanState(raw) {
     if (rid)
       clientsByRadio.set(rid, (clientsByRadio.get(rid) ?? 0) + 1);
   }
-  const radios = raw.radios.map((row) => {
-    const cap = row["remote-cap-identity"] ?? row.identity ?? row["cap-name"] ?? row.name ?? "?";
-    const radioId = row.interface ?? row.name ?? row["radio-mac"] ?? cap;
+  const interfaceRows = raw.interfaces ?? [];
+  const useInterfaces = interfaceRows.length > 0;
+  const radioRows = useInterfaces ? interfaceRows : raw.radios;
+  const radios = radioRows.map((row) => {
+    const cap = useInterfaces ? row.name ?? row["radio-mac"] ?? "?" : row["remote-cap-identity"] ?? row.identity ?? row["cap-name"] ?? row.name ?? "?";
+    const radioId = useInterfaces ? row.name ?? row["radio-mac"] ?? cap : row.interface ?? row.name ?? row["radio-mac"] ?? cap;
     const tag = parseFloorTag(`${cap} ${row.comment ?? ""}`);
     const res = raw.resources[cap] ?? {};
     return {
@@ -31518,7 +31528,7 @@ function normalizeCapsmanState(raw) {
       radioId,
       band: bandFromRow(row),
       channel: channelOf(row),
-      width: row.width ?? row["channel.width"],
+      width: row["channel.width"] ?? row.width,
       txPower: num2(row["tx-power"] ?? row["tx-power-dbm"]),
       clientCount: clientsByRadio.get(radioId) ?? num2(row["registered-clients"]) ?? 0,
       floor: tag.floor,
@@ -31595,10 +31605,11 @@ async function fetchCapsmanState(ctx) {
   if (!path)
     return normalizeCapsmanState(null);
   const isCapsman = path === "/caps-man";
-  const [manager, remoteCaps, radios, registrations, securityConfigs, accessList] = await Promise.all([
+  const [manager, remoteCaps, radios, interfaces, registrations, securityConfigs, accessList] = await Promise.all([
     fetchKv(isCapsman ? "/caps-man manager print" : `${path} capsman print`, ctx),
     fetchRows(isCapsman ? "/caps-man remote-cap print detail" : `${path} capsman remote-cap print detail`, ctx),
     fetchRows(isCapsman ? "/caps-man radio print detail" : `${path} radio print detail`, ctx),
+    isCapsman ? Promise.resolve([]) : fetchRows(`${path} print detail`, ctx),
     fetchRows(isCapsman ? "/caps-man registration-table print detail" : `${path} registration-table print detail`, ctx),
     fetchRows(isCapsman ? "/caps-man security print detail" : `${path} security print detail`, ctx),
     fetchRows(isCapsman ? "/caps-man access-list print detail" : `${path} access-list print detail`, ctx)
@@ -31608,6 +31619,7 @@ async function fetchCapsmanState(ctx) {
     manager,
     remoteCaps,
     radios,
+    interfaces,
     registrations,
     securityConfigs,
     accessList,