@takodotid/circuit 0.34.1 → 0.34.3

package/dist/cli/index.js

@@ -5601,7 +5601,15 @@ async function consoleShell(device) {
 async function read3(device, _network = [], options = {}) {
   const { channel, close } = await open(device, options);
   try {
-    const dump = await send(channel, "show running-config", 150000, 6000);
+    let dump = "";
+    for (let attempt = 1;; attempt++) {
+      dump = await send(channel, "show running-config", 150000, 6000);
+      if (/[#>]\s*$/.test(dump.replace(/\r/g, "").trimEnd()))
+        break;
+      if (attempt === 3)
+        throw new Error(`${device.name} returned an incomplete configuration three times`);
+      await send(channel, "", 30000, 6000);
+    }
     const lines = dump.replace(/\r/g, "").split(`
 `);
     const start = lines.findIndex((line) => line.trim().startsWith("!ROS version"));
@@ -6139,6 +6147,7 @@ var ORDER = [
   "/snmp",
   "/tool",
   "/user",
+  "/system logging action",
   "/system"
 ];
 function rank(menu) {
@@ -7779,7 +7788,8 @@ var DEVICE_FACTS3 = [
   "authorization-scheme default",
   "accounting-scheme default",
   "domain default",
-  "Info:"
+  "Info:",
+  "snmp-agent local-engineid"
 ];
 var UNDO_BY_KEYWORD2 = /^(description|name|port default vlan|port link-type|port trunk pvid vlan|set authentication password|eth-trunk|ip binding vpn-instance|ssh server cipher|ssh server hmac|ssh server key-exchange)\b/;
 function undo2(line) {
@@ -8170,6 +8180,7 @@ function snmp4(config, device) {
     config.line("snmp-agent mib-view included all iso");
     config.line(`snmp-agent group v3 ${SNMP_GROUP3} privacy read-view all${guarded ? ` acl ${MANAGEMENT_ACL2}` : ""}`);
     for (const [name, user] of Object.entries(snmp.users)) {
+      config.line(`snmp-agent usm-user v3 ${name}`);
       config.line(`snmp-agent usm-user v3 ${name} group ${SNMP_GROUP3}`);
       config.line(`snmp-agent usm-user v3 ${name} authentication-mode ${SNMP_AUTH4[user.auth]} cipher ${marker(user.auth_password)}`);
       config.line(`snmp-agent usm-user v3 ${name} privacy-mode ${SNMP_PRIVACY3[user.privacy]} cipher ${marker(user.privacy_password)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@takodotid/circuit",
-    "version": "0.34.1",
+    "version": "0.34.3",
     "description": "Declarative, vendor-neutral network configuration: describe each device in TypeScript, and Circuit makes the device match. Alpha.",
     "keywords": [
         "network",

package/src/adapters/devices/raisecom-ros/TRAPS.md

@@ -23,3 +23,4 @@ Behaviour that looks like something else. Each one has been hit on a RAX721 runn
 - OSPF settings for an interface sit on the interface, `ip ospf cost`, `ip ospf network ptp`, `ip ospf passive-interface enable`; passive is undone with `... disable`, not `no`.
 - `create vlan <list> active` has every VLAN on one line. A change creates only the new VLANs and removes each one that is gone with `no vlan <id>`.
 - An access-list rule is not replaced by one with the same number: the device answers `Set unsuccessfully.` and keeps the old rule. The old one is removed first. `no rule N` answers slowly, after a second or more.
+- `show running-config` can stop partway even with paging off and six seconds of silence, with no error: on 2026-10-23 three reads of an RAX721 in a row gave plans of 62, 0 and 158 commands against an unchanged switch. A dump that does not end at the prompt is read again, and after three the read fails rather than planning against a part.

package/src/adapters/devices/raisecom-ros/index.ts

@@ -398,8 +398,15 @@ export async function read(device: Device, _network: readonly Device[] = [], opt
     const { channel, close } = await open(device, options);
 
     try {
-        // Without paging off and a long wait for silence, the dump stops halfway with no error.
-        const dump = await send(channel, "show running-config", 150_000, 6000);
+        // Without paging off and a long wait for silence, the dump stops halfway with no error. Even then a pause of the device's own can end it early: a complete dump ends at the prompt, and one that does not is read again rather than planned against.
+        let dump = "";
+        for (let attempt = 1; ; attempt++) {
+            dump = await send(channel, "show running-config", 150_000, 6000);
+            if (/[#>]\s*$/.test(dump.replace(/\r/g, "").trimEnd())) break;
+            if (attempt === 3) throw new Error(`${device.name} returned an incomplete configuration three times`);
+            // What the device still prints of the cut dump ends before the next one starts.
+            await send(channel, "", 30_000, 6000);
+        }
         const lines = dump.replace(/\r/g, "").split("\n");
         const start = lines.findIndex((line) => line.trim().startsWith("!ROS version"));
         if (start < 0) throw new Error(`${device.name} returned no configuration`);

package/src/adapters/devices/routeros/TRAPS.md

@@ -46,3 +46,4 @@ Behaviour that looks like something else. Each one has been hit on a real device
 - A second VLAN interface with the same VLAN ID on the same interface is refused, `already have such vlan`, so a VLAN interface is known by its interface and VLAN ID, and a new name is a rename.
 - A switch rule the chip cannot hold is flagged `I`, invalid, and every rule after it is invalid too, with no log line. On a CCR2216 (98DX8525, 7.23) it came at the sixth distinct `dst-port` range, with 66 rules in all, far below the 1,024 MikroTik lists: the amplifier drops toward every VLAN after it did nothing. Few distinct ranges, and check `print count-only where invalid` after an apply.
 - A MACVLAN on a VLAN interface is not routed in the switch chip: its connected route never takes the `H` flag, even with `l3-hw-offloading=yes` on the VLAN under it.
+- A `/system logging` rule naming an action that does not exist yet is refused, `input does not match any value of action`, and `:parse` does not catch it. The action is added first; seen on a CCR2216 on 7.23.5, where the refusal restored the backup.

package/src/adapters/devices/routeros/plan.ts

@@ -48,6 +48,8 @@ const ORDER = [
     "/snmp",
     "/tool",
     "/user",
+    // A logging rule names its action, so the action exists first.
+    "/system logging action",
     "/system",
 ];
 

package/src/adapters/devices/vrp/TRAPS.md

@@ -23,3 +23,4 @@ Behaviour that looks like something else. Each one has been hit on a CE6855 runn
 - A VLAN name is unique across VLANs: a new VLAN cannot take a name another still has. VLANs no longer used, and their VLAN interfaces, are removed first, in the same candidate.
 - `undo ssh server key-exchange <algorithms>` is refused with "Too many parameters"; `undo ssh server key-exchange` takes none. `hmac` was proved the same way. `cipher` is undone the same way but was not proved on its own.
 - A console on a password only (`passwordOnly`) shows `Please Press ENTER.` after a logout or a refused password, and `Error: The password is invalid.` for a wrong one.
+- Once SNMP is on, the switch prints an engine ID of its own, `snmp-agent local-engineid`, derived from its MAC, and prints each SNMPv3 user as a bare `snmp-agent usm-user v3 <name>` line before its settings. Planning against either as unrendered would undo the user; seen on a CE6855 on V200R005C00SPC800.

package/src/adapters/devices/vrp/index.ts

@@ -33,6 +33,8 @@ const DEVICE_FACTS = [
     "accounting-scheme default",
     "domain default",
     "Info:",
+    // Derived from the switch's MAC once SNMP is on.
+    "snmp-agent local-engineid",
 ];
 
 /** Lines whose removal takes only their keyword, not their value. */
@@ -493,6 +495,8 @@ function snmp(config: Config, device: Device): void {
         config.line(`snmp-agent group v3 ${SNMP_GROUP} privacy read-view all${guarded ? ` acl ${MANAGEMENT_ACL}` : ""}`);
 
         for (const [name, user] of Object.entries(snmp.users)) {
+            // The switch prints a user's own line before its settings.
+            config.line(`snmp-agent usm-user v3 ${name}`);
             config.line(`snmp-agent usm-user v3 ${name} group ${SNMP_GROUP}`);
             config.line(`snmp-agent usm-user v3 ${name} authentication-mode ${SNMP_AUTH[user.auth]} cipher ${marker(user.auth_password)}`);
             config.line(