@usex/mikrotik-mcp 3.21.0 → 3.22.0

package/dist/cli.js

@@ -894,31 +894,39 @@ class SafeModeManager {
   }
   commit() {
     return this.lock(async () => {
-      if (!this.active || !this.channel)
-        return "Safe mode is not active. Nothing to commit.";
-      this.channel.write(`
-`);
-      const probe = await this.readSettledPrompt();
-      const before = classifyPrompt(probe);
+      if (!this.active || !this.channel) {
+        return { ok: true, message: "Safe mode is not active. Nothing to commit." };
+      }
+      const before = await this.probeMode();
       if (before === "released") {
         this.cleanup();
-        return "Safe mode already exited \u2014 your changes are committed. Safe mode DISABLED.";
+        return {
+          ok: true,
+          message: "Safe mode already exited \u2014 your changes are committed. Safe mode DISABLED."
+        };
       }
       if (before === "unknown") {
-        return "Could not read a prompt to determine Safe Mode state. The session is left open so " + "nothing is reverted \u2014 call get_safe_mode_status, retry commit_safe_mode, or " + `rollback_safe_mode. Last output: ${probe.slice(-160)}`;
+        return {
+          ok: false,
+          message: "Could not read a prompt to determine Safe Mode state. The session is left open so " + "nothing is reverted \u2014 call get_safe_mode_status, retry commit_safe_mode, or rollback_safe_mode."
+        };
       }
       this.channel.write(CTRL_X);
-      this.channel.write(`
-`);
-      const after = await this.readSettledPrompt();
-      switch (classifyPrompt(after)) {
+      const after = await this.probeMode();
+      switch (after) {
         case "released":
           this.cleanup();
-          return "Changes committed successfully. Safe mode DISABLED.";
+          return { ok: true, message: "Changes committed successfully. Safe mode DISABLED." };
         case "safe":
-          return "Commit not completed \u2014 the device is still in Safe Mode. Your changes remain held " + "in memory (not reverted); call commit_safe_mode again to retry, or rollback_safe_mode " + "to discard them.";
+          return {
+            ok: false,
+            message: "Commit NOT completed \u2014 the device is still in Safe Mode (the Ctrl+X commit did not " + "take). Your changes remain held in memory and are NOT yet saved; call commit_safe_mode " + "again to retry, or rollback_safe_mode to discard them. If retries keep failing, this " + "RouterOS build may not accept an interactive Safe Mode commit over SSH \u2014 apply the " + "change without Safe Mode instead."
+          };
         default:
-          return "Commit status unclear \u2014 no prompt seen after exiting Safe Mode. The session is left " + "open so nothing is reverted; verify with get_safe_mode_status or retry commit_safe_mode. " + `Last output: ${after.slice(-160)}`;
+          return {
+            ok: false,
+            message: "Commit status unclear \u2014 no prompt seen after the commit. The session is left open so " + "nothing is reverted; verify with get_safe_mode_status or retry commit_safe_mode."
+          };
       }
     });
   }
@@ -955,32 +963,17 @@ class SafeModeManager {
       channel.on("data", onData);
     });
   }
-  readSettledPrompt(quietMs = 450, maxMs = 8000) {
-    const channel = this.channel;
-    if (!channel)
-      return Promise.resolve("");
-    return new Promise((resolve2) => {
-      let buf = "";
-      let quiet;
-      let hard;
-      function done() {
-        clearTimeout(hard);
-        if (quiet)
-          clearTimeout(quiet);
-        channel.removeListener("data", onData);
-        resolve2(stripAnsi(buf));
-      }
-      function onData(chunk) {
-        buf += decodeOutput(chunk);
-        if (PROMPT_RE.test(lastNonEmptyLine(stripAnsi(buf)))) {
-          if (quiet)
-            clearTimeout(quiet);
-          quiet = setTimeout(done, quietMs);
-        }
-      }
-      hard = setTimeout(done, maxMs);
-      channel.on("data", onData);
+  async probeMode() {
+    if (!this.channel)
+      return "unknown";
+    const token = "__MCP_SAFEMODE_PROBE__";
+    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));
     });
+    return classifyPrompt(out);
   }
   extractOutput(raw, command) {
     const text = raw.replace(/\r\n/g, `
@@ -2632,11 +2625,19 @@ async function restoreLocalBackup(device, name, confirm) {
       return fail("device stopped responding after applying \u2014 rolled back to avoid a lock-out", applied);
     }
     const committed = await safe.commit();
+    if (!committed.ok) {
+      return {
+        ok: false,
+        applied,
+        committed: false,
+        message: `applied ${applied} command(s) but COMMIT FAILED \u2014 not saved: ${committed.message}`
+      };
+    }
     return {
       ok: true,
       applied,
       committed: true,
-      message: `committed ${applied} command(s). ${committed}`
+      message: `committed ${applied} command(s). ${committed.message}`
     };
   } catch (e) {
     await safe.rollback();
@@ -3870,9 +3871,14 @@ DRY-RUN: all changes rolled back. Re-run with confirm=true to commit.`;
 ABORTED: the device stopped responding after applying \u2014 changes rolled back to avoid a lock-out.`;
         }
         const committed = await safe.commit();
+        if (!committed.ok) {
+          return `${header}
+
+COMMIT FAILED \u2014 changes are NOT saved (still pending in Safe Mode). ` + `${committed.message}`;
+        }
         return `${header}
 
-COMMITTED: changes are now permanent. ${committed}`;
+COMMITTED: changes are now permanent. ${committed.message}`;
       } catch (e) {
         await safe.rollback();
         const msg = e instanceof Error ? e.message : String(e);
@@ -5935,8 +5941,12 @@ ${useSafe ? "Safe Mode rolled back \u2014 no changes kept." : "Partial rules rem
         }
         done.push(cmd);
       }
-      if (useSafe)
-        await mgr.commit();
+      if (useSafe) {
+        const c = await mgr.commit();
+        if (!c.ok) {
+          return `Applied ${done.length} rule(s) but Safe Mode COMMIT FAILED \u2014 changes are NOT saved ` + `and will revert: ${c.message}`;
+        }
+      }
       return `Security Shield applied \u2014 ${done.length} rule(s) across ${groups.length} protection(s)${useSafe ? " (committed via Safe Mode)" : ""}. Audit with audit_firewall_hardening; undo with remove_firewall_hardening.`;
     }
   }),
@@ -17583,7 +17593,7 @@ var safeModeTools = [
     async handler(_a, ctx) {
       const device = resolveDeviceName(ctx.device);
       ctx.info(`[${device}] Committing safe mode changes`);
-      return getSafeModeManager(device).commit();
+      return (await getSafeModeManager(device).commit()).message;
     }
   }),
   defineTool({
@@ -23951,7 +23961,7 @@ function registerPrompts(server) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.21.0",
+  version: "3.22.0",
   description: "MCP server for MikroTik RouterOS \u2014 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   keywords: [
     "ai",

package/dist/index.d.ts

@@ -163,6 +163,16 @@ declare class MikroTikSSHClient {
 	/** Close the SSH connection. Safe to call multiple times. */
 	disconnect(): void;
 }
+/**
+* Outcome of {@link SafeModeManager.commit}. `ok` is true ONLY when Safe Mode is
+* confirmed exited (changes persisted) — callers must check it before telling
+* the user anything was committed, so a failed commit can never masquerade as a
+* success that then silently reverts.
+*/
+interface CommitResult {
+	ok: boolean;
+	message: string;
+}
 declare class SafeModeManager {
 	private readonly deviceName;
 	private ssh;
@@ -179,8 +189,12 @@ declare class SafeModeManager {
 	enable(): Promise<string>;
 	/** Execute a command through the safe-mode persistent shell session. */
 	execute(command: string): Promise<string>;
-	/** Send Ctrl+X again to exit Safe Mode and persist all changes. */
-	commit(): Promise<string>;
+	/**
+	* Send Ctrl+X again to exit Safe Mode and persist all changes. Returns a
+	* structured result so callers NEVER report "committed" on a failed commit —
+	* `ok` is true only when Safe Mode is confirmed exited (changes saved).
+	*/
+	commit(): Promise<CommitResult>;
 	/** Close the session to trigger MikroTik's automatic safe-mode revert. */
 	rollback(): Promise<string>;
 	status(): string;
@@ -192,13 +206,14 @@ declare class SafeModeManager {
 	*/
 	private readUntilPrompt;
 	/**
-	* Read until the output SETTLES: once any prompt is visible, wait for a quiet
-	* gap (`quietMs` with no new bytes) before resolving, or give up at `maxMs`.
-	* Used by commit, where Ctrl+X + Enter can emit a transient `<SAFE>` redraw
-	* followed by the real post-commit prompt — settling on the LAST prompt after
-	* a quiet period is what makes mode detection reliable.
+	* Determine the shell's CURRENT mode definitively by round-tripping a sentinel
+	* command (`:put "<token>"`) and classifying the prompt that follows ITS
+	* output. A real command — not a bare Enter — forces RouterOS to fully process
+	* any pending Ctrl+X and render a prompt that reflects the true mode, so we
+	* never settle on a transient `<SAFE>`→normal redraw and report a commit that
+	* did not actually take. Returns `safe`, `released`, or `unknown` (no prompt).
 	*/
-	private readSettledPrompt;
+	private probeMode;
 	private extractOutput;
 	private cleanup;
 }

package/dist/index.js

@@ -880,31 +880,39 @@ class SafeModeManager {
   }
   commit() {
     return this.lock(async () => {
-      if (!this.active || !this.channel)
-        return "Safe mode is not active. Nothing to commit.";
-      this.channel.write(`
-`);
-      const probe = await this.readSettledPrompt();
-      const before = classifyPrompt(probe);
+      if (!this.active || !this.channel) {
+        return { ok: true, message: "Safe mode is not active. Nothing to commit." };
+      }
+      const before = await this.probeMode();
       if (before === "released") {
         this.cleanup();
-        return "Safe mode already exited \u2014 your changes are committed. Safe mode DISABLED.";
+        return {
+          ok: true,
+          message: "Safe mode already exited \u2014 your changes are committed. Safe mode DISABLED."
+        };
       }
       if (before === "unknown") {
-        return "Could not read a prompt to determine Safe Mode state. The session is left open so " + "nothing is reverted \u2014 call get_safe_mode_status, retry commit_safe_mode, or " + `rollback_safe_mode. Last output: ${probe.slice(-160)}`;
+        return {
+          ok: false,
+          message: "Could not read a prompt to determine Safe Mode state. The session is left open so " + "nothing is reverted \u2014 call get_safe_mode_status, retry commit_safe_mode, or rollback_safe_mode."
+        };
       }
       this.channel.write(CTRL_X);
-      this.channel.write(`
-`);
-      const after = await this.readSettledPrompt();
-      switch (classifyPrompt(after)) {
+      const after = await this.probeMode();
+      switch (after) {
         case "released":
           this.cleanup();
-          return "Changes committed successfully. Safe mode DISABLED.";
+          return { ok: true, message: "Changes committed successfully. Safe mode DISABLED." };
         case "safe":
-          return "Commit not completed \u2014 the device is still in Safe Mode. Your changes remain held " + "in memory (not reverted); call commit_safe_mode again to retry, or rollback_safe_mode " + "to discard them.";
+          return {
+            ok: false,
+            message: "Commit NOT completed \u2014 the device is still in Safe Mode (the Ctrl+X commit did not " + "take). Your changes remain held in memory and are NOT yet saved; call commit_safe_mode " + "again to retry, or rollback_safe_mode to discard them. If retries keep failing, this " + "RouterOS build may not accept an interactive Safe Mode commit over SSH \u2014 apply the " + "change without Safe Mode instead."
+          };
         default:
-          return "Commit status unclear \u2014 no prompt seen after exiting Safe Mode. The session is left " + "open so nothing is reverted; verify with get_safe_mode_status or retry commit_safe_mode. " + `Last output: ${after.slice(-160)}`;
+          return {
+            ok: false,
+            message: "Commit status unclear \u2014 no prompt seen after the commit. The session is left open so " + "nothing is reverted; verify with get_safe_mode_status or retry commit_safe_mode."
+          };
       }
     });
   }
@@ -941,32 +949,17 @@ class SafeModeManager {
       channel.on("data", onData);
     });
   }
-  readSettledPrompt(quietMs = 450, maxMs = 8000) {
-    const channel = this.channel;
-    if (!channel)
-      return Promise.resolve("");
-    return new Promise((resolve2) => {
-      let buf = "";
-      let quiet;
-      let hard;
-      function done() {
-        clearTimeout(hard);
-        if (quiet)
-          clearTimeout(quiet);
-        channel.removeListener("data", onData);
-        resolve2(stripAnsi(buf));
-      }
-      function onData(chunk) {
-        buf += decodeOutput(chunk);
-        if (PROMPT_RE.test(lastNonEmptyLine(stripAnsi(buf)))) {
-          if (quiet)
-            clearTimeout(quiet);
-          quiet = setTimeout(done, quietMs);
-        }
-      }
-      hard = setTimeout(done, maxMs);
-      channel.on("data", onData);
+  async probeMode() {
+    if (!this.channel)
+      return "unknown";
+    const token = "__MCP_SAFEMODE_PROBE__";
+    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));
     });
+    return classifyPrompt(out);
   }
   extractOutput(raw, command) {
     const text = raw.replace(/\r\n/g, `
@@ -2644,11 +2637,19 @@ async function restoreLocalBackup(device, name, confirm) {
       return fail("device stopped responding after applying \u2014 rolled back to avoid a lock-out", applied);
     }
     const committed = await safe.commit();
+    if (!committed.ok) {
+      return {
+        ok: false,
+        applied,
+        committed: false,
+        message: `applied ${applied} command(s) but COMMIT FAILED \u2014 not saved: ${committed.message}`
+      };
+    }
     return {
       ok: true,
       applied,
       committed: true,
-      message: `committed ${applied} command(s). ${committed}`
+      message: `committed ${applied} command(s). ${committed.message}`
     };
   } catch (e) {
     await safe.rollback();
@@ -3882,9 +3883,14 @@ DRY-RUN: all changes rolled back. Re-run with confirm=true to commit.`;
 ABORTED: the device stopped responding after applying \u2014 changes rolled back to avoid a lock-out.`;
         }
         const committed = await safe.commit();
+        if (!committed.ok) {
+          return `${header}
+
+COMMIT FAILED \u2014 changes are NOT saved (still pending in Safe Mode). ` + `${committed.message}`;
+        }
         return `${header}
 
-COMMITTED: changes are now permanent. ${committed}`;
+COMMITTED: changes are now permanent. ${committed.message}`;
       } catch (e) {
         await safe.rollback();
         const msg = e instanceof Error ? e.message : String(e);
@@ -5947,8 +5953,12 @@ ${useSafe ? "Safe Mode rolled back \u2014 no changes kept." : "Partial rules rem
         }
         done.push(cmd);
       }
-      if (useSafe)
-        await mgr.commit();
+      if (useSafe) {
+        const c = await mgr.commit();
+        if (!c.ok) {
+          return `Applied ${done.length} rule(s) but Safe Mode COMMIT FAILED \u2014 changes are NOT saved ` + `and will revert: ${c.message}`;
+        }
+      }
       return `Security Shield applied \u2014 ${done.length} rule(s) across ${groups.length} protection(s)${useSafe ? " (committed via Safe Mode)" : ""}. Audit with audit_firewall_hardening; undo with remove_firewall_hardening.`;
     }
   }),
@@ -17595,7 +17605,7 @@ var safeModeTools = [
     async handler(_a, ctx) {
       const device = resolveDeviceName(ctx.device);
       ctx.info(`[${device}] Committing safe mode changes`);
-      return getSafeModeManager(device).commit();
+      return (await getSafeModeManager(device).commit()).message;
     }
   }),
   defineTool({
@@ -22351,7 +22361,7 @@ function selectToolModules(filter = {}, catalog = moduleCatalog) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.21.0",
+  version: "3.22.0",
   description: "MCP server for MikroTik RouterOS \u2014 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   keywords: [
     "ai",

package/package.json

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