@usex/mikrotik-mcp 5.10.0 → 5.11.0

package/dist/cli.js

@@ -16764,7 +16764,7 @@ function poolStatus() {
 }
 
 // src/ssh/safe-mode.ts
-var PROMPT_RE = /\[.+?@.+?\] (?:<SAFE> )?> ?$/m;
+var PROMPT_RE = /\[[^\r\n\]]+@[^\r\n\]]+\][ \t]+(?:\/[^\r\n<>]*[ \t]*)?(?:<SAFE>(?:[ \t]*>)?|>)[ \t]*$/;
 var ANSI_RE = /\x1B(?:\[[0-9;]*[mA-HJ-MSTfhilnprsu]|[()][0-9A-Za-z]|\[?\?\d+[hl])/g;
 function stripAnsi(text) {
   return text.replace(ANSI_RE, "");
@@ -16832,8 +16832,9 @@ class SafeModeManager {
         this.cleanup();
         return `Error: Timed out waiting for MikroTik shell prompt. Got: ${JSON.stringify(initial.slice(0, 300))}`;
       }
+      const activation = this.readUntilPrompt(1e4, (c) => isSafeModeActivated(c));
       this.channel.write(CTRL_X);
-      const response = (await this.readUntilPrompt(1e4, (c) => isSafeModeActivated(c))).text;
+      const response = (await activation).text;
       if (!isSafeModeActivated(response)) {
         this.cleanup();
         return `Error: Safe mode did not activate. Response: ${JSON.stringify(response.slice(0, 300))}`;
@@ -16850,11 +16851,12 @@ class SafeModeManager {
       if (!this.active || !this.channel) {
         throw new Error("Safe mode session is not active.");
       }
+      const response = this.readUntilPrompt();
       this.channel.write(`${command}
 `);
-      const { text, timedOut } = await this.readUntilPrompt();
+      const { text, timedOut } = await response;
       if (timedOut) {
-        throw new Error(`Safe Mode shell went silent for ${IDLE_TIMEOUT_MS / 1000}s (command: ${command}). The ` + "interactive session appears wedged \u2014 some RouterOS builds/terminals don't support Safe " + "Mode over SSH. Apply the change with the direct write tools instead (verify each with a read).");
+        throw new Error(`Safe Mode command did not return a recognized prompt before the timeout (command: ${command}). ` + "Execution may have occurred; do not retry the write blindly. Inspect the session " + "and roll back if its state cannot be verified.");
       }
       return this.extractOutput(text, command);
     });
@@ -16961,12 +16963,17 @@ class SafeModeManager {
     if (!this.channel)
       return "unknown";
     const token = "__MCP_SAFEMODE_PROBE__";
+    const response = this.readUntilPrompt(8000, (cleaned) => {
+      const lines = cleaned.replace(/\r/g, `
+`).split(`
+`);
+      const i = lines.findIndex((line) => line.trim() === token);
+      return i >= 0 && PROMPT_RE.test(lines.slice(i + 1).join(`
+`));
+    });
     this.channel.write(`:put "${token}"
 `);
-    const out = (await this.readUntilPrompt(8000, (cleaned) => {
-      const i = cleaned.lastIndexOf(token);
-      return i >= 0 && PROMPT_RE.test(cleaned.slice(i));
-    })).text;
+    const out = (await response).text;
     return classifyPrompt(out);
   }
   extractOutput(raw, command) {
@@ -16984,6 +16991,11 @@ class SafeModeManager {
           pastEcho = true;
         continue;
       }
+      if (stripped.endsWith(command.trim())) {
+        const prefix = stripped.slice(0, -command.trim().length).trimEnd();
+        if (PROMPT_RE.test(prefix))
+          continue;
+      }
       if (PROMPT_RE.test(stripped))
         break;
       result.push(line);
@@ -30211,7 +30223,7 @@ var cache2 = null;
 async function gateway() {
   if (cache2)
     return cache2;
-  const { moduleCatalog } = await import("./shared/cli-k3m3pxn8.js");
+  const { moduleCatalog } = await import("./shared/cli-m947aqb2.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -52437,7 +52449,7 @@ var riskByTool = null;
 async function riskIndex() {
   if (riskByTool)
     return riskByTool;
-  const { moduleCatalog } = await import("./shared/cli-k3m3pxn8.js");
+  const { moduleCatalog } = await import("./shared/cli-m947aqb2.js");
   const index = new Map;
   for (const mod of moduleCatalog) {
     for (const tool of mod.tools)

package/dist/index.js

@@ -62,7 +62,7 @@ import {
   updateSummaryLine,
   allToolModules2,
   selectToolModules2
-} from "./shared/library-kpx18cna.js";
+} from "./shared/library-tm6yshkz.js";
 
 // node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS(function(exports) {

package/dist/shared/{library-cv5qe3zh.js → library-drn9gmjm.js}

@@ -3,7 +3,7 @@ import {
   moduleCatalog2,
   allToolModules2,
   selectToolModules2
-} from "./library-kpx18cna.js";
+} from "./library-tm6yshkz.js";
 export {
   allToolModules2 as allToolModules,
   moduleCatalog2 as moduleCatalog,

package/dist/shared/{library-kpx18cna.js → library-tm6yshkz.js}

@@ -10181,7 +10181,7 @@ async function runPooled(command, deviceName, opts) {
 }
 
 // src/ssh/safe-mode.ts
-var PROMPT_RE = /\[.+?@.+?\] (?:<SAFE> )?> ?$/m;
+var PROMPT_RE = /\[[^\r\n\]]+@[^\r\n\]]+\][ \t]+(?:\/[^\r\n<>]*[ \t]*)?(?:<SAFE>(?:[ \t]*>)?|>)[ \t]*$/;
 var ANSI_RE = /\x1B(?:\[[0-9;]*[mA-HJ-MSTfhilnprsu]|[()][0-9A-Za-z]|\[?\?\d+[hl])/g;
 function stripAnsi(text) {
   return text.replace(ANSI_RE, "");
@@ -10249,8 +10249,9 @@ class SafeModeManager2 {
         this.cleanup();
         return `Error: Timed out waiting for MikroTik shell prompt. Got: ${JSON.stringify(initial.slice(0, 300))}`;
       }
+      const activation = this.readUntilPrompt(1e4, (c) => isSafeModeActivated(c));
       this.channel.write(CTRL_X);
-      const response = (await this.readUntilPrompt(1e4, (c) => isSafeModeActivated(c))).text;
+      const response = (await activation).text;
       if (!isSafeModeActivated(response)) {
         this.cleanup();
         return `Error: Safe mode did not activate. Response: ${JSON.stringify(response.slice(0, 300))}`;
@@ -10267,11 +10268,12 @@ class SafeModeManager2 {
       if (!this.active || !this.channel) {
         throw new Error("Safe mode session is not active.");
       }
+      const response = this.readUntilPrompt();
       this.channel.write(`${command}
 `);
-      const { text, timedOut } = await this.readUntilPrompt();
+      const { text, timedOut } = await response;
       if (timedOut) {
-        throw new Error(`Safe Mode shell went silent for ${IDLE_TIMEOUT_MS / 1000}s (command: ${command}). The ` + "interactive session appears wedged \u2014 some RouterOS builds/terminals don't support Safe " + "Mode over SSH. Apply the change with the direct write tools instead (verify each with a read).");
+        throw new Error(`Safe Mode command did not return a recognized prompt before the timeout (command: ${command}). ` + "Execution may have occurred; do not retry the write blindly. Inspect the session " + "and roll back if its state cannot be verified.");
       }
       return this.extractOutput(text, command);
     });
@@ -10378,12 +10380,17 @@ class SafeModeManager2 {
     if (!this.channel)
       return "unknown";
     const token = "__MCP_SAFEMODE_PROBE__";
+    const response = this.readUntilPrompt(8000, (cleaned) => {
+      const lines = cleaned.replace(/\r/g, `
+`).split(`
+`);
+      const i = lines.findIndex((line) => line.trim() === token);
+      return i >= 0 && PROMPT_RE.test(lines.slice(i + 1).join(`
+`));
+    });
     this.channel.write(`:put "${token}"
 `);
-    const out = (await this.readUntilPrompt(8000, (cleaned) => {
-      const i = cleaned.lastIndexOf(token);
-      return i >= 0 && PROMPT_RE.test(cleaned.slice(i));
-    })).text;
+    const out = (await response).text;
     return classifyPrompt(out);
   }
   extractOutput(raw, command) {
@@ -10401,6 +10408,11 @@ class SafeModeManager2 {
           pastEcho = true;
         continue;
       }
+      if (stripped.endsWith(command.trim())) {
+        const prefix = stripped.slice(0, -command.trim().length).trimEnd();
+        if (PROMPT_RE.test(prefix))
+          continue;
+      }
       if (PROMPT_RE.test(stripped))
         break;
       result.push(line);
@@ -23012,7 +23024,7 @@ var cache2 = null;
 async function gateway() {
   if (cache2)
     return cache2;
-  const { moduleCatalog } = await import("./library-cv5qe3zh.js");
+  const { moduleCatalog } = await import("./library-drn9gmjm.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -44990,7 +45002,7 @@ var riskByTool = null;
 async function riskIndex() {
   if (riskByTool)
     return riskByTool;
-  const { moduleCatalog } = await import("./library-cv5qe3zh.js");
+  const { moduleCatalog } = await import("./library-drn9gmjm.js");
   const index = new Map;
   for (const mod of moduleCatalog) {
     for (const tool of mod.tools)