@usex/mikrotik-mcp 4.13.0 → 4.15.0

package/dist/cli.js

@@ -45,6 +45,7 @@ import {
   devicesView,
   diffLines,
   executeMikrotikCommand,
+  fetchAllReleases,
   fetchDevices,
   fetchLatestRelease,
   getConfig,
@@ -89,6 +90,7 @@ import {
   resetRadiusCounters,
   resolveDeviceName,
   restoreLocalBackup,
+  riskOf,
   s3Target,
   sampleAllTraffic,
   sampleDeviceTraffic,
@@ -106,18 +108,18 @@ import {
   updateAaaEntity,
   updateSummaryLine,
   writeBackup
-} from "./shared/cli-07emrpkr.js";
+} from "./shared/cli-w6ecrhxa.js";
 
 // src/cli.ts
 import { existsSync as existsSync2 } from "fs";
 
 // src/observability/dashboard.ts
 import { spawn } from "child_process";
-import { readFileSync as readFileSync2 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
 import { homedir, networkInterfaces } from "os";
-import { dirname as dirname4, join as join2 } from "path";
+import { dirname as dirname4, join as join3 } from "path";
 var {serve } = globalThis.Bun;
-import { z } from "zod";
+import { z as z2 } from "zod";
 
 // src/observability/modules.ts
 var lcSet = (xs) => new Set((xs ?? []).map((s) => s.toLowerCase()));
@@ -370,6 +372,149 @@ function historyBytes() {
   return total;
 }
 
+// src/prompts/index.ts
+import { readFileSync as readFileSync2, readdirSync as readdirSync2 } from "fs";
+import { join as join2 } from "path";
+import { z } from "zod";
+function parseFrontmatter(raw) {
+  const match = raw.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
+  if (!match)
+    return null;
+  const [, fm, body] = match;
+  const meta = {};
+  const args = [];
+  let cur = null;
+  let inArgs = false;
+  for (const line of fm.split(`
+`)) {
+    if (/^arguments:\s*$/.test(line)) {
+      inArgs = true;
+      continue;
+    }
+    if (inArgs) {
+      const item = line.match(/^[ \t]*-[ \t]*name:[ \t]*(\S.*)$/);
+      if (item) {
+        if (cur)
+          args.push(cur);
+        cur = { name: item[1].trim() };
+        continue;
+      }
+      const prop = line.match(/^[ \t]+(description|required):[ \t]*(\S.*)$/);
+      if (prop && cur) {
+        if (prop[1] === "required")
+          cur.required = /^(true|yes)$/i.test(prop[2].trim());
+        else
+          cur.description = prop[2].trim().replace(/^["']|["']$/g, "");
+        continue;
+      }
+      if (/^\S/.test(line))
+        inArgs = false;
+    }
+    const kv = line.match(/^(\w+):[ \t]*(\S.*)?$/);
+    if (kv && !inArgs)
+      meta[kv[1]] = (kv[2] ?? "").trim().replace(/^["']|["']$/g, "");
+  }
+  if (cur)
+    args.push(cur);
+  if (!meta.name)
+    return null;
+  return {
+    name: meta.name,
+    title: meta.title ?? meta.name,
+    description: meta.description ?? "",
+    arguments: args,
+    body: body.trim()
+  };
+}
+function substitute(body, vars) {
+  return body.replace(/\{\{\s*(\w+)\s*\}\}/g, (whole, key) => {
+    const v = vars[key];
+    if (v === undefined || v === null || v === "")
+      return whole;
+    return typeof v === "object" ? JSON.stringify(v) : String(v);
+  });
+}
+function deviceArgDescription(directory) {
+  if (directory && directory.length > 0) {
+    const rows = directory.map((d) => `\u2022 ${d.key}${d.label && d.label !== d.key ? ` ("${d.label}")` : ""} \u2192 ${d.target}${d.isDefault ? " [default]" : ""}`).join(`
+`);
+    return "Which configured MikroTik device to run this workflow on. " + `Pass the EXACT config key or its label. Configured devices:
+` + `${rows}
+` + "Omit to use the default device.";
+  }
+  return "Which configured MikroTik device to run this workflow on. Omit to use the default device.";
+}
+function listPrompts() {
+  let files;
+  try {
+    files = readdirSync2(PROMPTS_DIR).filter((f) => f.endsWith(".md"));
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const file of files) {
+    try {
+      const parsed = parseFrontmatter(readFileSync2(join2(PROMPTS_DIR, file), "utf8"));
+      if (parsed) {
+        out.push({
+          name: parsed.name,
+          title: parsed.title,
+          description: parsed.description,
+          arguments: parsed.arguments,
+          body: parsed.body
+        });
+      }
+    } catch {}
+  }
+  return out.sort((a, b) => a.name.localeCompare(b.name));
+}
+function registerPrompts(server, opts = {}) {
+  let files;
+  try {
+    files = readdirSync2(PROMPTS_DIR).filter((f) => f.endsWith(".md"));
+  } catch {
+    return 0;
+  }
+  const multiDevice = opts.deviceNames && opts.deviceNames.length > 1;
+  const selectorNames = multiDevice ? [...new Set([...opts.deviceNames, ...opts.deviceAliases ?? []])] : [];
+  let count = 0;
+  for (const file of files) {
+    let parsed;
+    try {
+      parsed = parseFrontmatter(readFileSync2(join2(PROMPTS_DIR, file), "utf8"));
+    } catch (e) {
+      logger.warn(`Skipping prompt ${file}: ${String(e)}`);
+      continue;
+    }
+    if (!parsed) {
+      logger.warn(`Skipping prompt ${file}: missing or invalid frontmatter`);
+      continue;
+    }
+    const argsSchema = {};
+    for (const arg of parsed.arguments) {
+      const s = z.string().describe(arg.description ?? "");
+      argsSchema[arg.name] = arg.required ? s : s.optional();
+    }
+    const hasOwnDevice = parsed.arguments.some((a) => a.name === "device" || a.name === "device_a");
+    if (multiDevice && !hasOwnDevice) {
+      argsSchema.device = z.enum(selectorNames).optional().describe(deviceArgDescription(opts.deviceDirectory));
+    }
+    server.registerPrompt(parsed.name, { title: parsed.title, description: parsed.description, argsSchema }, (args) => ({
+      messages: [
+        {
+          role: "user",
+          content: {
+            type: "text",
+            text: substitute(parsed.body, args)
+          }
+        }
+      ]
+    }));
+    count++;
+  }
+  return count;
+}
+
 // src/observability/topology.ts
 function normMac(mac) {
   if (!mac)
@@ -1492,9 +1637,35 @@ function restartProcess() {
   setTimeout(() => process.exit(0), 500);
   return ok;
 }
+function runUpgrade(spec) {
+  return new Promise((resolve) => {
+    let out = "";
+    const child = spawn(process.execPath, ["i", "-g", spec], {
+      cwd: process.cwd(),
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const timer3 = setTimeout(() => {
+      child.kill();
+      resolve({ ok: false, log: `${out}
+(timed out after 180s)` });
+    }, 180000);
+    child.stdout?.on("data", (d) => out += d.toString());
+    child.stderr?.on("data", (d) => out += d.toString());
+    child.on("error", (e) => {
+      clearTimeout(timer3);
+      resolve({ ok: false, log: `${out}
+spawn error: ${String(e)}` });
+    });
+    child.on("exit", (code) => {
+      clearTimeout(timer3);
+      resolve({ ok: code === 0, log: out.trim() || `(exit ${code})` });
+    });
+  });
+}
 function dashboardHtml() {
   try {
-    return readFileSync2(join2(UI_DIST_DIR, "observability.html"), "utf8");
+    return readFileSync3(join3(UI_DIST_DIR, "observability.html"), "utf8");
   } catch {
     return `<!doctype html><meta charset=utf-8><body style="font:14px system-ui;padding:24px;background:#0b0d10;color:#e8eaed">
 <h2>MikroTik MCP \u2014 Observability Dashboard</h2>
@@ -1726,7 +1897,7 @@ function configSchemaJson() {
   return {
     $schema: "https://json-schema.org/draft/2020-12/schema",
     title: "MikrotikConfig",
-    ...z.toJSONSchema(MikrotikConfigSchema, { target: "draft-2020-12" })
+    ...z2.toJSONSchema(MikrotikConfigSchema, { target: "draft-2020-12" })
   };
 }
 function clampRollback(v) {
@@ -2280,7 +2451,7 @@ async function featureRoutes(req, url) {
     const raw = b?.dir?.trim();
     if (!raw)
       return json3({ error: "dir required" }, 400);
-    const dir = raw === "~" || raw.startsWith("~/") ? join2(homedir(), raw.slice(1)) : raw;
+    const dir = raw === "~" || raw.startsWith("~/") ? join3(homedir(), raw.slice(1)) : raw;
     const next = { ...getConfig(), backupDir: dir };
     setConfig(next);
     try {
@@ -2388,7 +2559,7 @@ async function runDashboard(cfg, transportLabel) {
   });
   startHealthChecks(30000);
   try {
-    usageStore = await openUsageStore(join2(dirname4(cfg.dbPath), "usage.db"));
+    usageStore = await openUsageStore(join3(dirname4(cfg.dbPath), "usage.db"));
     startUsageSampler(usageStore);
   } catch (e) {
     logger.warn(`[${SERVER_TAG2}] usage history disabled: ${String(e)}`);
@@ -2405,7 +2576,7 @@ async function runDashboard(cfg, transportLabel) {
     source: getConfigSource,
     readFile: (pth) => {
       try {
-        return readFileSync2(pth, "utf8");
+        return readFileSync3(pth, "utf8");
       } catch {
         return null;
       }
@@ -2554,6 +2725,63 @@ async function runDashboard(cfg, transportLabel) {
         return json3({ error: e instanceof Error ? e.message : "fetch failed" }, 502);
       }
     }
+    if (url.pathname === "/api/catalog" && req.method === "GET") {
+      const modules = moduleCatalog.map((m) => ({
+        label: m.label,
+        slug: m.slug,
+        group: m.group,
+        description: m.description,
+        toolCount: m.tools.length,
+        tools: m.tools.map((t) => ({
+          name: t.name,
+          title: t.title,
+          description: t.description,
+          risk: riskOf(t.annotations)
+        }))
+      }));
+      const prompts = listPrompts();
+      const groups = [...new Set(modules.map((m) => m.group))].sort();
+      return json3({
+        modules,
+        prompts,
+        groups,
+        counts: {
+          modules: modules.length,
+          tools: modules.reduce((n, m) => n + m.toolCount, 0),
+          prompts: prompts.length,
+          groups: groups.length
+        },
+        version: VERSION
+      });
+    }
+    if (url.pathname === "/api/releases" && req.method === "GET") {
+      try {
+        return json3(await fetchAllReleases());
+      } catch (e) {
+        return json3({ error: e instanceof Error ? e.message : "fetch failed" }, 502);
+      }
+    }
+    if (url.pathname === "/api/upgrade" && req.method === "POST") {
+      const body = await readJson(req);
+      const version = String(body?.version ?? "latest");
+      if (version !== "latest" && !/^\d+\.\d+\.\d+$/.test(version)) {
+        return json3({ ok: false, error: `Invalid version "${version}" (use "latest" or x.y.z).` }, 400);
+      }
+      const spec = `@usex/mikrotik-mcp@${version}`;
+      logger.warn(`Dashboard requested upgrade: bun i -g ${spec}`);
+      const { ok, log } = await runUpgrade(spec);
+      if (!ok)
+        return json3({ ok: false, version, log }, 500);
+      const willRestart = body?.restart !== false;
+      const relaunched = willRestart ? restartProcess() : false;
+      return json3({
+        ok: true,
+        version,
+        log,
+        restarting: relaunched,
+        note: relaunched ? "Installed. Restarting on the new version now \u2014 reconnect shortly." : "Installed. Restart the server (or use the restart button) for it to take effect."
+      });
+    }
     if (url.pathname === "/api/meta") {
       const f = facets(db);
       return json3({
@@ -2696,127 +2924,6 @@ function corsHeaders(origin, configured) {
 // src/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
-
-// src/prompts/index.ts
-import { readFileSync as readFileSync3, readdirSync as readdirSync2 } from "fs";
-import { join as join3 } from "path";
-import { z as z2 } from "zod";
-function parseFrontmatter(raw) {
-  const match = raw.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
-  if (!match)
-    return null;
-  const [, fm, body] = match;
-  const meta = {};
-  const args = [];
-  let cur = null;
-  let inArgs = false;
-  for (const line of fm.split(`
-`)) {
-    if (/^arguments:\s*$/.test(line)) {
-      inArgs = true;
-      continue;
-    }
-    if (inArgs) {
-      const item = line.match(/^[ \t]*-[ \t]*name:[ \t]*(\S.*)$/);
-      if (item) {
-        if (cur)
-          args.push(cur);
-        cur = { name: item[1].trim() };
-        continue;
-      }
-      const prop = line.match(/^[ \t]+(description|required):[ \t]*(\S.*)$/);
-      if (prop && cur) {
-        if (prop[1] === "required")
-          cur.required = /^(true|yes)$/i.test(prop[2].trim());
-        else
-          cur.description = prop[2].trim().replace(/^["']|["']$/g, "");
-        continue;
-      }
-      if (/^\S/.test(line))
-        inArgs = false;
-    }
-    const kv = line.match(/^(\w+):[ \t]*(\S.*)?$/);
-    if (kv && !inArgs)
-      meta[kv[1]] = (kv[2] ?? "").trim().replace(/^["']|["']$/g, "");
-  }
-  if (cur)
-    args.push(cur);
-  if (!meta.name)
-    return null;
-  return {
-    name: meta.name,
-    title: meta.title ?? meta.name,
-    description: meta.description ?? "",
-    arguments: args,
-    body: body.trim()
-  };
-}
-function substitute(body, vars) {
-  return body.replace(/\{\{\s*(\w+)\s*\}\}/g, (whole, key) => {
-    const v = vars[key];
-    if (v === undefined || v === null || v === "")
-      return whole;
-    return typeof v === "object" ? JSON.stringify(v) : String(v);
-  });
-}
-function deviceArgDescription(directory) {
-  if (directory && directory.length > 0) {
-    const rows = directory.map((d) => `\u2022 ${d.key}${d.label && d.label !== d.key ? ` ("${d.label}")` : ""} \u2192 ${d.target}${d.isDefault ? " [default]" : ""}`).join(`
-`);
-    return "Which configured MikroTik device to run this workflow on. " + `Pass the EXACT config key or its label. Configured devices:
-` + `${rows}
-` + "Omit to use the default device.";
-  }
-  return "Which configured MikroTik device to run this workflow on. Omit to use the default device.";
-}
-function registerPrompts(server, opts = {}) {
-  let files;
-  try {
-    files = readdirSync2(PROMPTS_DIR).filter((f) => f.endsWith(".md"));
-  } catch {
-    return 0;
-  }
-  const multiDevice = opts.deviceNames && opts.deviceNames.length > 1;
-  const selectorNames = multiDevice ? [...new Set([...opts.deviceNames, ...opts.deviceAliases ?? []])] : [];
-  let count = 0;
-  for (const file of files) {
-    let parsed;
-    try {
-      parsed = parseFrontmatter(readFileSync3(join3(PROMPTS_DIR, file), "utf8"));
-    } catch (e) {
-      logger.warn(`Skipping prompt ${file}: ${String(e)}`);
-      continue;
-    }
-    if (!parsed) {
-      logger.warn(`Skipping prompt ${file}: missing or invalid frontmatter`);
-      continue;
-    }
-    const argsSchema = {};
-    for (const arg of parsed.arguments) {
-      const s = z2.string().describe(arg.description ?? "");
-      argsSchema[arg.name] = arg.required ? s : s.optional();
-    }
-    const hasOwnDevice = parsed.arguments.some((a) => a.name === "device" || a.name === "device_a");
-    if (multiDevice && !hasOwnDevice) {
-      argsSchema.device = z2.enum(selectorNames).optional().describe(deviceArgDescription(opts.deviceDirectory));
-    }
-    server.registerPrompt(parsed.name, { title: parsed.title, description: parsed.description, argsSchema }, (args) => ({
-      messages: [
-        {
-          role: "user",
-          content: {
-            type: "text",
-            text: substitute(parsed.body, args)
-          }
-        }
-      ]
-    }));
-    count++;
-  }
-  return count;
-}
-
-// src/server.ts
 var INSTRUCTIONS = `MikroTik RouterOS management over SSH.
 
 This server exposes RouterOS configuration as MCP tools grouped by subsystem:

package/dist/index.js

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

package/dist/shared/{cli-p6yc41tg.js → cli-9s02dq5d.js}

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