@sourcegraph/amp 0.0.1749556889-gbc568f → 0.0.1749585689-g82b91d

package/dist/{main-D7eRgs3E.js → main-CiUaVPC2.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { O as qe, s as $r, c as bh, a as _r, b as ti, f as Ue, d as Nt, p as Ft, m as Ee, e as Wn, g as wr, h as qt, i as mp, j as wh, o as ue, l as we, k as oe, n as re, q as be, r as Ge, t as Ke, u as He, v as ni, w as ot, x as _h, y as gp, z as ii, A as vp, M as Je, B as Sh, C as J, N as Hn, D as ai, E as Jr, F as Rs, G as yp, H as bp, I as xs, J as wp, K as Eh, L as _p, P as cl, Q as jt, R as Sp, S as Ep, T as Pp, U as Cp, V as Tp, W as Rp, X as xp, Y as Op, Z as Ap, _ as Lp, $ as Ip, a0 as $p, a1 as Dp, a2 as Mp, a3 as kp, a4 as Fp, a5 as qp, a6 as jp, a7 as Np, a8 as Ph, a9 as Up, aa as Gn, ab as Hp, ac as Bp, ad as zp, ae as st, af as Vp, ag as Wp, ah as Ch, ai as Ct, aj as ss, ak as ls, al as Yr, am as Gp, an as Kp, ao as Jp, ap as Yp, aq as Os, ar as Si, as as As, at as jr, au as us, av as Qp, aw as Zp, ax as fl, ay as Xp, az as em, aA as cs, aB as Th, aC as rm } from "./console-DMpfGJFj.js";
+import { O as qe, s as $r, c as bh, a as _r, b as ti, f as Ue, d as Nt, p as Ft, m as Ee, e as Wn, g as wr, h as qt, i as mp, j as wh, o as ue, l as we, k as oe, n as re, q as be, r as Ge, t as Ke, u as He, v as ni, w as ot, x as _h, y as gp, z as ii, A as vp, M as Je, B as Sh, C as J, N as Hn, D as ai, E as Jr, F as Rs, G as yp, H as bp, I as xs, J as wp, K as Eh, L as _p, P as cl, Q as jt, R as Sp, S as Ep, T as Pp, U as Cp, V as Tp, W as Rp, X as xp, Y as Op, Z as Ap, _ as Lp, $ as Ip, a0 as $p, a1 as Dp, a2 as Mp, a3 as kp, a4 as Fp, a5 as qp, a6 as jp, a7 as Np, a8 as Ph, a9 as Up, aa as Gn, ab as Hp, ac as Bp, ad as zp, ae as st, af as Vp, ag as Wp, ah as Ch, ai as Ct, aj as ss, ak as ls, al as Yr, am as Gp, an as Kp, ao as Jp, ap as Yp, aq as Os, ar as Si, as as As, at as jr, au as us, av as Qp, aw as Zp, ax as fl, ay as Xp, az as em, aA as cs, aB as Th, aC as rm } from "./console-DK0gDzNQ.js";
 import * as tm from "node:fs/promises";
 import nt, { readdir as Rh, stat as xh, readFile as Or, mkdir as Kn, writeFile as Lt, unlink as nm, readlink as im, open as am } from "node:fs/promises";
 import * as om from "node:path";
 import ge, { join as Ve, dirname as hl } from "node:path";
-import { i as dl, F as Ei, f as cr, a as sm, s as lm } from "./client-jPIT0xZX.js";
+import { i as dl, F as Ei, f as cr, a as sm, s as lm } from "./client-C1WG2nEf.js";
 import Ls from "node:events";
 import * as um from "node:child_process";
 import cm, { execFile as Oh, spawn as oi, exec as Nr } from "node:child_process";
@@ -18,7 +18,7 @@ import Sm, { createGzip as Em } from "node:zlib";
 import Pm from "node:string_decoder";
 import Cm, { createServer as Ah } from "node:http";
 import Tm from "node:https";
-import { r as Rm } from "./executable-DHpRbG2D.js";
+import { r as Rm } from "./executable-5cBRGrsC.js";
 import { pipeline as xm } from "node:stream/promises";
 import { lookup as Om } from "node:dns";
 const Ir = Symbol.for("@@pendingOperation");
@@ -1146,8 +1146,8 @@ function Ag() {
       i(e);
     })(Og, function(n) {
       function i() {
-        for (var H = arguments.length, N = Array(H), V = 0; V < H; V++)
-          N[V] = arguments[V];
+        for (var H = arguments.length, N = Array(H), z = 0; z < H; z++)
+          N[z] = arguments[z];
         if (N.length > 1) {
           N[0] = N[0].slice(0, -1);
           for (var Q = N.length - 1, Y = 1; Y < Q; ++Y)
@@ -1169,20 +1169,20 @@ function Ag() {
         return H != null ? H instanceof Array ? H : typeof H.length != "number" || H.split || H.setInterval || H.call ? [H] : Array.prototype.slice.call(H) : [];
       }
       function s(H, N) {
-        var V = H;
+        var z = H;
         if (N)
           for (var Q in N)
-            V[Q] = N[Q];
-        return V;
+            z[Q] = N[Q];
+        return z;
       }
       function c(H) {
-        var N = "[A-Za-z]", V = "[0-9]", Q = i(V, "[A-Fa-f]"), Y = r(r("%[EFef]" + Q + "%" + Q + Q + "%" + Q + Q) + "|" + r("%[89A-Fa-f]" + Q + "%" + Q + Q) + "|" + r("%" + Q + Q)), ce = "[\\:\\/\\?\\#\\[\\]\\@]", fe = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", _e = i(ce, fe), xe = H ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", De = H ? "[\\uE000-\\uF8FF]" : "[]", ye = i(N, V, "[\\-\\.\\_\\~]", xe);
-        r(N + i(N, V, "[\\+\\-\\.]") + "*"), r(r(Y + "|" + i(ye, fe, "[\\:]")) + "*");
-        var Ce = r(r("25[0-5]") + "|" + r("2[0-4]" + V) + "|" + r("1" + V + V) + "|" + r("0?[1-9]" + V) + "|0?0?" + V), Me = r(Ce + "\\." + Ce + "\\." + Ce + "\\." + Ce), pe = r(Q + "{1,4}"), Oe = r(r(pe + "\\:" + pe) + "|" + Me), ke = r(r(pe + "\\:") + "{6}" + Oe), Ae = r("\\:\\:" + r(pe + "\\:") + "{5}" + Oe), Cr = r(r(pe) + "?\\:\\:" + r(pe + "\\:") + "{4}" + Oe), or = r(r(r(pe + "\\:") + "{0,1}" + pe) + "?\\:\\:" + r(pe + "\\:") + "{3}" + Oe), sr = r(r(r(pe + "\\:") + "{0,2}" + pe) + "?\\:\\:" + r(pe + "\\:") + "{2}" + Oe), Vr = r(r(r(pe + "\\:") + "{0,3}" + pe) + "?\\:\\:" + pe + "\\:" + Oe), Fr = r(r(r(pe + "\\:") + "{0,4}" + pe) + "?\\:\\:" + Oe), Xe = r(r(r(pe + "\\:") + "{0,5}" + pe) + "?\\:\\:" + pe), lr = r(r(r(pe + "\\:") + "{0,6}" + pe) + "?\\:\\:"), qr = r([ke, Ae, Cr, or, sr, Vr, Fr, Xe, lr].join("|")), gr = r(r(ye + "|" + Y) + "+");
+        var N = "[A-Za-z]", z = "[0-9]", Q = i(z, "[A-Fa-f]"), Y = r(r("%[EFef]" + Q + "%" + Q + Q + "%" + Q + Q) + "|" + r("%[89A-Fa-f]" + Q + "%" + Q + Q) + "|" + r("%" + Q + Q)), ce = "[\\:\\/\\?\\#\\[\\]\\@]", fe = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]", _e = i(ce, fe), xe = H ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]", De = H ? "[\\uE000-\\uF8FF]" : "[]", ye = i(N, z, "[\\-\\.\\_\\~]", xe);
+        r(N + i(N, z, "[\\+\\-\\.]") + "*"), r(r(Y + "|" + i(ye, fe, "[\\:]")) + "*");
+        var Ce = r(r("25[0-5]") + "|" + r("2[0-4]" + z) + "|" + r("1" + z + z) + "|" + r("0?[1-9]" + z) + "|0?0?" + z), Me = r(Ce + "\\." + Ce + "\\." + Ce + "\\." + Ce), pe = r(Q + "{1,4}"), Oe = r(r(pe + "\\:" + pe) + "|" + Me), ke = r(r(pe + "\\:") + "{6}" + Oe), Ae = r("\\:\\:" + r(pe + "\\:") + "{5}" + Oe), Cr = r(r(pe) + "?\\:\\:" + r(pe + "\\:") + "{4}" + Oe), or = r(r(r(pe + "\\:") + "{0,1}" + pe) + "?\\:\\:" + r(pe + "\\:") + "{3}" + Oe), sr = r(r(r(pe + "\\:") + "{0,2}" + pe) + "?\\:\\:" + r(pe + "\\:") + "{2}" + Oe), Vr = r(r(r(pe + "\\:") + "{0,3}" + pe) + "?\\:\\:" + pe + "\\:" + Oe), Fr = r(r(r(pe + "\\:") + "{0,4}" + pe) + "?\\:\\:" + Oe), Xe = r(r(r(pe + "\\:") + "{0,5}" + pe) + "?\\:\\:" + pe), lr = r(r(r(pe + "\\:") + "{0,6}" + pe) + "?\\:\\:"), qr = r([ke, Ae, Cr, or, sr, Vr, Fr, Xe, lr].join("|")), gr = r(r(ye + "|" + Y) + "+");
         r("[vV]" + Q + "+\\." + i(ye, fe, "[\\:]") + "+"), r(r(Y + "|" + i(ye, fe)) + "*");
         var yt = r(Y + "|" + i(ye, fe, "[\\:\\@]"));
         return r(r(Y + "|" + i(ye, fe, "[\\@]")) + "+"), r(r(yt + "|" + i("[\\/\\?]", De)) + "*"), {
-          NOT_SCHEME: new RegExp(i("[^]", N, V, "[\\+\\-\\.]"), "g"),
+          NOT_SCHEME: new RegExp(i("[^]", N, z, "[\\+\\-\\.]"), "g"),
           NOT_USERINFO: new RegExp(i("[^\\%\\:]", ye, fe), "g"),
           NOT_HOST: new RegExp(i("[^\\%\\[\\]\\:]", ye, fe), "g"),
           NOT_PATH: new RegExp(i("[^\\%\\/\\:\\@]", ye, fe), "g"),
@@ -1199,10 +1199,10 @@ function Ag() {
         };
       }
       var f = c(!1), y = c(!0), g = /* @__PURE__ */ function() {
-        function H(N, V) {
+        function H(N, z) {
           var Q = [], Y = !0, ce = !1, fe = void 0;
           try {
-            for (var _e = N[Symbol.iterator](), xe; !(Y = (xe = _e.next()).done) && (Q.push(xe.value), !(V && Q.length === V)); Y = !0)
+            for (var _e = N[Symbol.iterator](), xe; !(Y = (xe = _e.next()).done) && (Q.push(xe.value), !(z && Q.length === z)); Y = !0)
               ;
           } catch (De) {
             ce = !0, fe = De;
@@ -1215,17 +1215,17 @@ function Ag() {
           }
           return Q;
         }
-        return function(N, V) {
+        return function(N, z) {
           if (Array.isArray(N))
             return N;
           if (Symbol.iterator in Object(N))
-            return H(N, V);
+            return H(N, z);
           throw new TypeError("Invalid attempt to destructure non-iterable instance");
         };
       }(), d = function(H) {
         if (Array.isArray(H)) {
-          for (var N = 0, V = Array(H.length); N < H.length; N++) V[N] = H[N];
-          return V;
+          for (var N = 0, z = Array(H.length); N < H.length; N++) z[N] = H[N];
+          return z;
         } else
           return Array.from(H);
       }, p = 2147483647, m = 36, v = 1, l = 26, h = 38, b = 700, w = 72, _ = 128, A = "-", P = /^xn--/, T = /[^\0-\x7E]/, R = /[\x2E\u3002\uFF0E\uFF61]/g, x = {
@@ -1237,22 +1237,22 @@ function Ag() {
         throw new RangeError(x[H]);
       }
       function $(H, N) {
-        for (var V = [], Q = H.length; Q--; )
-          V[Q] = N(H[Q]);
-        return V;
+        for (var z = [], Q = H.length; Q--; )
+          z[Q] = N(H[Q]);
+        return z;
       }
       function L(H, N) {
-        var V = H.split("@"), Q = "";
-        V.length > 1 && (Q = V[0] + "@", H = V[1]), H = H.replace(R, ".");
+        var z = H.split("@"), Q = "";
+        z.length > 1 && (Q = z[0] + "@", H = z[1]), H = H.replace(R, ".");
         var Y = H.split("."), ce = $(Y, N).join(".");
         return Q + ce;
       }
       function k(H) {
-        for (var N = [], V = 0, Q = H.length; V < Q; ) {
-          var Y = H.charCodeAt(V++);
-          if (Y >= 55296 && Y <= 56319 && V < Q) {
-            var ce = H.charCodeAt(V++);
-            (ce & 64512) == 56320 ? N.push(((Y & 1023) << 10) + (ce & 1023) + 65536) : (N.push(Y), V--);
+        for (var N = [], z = 0, Q = H.length; z < Q; ) {
+          var Y = H.charCodeAt(z++);
+          if (Y >= 55296 && Y <= 56319 && z < Q) {
+            var ce = H.charCodeAt(z++);
+            (ce & 64512) == 56320 ? N.push(((Y & 1023) << 10) + (ce & 1023) + 65536) : (N.push(Y), z--);
           } else
             N.push(Y);
         }
@@ -1262,12 +1262,12 @@ function Ag() {
         return String.fromCodePoint.apply(String, d(N));
       }, F = function(N) {
         return N - 48 < 10 ? N - 22 : N - 65 < 26 ? N - 65 : N - 97 < 26 ? N - 97 : m;
-      }, j = function(N, V) {
-        return N + 22 + 75 * (N < 26) - ((V != 0) << 5);
-      }, B = function(N, V, Q) {
+      }, j = function(N, z) {
+        return N + 22 + 75 * (N < 26) - ((z != 0) << 5);
+      }, V = function(N, z, Q) {
         var Y = 0;
         for (
-          N = Q ? S(N / b) : N >> 1, N += S(N / V);
+          N = Q ? S(N / b) : N >> 1, N += S(N / z);
           /* no initialization */
           N > C * l >> 1;
           Y += m
@@ -1275,10 +1275,10 @@ function Ag() {
           N = S(N / C);
         return S(Y + (C + 1) * N / (N + h));
       }, G = function(N) {
-        var V = [], Q = N.length, Y = 0, ce = _, fe = w, _e = N.lastIndexOf(A);
+        var z = [], Q = N.length, Y = 0, ce = _, fe = w, _e = N.lastIndexOf(A);
         _e < 0 && (_e = 0);
         for (var xe = 0; xe < _e; ++xe)
-          N.charCodeAt(xe) >= 128 && E("not-basic"), V.push(N.charCodeAt(xe));
+          N.charCodeAt(xe) >= 128 && E("not-basic"), z.push(N.charCodeAt(xe));
         for (var De = _e > 0 ? _e + 1 : 0; De < Q; ) {
           for (
             var ye = Y, Ce = 1, Me = m;
@@ -1295,18 +1295,18 @@ function Ag() {
             var ke = m - Oe;
             Ce > S(p / ke) && E("overflow"), Ce *= ke;
           }
-          var Ae = V.length + 1;
-          fe = B(Y - ye, Ae, ye == 0), S(Y / Ae) > p - ce && E("overflow"), ce += S(Y / Ae), Y %= Ae, V.splice(Y++, 0, ce);
+          var Ae = z.length + 1;
+          fe = V(Y - ye, Ae, ye == 0), S(Y / Ae) > p - ce && E("overflow"), ce += S(Y / Ae), Y %= Ae, z.splice(Y++, 0, ce);
         }
-        return String.fromCodePoint.apply(String, V);
+        return String.fromCodePoint.apply(String, z);
       }, X = function(N) {
-        var V = [];
+        var z = [];
         N = k(N);
         var Q = N.length, Y = _, ce = 0, fe = w, _e = !0, xe = !1, De = void 0;
         try {
           for (var ye = N[Symbol.iterator](), Ce; !(_e = (Ce = ye.next()).done); _e = !0) {
             var Me = Ce.value;
-            Me < 128 && V.push(D(Me));
+            Me < 128 && z.push(D(Me));
           }
         } catch (bt) {
           xe = !0, De = bt;
@@ -1318,8 +1318,8 @@ function Ag() {
               throw De;
           }
         }
-        var pe = V.length, Oe = pe;
-        for (pe && V.push(A); Oe < Q; ) {
+        var pe = z.length, Oe = pe;
+        for (pe && z.push(A); Oe < Q; ) {
           var ke = p, Ae = !0, Cr = !1, or = void 0;
           try {
             for (var sr = N[Symbol.iterator](), Vr; !(Ae = (Vr = sr.next()).done); Ae = !0) {
@@ -1353,9 +1353,9 @@ function Ag() {
                   if (Gt < Jt)
                     break;
                   var ll = Gt - Jt, ul = m - Jt;
-                  V.push(D(j(Jt + ll % ul, 0))), Gt = S(ll / ul);
+                  z.push(D(j(Jt + ll % ul, 0))), Gt = S(ll / ul);
                 }
-                V.push(D(j(Gt, 0))), fe = B(ce, Xe, Oe == pe), ce = 0, ++Oe;
+                z.push(D(j(Gt, 0))), fe = V(ce, Xe, Oe == pe), ce = 0, ++Oe;
               }
             }
           } catch (bt) {
@@ -1370,14 +1370,14 @@ function Ag() {
           }
           ++ce, ++Y;
         }
-        return V.join("");
+        return z.join("");
       }, W = function(N) {
-        return L(N, function(V) {
-          return P.test(V) ? G(V.slice(4).toLowerCase()) : V;
+        return L(N, function(z) {
+          return P.test(z) ? G(z.slice(4).toLowerCase()) : z;
         });
       }, ne = function(N) {
-        return L(N, function(V) {
-          return T.test(V) ? "xn--" + X(V) : V;
+        return L(N, function(z) {
+          return T.test(z) ? "xn--" + X(z) : z;
         });
       }, O = {
         /**
@@ -1402,50 +1402,50 @@ function Ag() {
         toASCII: ne,
         toUnicode: W
       }, M = {};
-      function z(H) {
-        var N = H.charCodeAt(0), V = void 0;
-        return N < 16 ? V = "%0" + N.toString(16).toUpperCase() : N < 128 ? V = "%" + N.toString(16).toUpperCase() : N < 2048 ? V = "%" + (N >> 6 | 192).toString(16).toUpperCase() + "%" + (N & 63 | 128).toString(16).toUpperCase() : V = "%" + (N >> 12 | 224).toString(16).toUpperCase() + "%" + (N >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (N & 63 | 128).toString(16).toUpperCase(), V;
+      function B(H) {
+        var N = H.charCodeAt(0), z = void 0;
+        return N < 16 ? z = "%0" + N.toString(16).toUpperCase() : N < 128 ? z = "%" + N.toString(16).toUpperCase() : N < 2048 ? z = "%" + (N >> 6 | 192).toString(16).toUpperCase() + "%" + (N & 63 | 128).toString(16).toUpperCase() : z = "%" + (N >> 12 | 224).toString(16).toUpperCase() + "%" + (N >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (N & 63 | 128).toString(16).toUpperCase(), z;
       }
       function ee(H) {
-        for (var N = "", V = 0, Q = H.length; V < Q; ) {
-          var Y = parseInt(H.substr(V + 1, 2), 16);
+        for (var N = "", z = 0, Q = H.length; z < Q; ) {
+          var Y = parseInt(H.substr(z + 1, 2), 16);
           if (Y < 128)
-            N += String.fromCharCode(Y), V += 3;
+            N += String.fromCharCode(Y), z += 3;
           else if (Y >= 194 && Y < 224) {
-            if (Q - V >= 6) {
-              var ce = parseInt(H.substr(V + 4, 2), 16);
+            if (Q - z >= 6) {
+              var ce = parseInt(H.substr(z + 4, 2), 16);
               N += String.fromCharCode((Y & 31) << 6 | ce & 63);
             } else
-              N += H.substr(V, 6);
-            V += 6;
+              N += H.substr(z, 6);
+            z += 6;
           } else if (Y >= 224) {
-            if (Q - V >= 9) {
-              var fe = parseInt(H.substr(V + 4, 2), 16), _e = parseInt(H.substr(V + 7, 2), 16);
+            if (Q - z >= 9) {
+              var fe = parseInt(H.substr(z + 4, 2), 16), _e = parseInt(H.substr(z + 7, 2), 16);
               N += String.fromCharCode((Y & 15) << 12 | (fe & 63) << 6 | _e & 63);
             } else
-              N += H.substr(V, 9);
-            V += 9;
+              N += H.substr(z, 9);
+            z += 9;
           } else
-            N += H.substr(V, 3), V += 3;
+            N += H.substr(z, 3), z += 3;
         }
         return N;
       }
       function K(H, N) {
-        function V(Q) {
+        function z(Q) {
           var Y = ee(Q);
           return Y.match(N.UNRESERVED) ? Y : Q;
         }
-        return H.scheme && (H.scheme = String(H.scheme).replace(N.PCT_ENCODED, V).toLowerCase().replace(N.NOT_SCHEME, "")), H.userinfo !== void 0 && (H.userinfo = String(H.userinfo).replace(N.PCT_ENCODED, V).replace(N.NOT_USERINFO, z).replace(N.PCT_ENCODED, o)), H.host !== void 0 && (H.host = String(H.host).replace(N.PCT_ENCODED, V).toLowerCase().replace(N.NOT_HOST, z).replace(N.PCT_ENCODED, o)), H.path !== void 0 && (H.path = String(H.path).replace(N.PCT_ENCODED, V).replace(H.scheme ? N.NOT_PATH : N.NOT_PATH_NOSCHEME, z).replace(N.PCT_ENCODED, o)), H.query !== void 0 && (H.query = String(H.query).replace(N.PCT_ENCODED, V).replace(N.NOT_QUERY, z).replace(N.PCT_ENCODED, o)), H.fragment !== void 0 && (H.fragment = String(H.fragment).replace(N.PCT_ENCODED, V).replace(N.NOT_FRAGMENT, z).replace(N.PCT_ENCODED, o)), H;
+        return H.scheme && (H.scheme = String(H.scheme).replace(N.PCT_ENCODED, z).toLowerCase().replace(N.NOT_SCHEME, "")), H.userinfo !== void 0 && (H.userinfo = String(H.userinfo).replace(N.PCT_ENCODED, z).replace(N.NOT_USERINFO, B).replace(N.PCT_ENCODED, o)), H.host !== void 0 && (H.host = String(H.host).replace(N.PCT_ENCODED, z).toLowerCase().replace(N.NOT_HOST, B).replace(N.PCT_ENCODED, o)), H.path !== void 0 && (H.path = String(H.path).replace(N.PCT_ENCODED, z).replace(H.scheme ? N.NOT_PATH : N.NOT_PATH_NOSCHEME, B).replace(N.PCT_ENCODED, o)), H.query !== void 0 && (H.query = String(H.query).replace(N.PCT_ENCODED, z).replace(N.NOT_QUERY, B).replace(N.PCT_ENCODED, o)), H.fragment !== void 0 && (H.fragment = String(H.fragment).replace(N.PCT_ENCODED, z).replace(N.NOT_FRAGMENT, B).replace(N.PCT_ENCODED, o)), H;
       }
       function I(H) {
         return H.replace(/^0*(.*)/, "$1") || "0";
       }
       function q(H, N) {
-        var V = H.match(N.IPV4ADDRESS) || [], Q = g(V, 2), Y = Q[1];
+        var z = H.match(N.IPV4ADDRESS) || [], Q = g(z, 2), Y = Q[1];
         return Y ? Y.split(".").map(I).join(".") : H;
       }
       function Z(H, N) {
-        var V = H.match(N.IPV6ADDRESS) || [], Q = g(V, 3), Y = Q[1], ce = Q[2];
+        var z = H.match(N.IPV6ADDRESS) || [], Q = g(z, 3), Y = Q[1], ce = Q[2];
         if (Y) {
           for (var fe = Y.toLowerCase().split("::").reverse(), _e = g(fe, 2), xe = _e[0], De = _e[1], ye = De ? De.split(":").map(I) : [], Ce = xe.split(":").map(I), Me = N.IPV4ADDRESS.test(Ce[Ce.length - 1]), pe = Me ? 7 : 8, Oe = Ce.length - pe, ke = Array(pe), Ae = 0; Ae < pe; ++Ae)
             ke[Ae] = ye[Ae] || Ce[Oe + Ae] || "";
@@ -1470,30 +1470,30 @@ function Ag() {
       }
       var te = /^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i, he = "".match(/(){0}/)[1] === void 0;
       function ae(H) {
-        var N = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, V = {}, Q = N.iri !== !1 ? y : f;
+        var N = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, z = {}, Q = N.iri !== !1 ? y : f;
         N.reference === "suffix" && (H = (N.scheme ? N.scheme + ":" : "") + "//" + H);
         var Y = H.match(te);
         if (Y) {
-          he ? (V.scheme = Y[1], V.userinfo = Y[3], V.host = Y[4], V.port = parseInt(Y[5], 10), V.path = Y[6] || "", V.query = Y[7], V.fragment = Y[8], isNaN(V.port) && (V.port = Y[5])) : (V.scheme = Y[1] || void 0, V.userinfo = H.indexOf("@") !== -1 ? Y[3] : void 0, V.host = H.indexOf("//") !== -1 ? Y[4] : void 0, V.port = parseInt(Y[5], 10), V.path = Y[6] || "", V.query = H.indexOf("?") !== -1 ? Y[7] : void 0, V.fragment = H.indexOf("#") !== -1 ? Y[8] : void 0, isNaN(V.port) && (V.port = H.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? Y[4] : void 0)), V.host && (V.host = Z(q(V.host, Q), Q)), V.scheme === void 0 && V.userinfo === void 0 && V.host === void 0 && V.port === void 0 && !V.path && V.query === void 0 ? V.reference = "same-document" : V.scheme === void 0 ? V.reference = "relative" : V.fragment === void 0 ? V.reference = "absolute" : V.reference = "uri", N.reference && N.reference !== "suffix" && N.reference !== V.reference && (V.error = V.error || "URI is not a " + N.reference + " reference.");
-          var ce = M[(N.scheme || V.scheme || "").toLowerCase()];
+          he ? (z.scheme = Y[1], z.userinfo = Y[3], z.host = Y[4], z.port = parseInt(Y[5], 10), z.path = Y[6] || "", z.query = Y[7], z.fragment = Y[8], isNaN(z.port) && (z.port = Y[5])) : (z.scheme = Y[1] || void 0, z.userinfo = H.indexOf("@") !== -1 ? Y[3] : void 0, z.host = H.indexOf("//") !== -1 ? Y[4] : void 0, z.port = parseInt(Y[5], 10), z.path = Y[6] || "", z.query = H.indexOf("?") !== -1 ? Y[7] : void 0, z.fragment = H.indexOf("#") !== -1 ? Y[8] : void 0, isNaN(z.port) && (z.port = H.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? Y[4] : void 0)), z.host && (z.host = Z(q(z.host, Q), Q)), z.scheme === void 0 && z.userinfo === void 0 && z.host === void 0 && z.port === void 0 && !z.path && z.query === void 0 ? z.reference = "same-document" : z.scheme === void 0 ? z.reference = "relative" : z.fragment === void 0 ? z.reference = "absolute" : z.reference = "uri", N.reference && N.reference !== "suffix" && N.reference !== z.reference && (z.error = z.error || "URI is not a " + N.reference + " reference.");
+          var ce = M[(N.scheme || z.scheme || "").toLowerCase()];
           if (!N.unicodeSupport && (!ce || !ce.unicodeSupport)) {
-            if (V.host && (N.domainHost || ce && ce.domainHost))
+            if (z.host && (N.domainHost || ce && ce.domainHost))
               try {
-                V.host = O.toASCII(V.host.replace(Q.PCT_ENCODED, ee).toLowerCase());
+                z.host = O.toASCII(z.host.replace(Q.PCT_ENCODED, ee).toLowerCase());
               } catch (fe) {
-                V.error = V.error || "Host's domain name can not be converted to ASCII via punycode: " + fe;
+                z.error = z.error || "Host's domain name can not be converted to ASCII via punycode: " + fe;
               }
-            K(V, f);
+            K(z, f);
           } else
-            K(V, Q);
-          ce && ce.parse && ce.parse(V, N);
+            K(z, Q);
+          ce && ce.parse && ce.parse(z, N);
         } else
-          V.error = V.error || "URI can not be parsed.";
-        return V;
+          z.error = z.error || "URI can not be parsed.";
+        return z;
       }
       function le(H, N) {
-        var V = N.iri !== !1 ? y : f, Q = [];
-        return H.userinfo !== void 0 && (Q.push(H.userinfo), Q.push("@")), H.host !== void 0 && Q.push(Z(q(String(H.host), V), V).replace(V.IPV6ADDRESS, function(Y, ce, fe) {
+        var z = N.iri !== !1 ? y : f, Q = [];
+        return H.userinfo !== void 0 && (Q.push(H.userinfo), Q.push("@")), H.host !== void 0 && Q.push(Z(q(String(H.host), z), z).replace(z.IPV6ADDRESS, function(Y, ce, fe) {
           return "[" + ce + (fe ? "%25" + fe : "") + "]";
         })), (typeof H.port == "number" || typeof H.port == "string") && (Q.push(":"), Q.push(String(H.port))), Q.length ? Q.join("") : void 0;
       }
@@ -1509,9 +1509,9 @@ function Ag() {
           else if (H === "." || H === "..")
             H = "";
           else {
-            var V = H.match(Ne);
-            if (V) {
-              var Q = V[0];
+            var z = H.match(Ne);
+            if (z) {
+              var Q = z[0];
               H = H.slice(Q.length), N.push(Q);
             } else
               throw new Error("Unexpected dot segment condition");
@@ -1519,16 +1519,16 @@ function Ag() {
         return N.join("");
       }
       function Re(H) {
-        var N = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, V = N.iri ? y : f, Q = [], Y = M[(N.scheme || H.scheme || "").toLowerCase()];
-        if (Y && Y.serialize && Y.serialize(H, N), H.host && !V.IPV6ADDRESS.test(H.host)) {
+        var N = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, z = N.iri ? y : f, Q = [], Y = M[(N.scheme || H.scheme || "").toLowerCase()];
+        if (Y && Y.serialize && Y.serialize(H, N), H.host && !z.IPV6ADDRESS.test(H.host)) {
           if (N.domainHost || Y && Y.domainHost)
             try {
-              H.host = N.iri ? O.toUnicode(H.host) : O.toASCII(H.host.replace(V.PCT_ENCODED, ee).toLowerCase());
+              H.host = N.iri ? O.toUnicode(H.host) : O.toASCII(H.host.replace(z.PCT_ENCODED, ee).toLowerCase());
             } catch (_e) {
               H.error = H.error || "Host's domain name can not be converted to " + (N.iri ? "Unicode" : "ASCII") + " via punycode: " + _e;
             }
         }
-        K(H, V), N.reference !== "suffix" && H.scheme && (Q.push(H.scheme), Q.push(":"));
+        K(H, z), N.reference !== "suffix" && H.scheme && (Q.push(H.scheme), Q.push(":"));
         var ce = le(H, N);
         if (ce !== void 0 && (N.reference !== "suffix" && Q.push("//"), Q.push(ce), H.path && H.path.charAt(0) !== "/" && Q.push("/")), H.path !== void 0) {
           var fe = H.path;
@@ -1537,21 +1537,21 @@ function Ag() {
         return H.query !== void 0 && (Q.push("?"), Q.push(H.query)), H.fragment !== void 0 && (Q.push("#"), Q.push(H.fragment)), Q.join("");
       }
       function je(H, N) {
-        var V = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, Q = arguments[3], Y = {};
-        return Q || (H = ae(Re(H, V), V), N = ae(Re(N, V), V)), V = V || {}, !V.tolerant && N.scheme ? (Y.scheme = N.scheme, Y.userinfo = N.userinfo, Y.host = N.host, Y.port = N.port, Y.path = Te(N.path || ""), Y.query = N.query) : (N.userinfo !== void 0 || N.host !== void 0 || N.port !== void 0 ? (Y.userinfo = N.userinfo, Y.host = N.host, Y.port = N.port, Y.path = Te(N.path || ""), Y.query = N.query) : (N.path ? (N.path.charAt(0) === "/" ? Y.path = Te(N.path) : ((H.userinfo !== void 0 || H.host !== void 0 || H.port !== void 0) && !H.path ? Y.path = "/" + N.path : H.path ? Y.path = H.path.slice(0, H.path.lastIndexOf("/") + 1) + N.path : Y.path = N.path, Y.path = Te(Y.path)), Y.query = N.query) : (Y.path = H.path, N.query !== void 0 ? Y.query = N.query : Y.query = H.query), Y.userinfo = H.userinfo, Y.host = H.host, Y.port = H.port), Y.scheme = H.scheme), Y.fragment = N.fragment, Y;
+        var z = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {}, Q = arguments[3], Y = {};
+        return Q || (H = ae(Re(H, z), z), N = ae(Re(N, z), z)), z = z || {}, !z.tolerant && N.scheme ? (Y.scheme = N.scheme, Y.userinfo = N.userinfo, Y.host = N.host, Y.port = N.port, Y.path = Te(N.path || ""), Y.query = N.query) : (N.userinfo !== void 0 || N.host !== void 0 || N.port !== void 0 ? (Y.userinfo = N.userinfo, Y.host = N.host, Y.port = N.port, Y.path = Te(N.path || ""), Y.query = N.query) : (N.path ? (N.path.charAt(0) === "/" ? Y.path = Te(N.path) : ((H.userinfo !== void 0 || H.host !== void 0 || H.port !== void 0) && !H.path ? Y.path = "/" + N.path : H.path ? Y.path = H.path.slice(0, H.path.lastIndexOf("/") + 1) + N.path : Y.path = N.path, Y.path = Te(Y.path)), Y.query = N.query) : (Y.path = H.path, N.query !== void 0 ? Y.query = N.query : Y.query = H.query), Y.userinfo = H.userinfo, Y.host = H.host, Y.port = H.port), Y.scheme = H.scheme), Y.fragment = N.fragment, Y;
       }
-      function Er(H, N, V) {
-        var Q = s({ scheme: "null" }, V);
+      function Er(H, N, z) {
+        var Q = s({ scheme: "null" }, z);
         return Re(je(ae(H, Q), ae(N, Q), Q, !0), Q);
       }
       function pr(H, N) {
         return typeof H == "string" ? H = Re(ae(H, N), N) : a(H) === "object" && (H = ae(Re(H, N), N)), H;
       }
-      function ir(H, N, V) {
-        return typeof H == "string" ? H = Re(ae(H, V), V) : a(H) === "object" && (H = Re(H, V)), typeof N == "string" ? N = Re(ae(N, V), V) : a(N) === "object" && (N = Re(N, V)), H === N;
+      function ir(H, N, z) {
+        return typeof H == "string" ? H = Re(ae(H, z), z) : a(H) === "object" && (H = Re(H, z)), typeof N == "string" ? N = Re(ae(N, z), z) : a(N) === "object" && (N = Re(N, z)), H === N;
       }
       function Pr(H, N) {
-        return H && H.toString().replace(!N || !N.iri ? f.ESCAPE : y.ESCAPE, z);
+        return H && H.toString().replace(!N || !N.iri ? f.ESCAPE : y.ESCAPE, B);
       }
       function mr(H, N) {
         return H && H.toString().replace(!N || !N.iri ? f.PCT_ENCODED : y.PCT_ENCODED, ee);
@@ -1559,10 +1559,10 @@ function Ag() {
       var gt = {
         scheme: "http",
         domainHost: !0,
-        parse: function(N, V) {
+        parse: function(N, z) {
           return N.host || (N.error = N.error || "HTTP URIs must have a host."), N;
         },
-        serialize: function(N, V) {
+        serialize: function(N, z) {
           var Q = String(N.scheme).toLowerCase() === "https";
           return (N.port === (Q ? 443 : 80) || N.port === "") && (N.port = void 0), N.path || (N.path = "/"), N;
         }
@@ -1578,11 +1578,11 @@ function Ag() {
       var vt = {
         scheme: "ws",
         domainHost: !0,
-        parse: function(N, V) {
+        parse: function(N, z) {
           var Q = N;
           return Q.secure = Xs(Q), Q.resourceName = (Q.path || "/") + (Q.query ? "?" + Q.query : ""), Q.path = void 0, Q.query = void 0, Q;
         },
-        serialize: function(N, V) {
+        serialize: function(N, z) {
           if ((N.port === (Xs(N) ? 443 : 80) || N.port === "") && (N.port = void 0), typeof N.secure == "boolean" && (N.scheme = N.secure ? "wss" : "ws", N.secure = void 0), N.resourceName) {
             var Q = N.resourceName.split("?"), Y = g(Q, 2), ce = Y[0], fe = Y[1];
             N.path = ce && ce !== "/" ? ce : void 0, N.query = fe, N.resourceName = void 0;
@@ -1601,7 +1601,7 @@ function Ag() {
       }
       var nl = {
         scheme: "mailto",
-        parse: function(N, V) {
+        parse: function(N, z) {
           var Q = N, Y = Q.to = Q.path ? Q.path.split(",") : [];
           if (Q.path = void 0, Q.query) {
             for (var ce = !1, fe = {}, _e = Q.query.split("&"), xe = 0, De = _e.length; xe < De; ++xe) {
@@ -1612,13 +1612,13 @@ function Ag() {
                     Y.push(Ce[Me]);
                   break;
                 case "subject":
-                  Q.subject = mr(ye[1], V);
+                  Q.subject = mr(ye[1], z);
                   break;
                 case "body":
-                  Q.body = mr(ye[1], V);
+                  Q.body = mr(ye[1], z);
                   break;
                 default:
-                  ce = !0, fe[mr(ye[0], V)] = mr(ye[1], V);
+                  ce = !0, fe[mr(ye[0], z)] = mr(ye[1], z);
                   break;
               }
             }
@@ -1627,11 +1627,11 @@ function Ag() {
           Q.query = void 0;
           for (var Oe = 0, ke = Y.length; Oe < ke; ++Oe) {
             var Ae = Y[Oe].split("@");
-            if (Ae[0] = mr(Ae[0]), V.unicodeSupport)
-              Ae[1] = mr(Ae[1], V).toLowerCase();
+            if (Ae[0] = mr(Ae[0]), z.unicodeSupport)
+              Ae[1] = mr(Ae[1], z).toLowerCase();
             else
               try {
-                Ae[1] = O.toASCII(mr(Ae[1], V).toLowerCase());
+                Ae[1] = O.toASCII(mr(Ae[1], z).toLowerCase());
               } catch (Cr) {
                 Q.error = Q.error || "Email address's domain name can not be converted to ASCII via punycode: " + Cr;
               }
@@ -1639,15 +1639,15 @@ function Ag() {
           }
           return Q;
         },
-        serialize: function(N, V) {
+        serialize: function(N, z) {
           var Q = N, Y = u(N.to);
           if (Y) {
             for (var ce = 0, fe = Y.length; ce < fe; ++ce) {
-              var _e = String(Y[ce]), xe = _e.lastIndexOf("@"), De = _e.slice(0, xe).replace(zr, _i).replace(zr, o).replace(fp, z), ye = _e.slice(xe + 1);
+              var _e = String(Y[ce]), xe = _e.lastIndexOf("@"), De = _e.slice(0, xe).replace(zr, _i).replace(zr, o).replace(fp, B), ye = _e.slice(xe + 1);
               try {
-                ye = V.iri ? O.toUnicode(ye) : O.toASCII(mr(ye, V).toLowerCase());
+                ye = z.iri ? O.toUnicode(ye) : O.toASCII(mr(ye, z).toLowerCase());
               } catch (Oe) {
-                Q.error = Q.error || "Email address's domain name can not be converted to " + (V.iri ? "Unicode" : "ASCII") + " via punycode: " + Oe;
+                Q.error = Q.error || "Email address's domain name can not be converted to " + (z.iri ? "Unicode" : "ASCII") + " via punycode: " + Oe;
               }
               Y[ce] = De + "@" + ye;
             }
@@ -1657,38 +1657,38 @@ function Ag() {
           N.subject && (Ce.subject = N.subject), N.body && (Ce.body = N.body);
           var Me = [];
           for (var pe in Ce)
-            Ce[pe] !== ip[pe] && Me.push(pe.replace(zr, _i).replace(zr, o).replace(tl, z) + "=" + Ce[pe].replace(zr, _i).replace(zr, o).replace(hp, z));
+            Ce[pe] !== ip[pe] && Me.push(pe.replace(zr, _i).replace(zr, o).replace(tl, B) + "=" + Ce[pe].replace(zr, _i).replace(zr, o).replace(hp, B));
           return Me.length && (Q.query = Me.join("&")), Q;
         }
       }, dp = /^([^\:]+)\:(.*)/, il = {
         scheme: "urn",
-        parse: function(N, V) {
+        parse: function(N, z) {
           var Q = N.path && N.path.match(dp), Y = N;
           if (Q) {
-            var ce = V.scheme || Y.scheme || "urn", fe = Q[1].toLowerCase(), _e = Q[2], xe = ce + ":" + (V.nid || fe), De = M[xe];
-            Y.nid = fe, Y.nss = _e, Y.path = void 0, De && (Y = De.parse(Y, V));
+            var ce = z.scheme || Y.scheme || "urn", fe = Q[1].toLowerCase(), _e = Q[2], xe = ce + ":" + (z.nid || fe), De = M[xe];
+            Y.nid = fe, Y.nss = _e, Y.path = void 0, De && (Y = De.parse(Y, z));
           } else
             Y.error = Y.error || "URN can not be parsed.";
           return Y;
         },
-        serialize: function(N, V) {
-          var Q = V.scheme || N.scheme || "urn", Y = N.nid, ce = Q + ":" + (V.nid || Y), fe = M[ce];
-          fe && (N = fe.serialize(N, V));
+        serialize: function(N, z) {
+          var Q = z.scheme || N.scheme || "urn", Y = N.nid, ce = Q + ":" + (z.nid || Y), fe = M[ce];
+          fe && (N = fe.serialize(N, z));
           var _e = N, xe = N.nss;
-          return _e.path = (Y || V.nid) + ":" + xe, _e;
+          return _e.path = (Y || z.nid) + ":" + xe, _e;
         }
       }, pp = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/, al = {
         scheme: "urn:uuid",
-        parse: function(N, V) {
+        parse: function(N, z) {
           var Q = N;
-          return Q.uuid = Q.nss, Q.nss = void 0, !V.tolerant && (!Q.uuid || !Q.uuid.match(pp)) && (Q.error = Q.error || "UUID is not valid."), Q;
+          return Q.uuid = Q.nss, Q.nss = void 0, !z.tolerant && (!Q.uuid || !Q.uuid.match(pp)) && (Q.error = Q.error || "UUID is not valid."), Q;
         },
-        serialize: function(N, V) {
+        serialize: function(N, z) {
           var Q = N;
           return Q.nss = (N.uuid || "").toLowerCase(), Q;
         }
       };
-      M[gt.scheme] = gt, M[Zs.scheme] = Zs, M[vt.scheme] = vt, M[el.scheme] = el, M[nl.scheme] = nl, M[il.scheme] = il, M[al.scheme] = al, n.SCHEMES = M, n.pctEncChar = z, n.pctDecChars = ee, n.parse = ae, n.removeDotSegments = Te, n.serialize = Re, n.resolveComponents = je, n.resolve = Er, n.normalize = pr, n.equal = ir, n.escapeComponent = Pr, n.unescapeComponent = mr, Object.defineProperty(n, "__esModule", { value: !0 });
+      M[gt.scheme] = gt, M[Zs.scheme] = Zs, M[vt.scheme] = vt, M[el.scheme] = el, M[nl.scheme] = nl, M[il.scheme] = il, M[al.scheme] = al, n.SCHEMES = M, n.pctEncChar = B, n.pctDecChars = ee, n.parse = ae, n.removeDotSegments = Te, n.serialize = Re, n.resolveComponents = je, n.resolve = Er, n.normalize = pr, n.equal = ir, n.escapeComponent = Pr, n.unescapeComponent = mr, Object.defineProperty(n, "__esModule", { value: !0 });
     });
   }(Tt, Tt.exports)), Tt.exports;
 }
@@ -2237,8 +2237,8 @@ function rd() {
           v.push(r), r = "", e.createErrors !== !1 ? (r += " { keyword: '" + (T || "type") + "' , dataPath: (dataPath || '') + " + e.errorPath + " , schemaPath: " + e.util.toQuotedString(p) + " , params: { type: '", x ? r += "" + R.join(",") : r += "" + R, r += "' } ", e.opts.messages !== !1 && (r += " , message: 'should be ", x ? r += "" + R.join(",") : r += "" + R, r += "' "), e.opts.verbose && (r += " , schema: validate.schema" + d + " , parentSchema: validate.schema" + e.schemaPath + " , data: " + m + " "), r += " } ") : r += " {} ";
           var l = r;
           r = v.pop(), !e.compositeRule && _ ? e.async ? r += " throw new ValidationError([" + l + "]); " : r += " validate.errors = [" + l + "]; return false; " : r += " var err = " + l + ";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ", r += " } if (" + $ + " !== undefined) {  ";
-          var j = y ? "data" + (y - 1 || "") : "parentData", B = y ? e.dataPathArr[y] : "parentDataProperty";
-          r += " " + m + " = " + $ + "; ", y || (r += "if (" + j + " !== undefined)"), r += " " + j + "[" + B + "] = " + $ + "; } ";
+          var j = y ? "data" + (y - 1 || "") : "parentData", V = y ? e.dataPathArr[y] : "parentDataProperty";
+          r += " " + m + " = " + $ + "; ", y || (r += "if (" + j + " !== undefined)"), r += " " + j + "[" + V + "] = " + $ + "; } ";
         } else {
           var v = v || [];
           v.push(r), r = "", e.createErrors !== !1 ? (r += " { keyword: '" + (T || "type") + "' , dataPath: (dataPath || '') + " + e.errorPath + " , schemaPath: " + e.util.toQuotedString(p) + " , params: { type: '", x ? r += "" + R.join(",") : r += "" + R, r += "' } ", e.opts.messages !== !1 && (r += " , message: 'should be ", x ? r += "" + R.join(",") : r += "" + R, r += "' "), e.opts.verbose && (r += " , schema: validate.schema" + d + " , parentSchema: validate.schema" + e.schemaPath + " , data: " + m + " "), r += " } ") : r += " {} ";
@@ -2259,8 +2259,8 @@ function rd() {
               if (S.type == "object" && e.schema.properties) {
                 var g = e.schema.properties, ne = Object.keys(g), O = ne;
                 if (O)
-                  for (var M, z = -1, ee = O.length - 1; z < ee; ) {
-                    M = O[z += 1];
+                  for (var M, B = -1, ee = O.length - 1; B < ee; ) {
+                    M = O[B += 1];
                     var K = g[M];
                     if (K.default !== void 0) {
                       var I = m + e.util.getProperty(M);
@@ -2339,7 +2339,7 @@ function $g() {
     if (E.compiling) return $.callValidate = j;
     var L = this._formats, k = this.RULES;
     try {
-      var U = B(l, h, b, w);
+      var U = V(l, h, b, w);
       $.validate = U;
       var F = $.callValidate;
       return F && (F.schema = U.schema, F.errors = null, F.refs = U.refs, F.refVal = U.refVal, F.root = U.root, F.$async = U.$async, A.sourceCode && (F.source = U.source)), U;
@@ -2350,7 +2350,7 @@ function $g() {
       var K = $.validate, I = K.apply(this, arguments);
       return j.errors = K.errors, I;
     }
-    function B(K, I, q, Z) {
+    function V(K, I, q, Z) {
       var te = !I || I && I.schema == K;
       if (I.schema != h.schema)
         return s.call(_, K, I, q, Z);
@@ -2370,7 +2370,7 @@ function $g() {
         resolve: t,
         resolveRef: G,
         usePattern: M,
-        useDefault: z,
+        useDefault: B,
         useCustomRule: ee,
         opts: A,
         formats: L,
@@ -2425,7 +2425,7 @@ function $g() {
           return te = h.refVal[ae], he = X(I, te), O(te, he);
       }
       he = X(I);
-      var le = t.call(_, B, h, I);
+      var le = t.call(_, V, h, I);
       if (le === void 0) {
         var Pe = b && b[I];
         Pe && (le = t.inlineRef(Pe, A.inlineRefs) ? Pe : s.call(_, Pe, h, b, K));
@@ -2453,7 +2453,7 @@ function $g() {
       var I = x[K];
       return I === void 0 && (I = x[K] = R.length, R[I] = K), "pattern" + I;
     }
-    function z(K) {
+    function B(K) {
       switch (typeof K) {
         case "boolean":
         case "number":
@@ -3098,8 +3098,8 @@ function Qg() {
           else {
             var F = _;
             if (F)
-              for (var j, B = -1, G = F.length - 1; B < G; )
-                j = F[B += 1], r += " || " + v + " == " + e.util.toQuotedString(j) + " ";
+              for (var j, V = -1, G = F.length - 1; V < G; )
+                j = F[V += 1], r += " || " + v + " == " + e.util.toQuotedString(j) + " ";
           }
         if (P.length) {
           var X = P;
@@ -3112,7 +3112,7 @@ function Qg() {
       if (S == "all")
         r += " delete " + y + "[" + v + "]; ";
       else {
-        var M = e.errorPath, z = "' + " + v + " + '";
+        var M = e.errorPath, B = "' + " + v + " + '";
         if (e.opts._errorDataPathProperty && (e.errorPath = e.util.getPathExpr(e.errorPath, v, e.opts.jsonPointers)), x)
           if (S)
             r += " delete " + y + "[" + v + "]; ";
@@ -3121,7 +3121,7 @@ function Qg() {
             var ee = c;
             c = e.errSchemaPath + "/additionalProperties";
             var K = K || [];
-            K.push(r), r = "", e.createErrors !== !1 ? (r += " { keyword: 'additionalProperties' , dataPath: (dataPath || '') + " + e.errorPath + " , schemaPath: " + e.util.toQuotedString(c) + " , params: { additionalProperty: '" + z + "' } ", e.opts.messages !== !1 && (r += " , message: '", e.opts._errorDataPathProperty ? r += "is an invalid additional property" : r += "should NOT have additional properties", r += "' "), e.opts.verbose && (r += " , schema: false , parentSchema: validate.schema" + e.schemaPath + " , data: " + y + " "), r += " } ") : r += " {} ";
+            K.push(r), r = "", e.createErrors !== !1 ? (r += " { keyword: 'additionalProperties' , dataPath: (dataPath || '') + " + e.errorPath + " , schemaPath: " + e.util.toQuotedString(c) + " , params: { additionalProperty: '" + B + "' } ", e.opts.messages !== !1 && (r += " , message: '", e.opts._errorDataPathProperty ? r += "is an invalid additional property" : r += "should NOT have additional properties", r += "' "), e.opts.verbose && (r += " , schema: false , parentSchema: validate.schema" + e.schemaPath + " , data: " + y + " "), r += " } ") : r += " {} ";
             var I = r;
             r = K.pop(), !e.compositeRule && f ? e.async ? r += " throw new ValidationError([" + I + "]); " : r += " validate.errors = [" + I + "]; return false; " : r += " var err = " + I + ";  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ", c = ee, f && (r += " break; ");
           }
@@ -3545,12 +3545,12 @@ function av() {
     } else {
       var F = F || [];
       F.push(r), r = "", r += "  " + R + ".call( ", e.opts.passContext ? r += "this" : r += "self", _ || b.schema === !1 ? r += " , " + g + " " : r += " , " + v + " , " + g + " , validate.schema" + e.schemaPath + " ", r += " , (dataPath || '')", e.errorPath != '""' && (r += " + " + e.errorPath);
-      var j = o ? "data" + (o - 1 || "") : "parentData", B = o ? e.dataPathArr[o] : "parentDataProperty";
-      r += " , " + j + " , " + B + " , rootData )  ";
+      var j = o ? "data" + (o - 1 || "") : "parentData", V = o ? e.dataPathArr[o] : "parentDataProperty";
+      r += " , " + j + " , " + V + " , rootData )  ";
       var G = r;
       r = F.pop(), b.errors === !1 ? (r += " " + d + " = ", E && (r += "await "), r += "" + G + "; ") : E ? (C = "customErrors" + a, r += " var " + C + " = null; try { " + d + " = await " + G + "; } catch (e) { " + d + " = false; if (e instanceof ValidationError) " + C + " = e.errors; else throw e; } ") : r += " " + C + " = null; " + d + " = " + G + "; ";
     }
-    if (b.modifying && (r += " if (" + j + ") " + g + " = " + j + "[" + B + "];"), r += "" + w, b.valid)
+    if (b.modifying && (r += " if (" + j + ") " + g + " = " + j + "[" + V + "];"), r += "" + w, b.valid)
       f && (r += " if (true) { ");
     else {
       r += " if ( ", b.valid === void 0 ? (r += " !", P ? r += "" + L : r += "" + d) : r += " " + !b.valid + " ", r += ") { ", y = l.keyword;
@@ -3715,43 +3715,43 @@ function Sv() {
   var y = "http://json-schema.org/draft-07/schema", g = ["removeAdditional", "useDefaults", "coerceTypes", "strictDefaults"], d = ["/properties"];
   function p(O) {
     if (!(this instanceof p)) return new p(O);
-    O = this._opts = s.copy(O) || {}, W(this), this._schemas = {}, this._refs = {}, this._fragments = {}, this._formats = a(O.format), this._cache = O.cache || new n(), this._loadingSchemas = {}, this._compilations = [], this.RULES = o(), this._getId = S(O), O.loopRequired = O.loopRequired || 1 / 0, O.errorDataPath == "property" && (O._errorDataPathProperty = !0), O.serialize === void 0 && (O.serialize = r), this._metaOpts = X(this), O.formats && j(this), O.keywords && B(this), U(this), typeof O.meta == "object" && this.addMetaSchema(O.meta), O.nullable && this.addKeyword("nullable", { metaSchema: { type: "boolean" } }), F(this);
+    O = this._opts = s.copy(O) || {}, W(this), this._schemas = {}, this._refs = {}, this._fragments = {}, this._formats = a(O.format), this._cache = O.cache || new n(), this._loadingSchemas = {}, this._compilations = [], this.RULES = o(), this._getId = S(O), O.loopRequired = O.loopRequired || 1 / 0, O.errorDataPath == "property" && (O._errorDataPathProperty = !0), O.serialize === void 0 && (O.serialize = r), this._metaOpts = X(this), O.formats && j(this), O.keywords && V(this), U(this), typeof O.meta == "object" && this.addMetaSchema(O.meta), O.nullable && this.addKeyword("nullable", { metaSchema: { type: "boolean" } }), F(this);
   }
   function m(O, M) {
-    var z;
+    var B;
     if (typeof O == "string") {
-      if (z = this.getSchema(O), !z) throw new Error('no schema with key or ref "' + O + '"');
+      if (B = this.getSchema(O), !B) throw new Error('no schema with key or ref "' + O + '"');
     } else {
       var ee = this._addSchema(O);
-      z = ee.validate || this._compile(ee);
+      B = ee.validate || this._compile(ee);
     }
-    var K = z(M);
-    return z.$async !== !0 && (this.errors = z.errors), K;
+    var K = B(M);
+    return B.$async !== !0 && (this.errors = B.errors), K;
   }
   function v(O, M) {
-    var z = this._addSchema(O, void 0, M);
-    return z.validate || this._compile(z);
+    var B = this._addSchema(O, void 0, M);
+    return B.validate || this._compile(B);
   }
-  function l(O, M, z, ee) {
+  function l(O, M, B, ee) {
     if (Array.isArray(O)) {
-      for (var K = 0; K < O.length; K++) this.addSchema(O[K], void 0, z, ee);
+      for (var K = 0; K < O.length; K++) this.addSchema(O[K], void 0, B, ee);
       return this;
     }
     var I = this._getId(O);
     if (I !== void 0 && typeof I != "string")
       throw new Error("schema id must be string");
-    return M = e.normalizeId(M || I), G(this, M), this._schemas[M] = this._addSchema(O, z, ee, !0), this;
+    return M = e.normalizeId(M || I), G(this, M), this._schemas[M] = this._addSchema(O, B, ee, !0), this;
   }
-  function h(O, M, z) {
-    return this.addSchema(O, M, z, !0), this;
+  function h(O, M, B) {
+    return this.addSchema(O, M, B, !0), this;
   }
   function b(O, M) {
-    var z = O.$schema;
-    if (z !== void 0 && typeof z != "string")
+    var B = O.$schema;
+    if (B !== void 0 && typeof B != "string")
       throw new Error("$schema must be a string");
-    if (z = z || this._opts.defaultMeta || w(this), !z)
+    if (B = B || this._opts.defaultMeta || w(this), !B)
       return this.logger.warn("meta-schema not available"), this.errors = null, !0;
-    var ee = this.validate(z, O);
+    var ee = this.validate(B, O);
     if (!ee && M) {
       var K = "schema is invalid: " + this.errorsText();
       if (this._opts.validateSchema == "log") this.logger.error(K);
@@ -3775,9 +3775,9 @@ function Sv() {
     }
   }
   function A(O, M) {
-    var z = e.schema.call(O, { schema: {} }, M);
-    if (z) {
-      var ee = z.schema, K = z.root, I = z.baseId, q = t.call(O, ee, K, void 0, I);
+    var B = e.schema.call(O, { schema: {} }, M);
+    if (B) {
+      var ee = B.schema, K = B.root, I = B.baseId, q = t.call(O, ee, K, void 0, I);
       return O._fragments[M] = new i({
         ref: M,
         fragment: !0,
@@ -3801,20 +3801,20 @@ function Sv() {
         var M = P(this, O);
         return M && this._cache.del(M.cacheKey), delete this._schemas[O], delete this._refs[O], this;
       case "object":
-        var z = this._opts.serialize, ee = z ? z(O) : O;
+        var B = this._opts.serialize, ee = B ? B(O) : O;
         this._cache.del(ee);
         var K = this._getId(O);
         K && (K = e.normalizeId(K), delete this._schemas[K], delete this._refs[K]);
     }
     return this;
   }
-  function R(O, M, z) {
+  function R(O, M, B) {
     for (var ee in M) {
       var K = M[ee];
-      !K.meta && (!z || z.test(ee)) && (O._cache.del(K.cacheKey), delete M[ee]);
+      !K.meta && (!B || B.test(ee)) && (O._cache.del(K.cacheKey), delete M[ee]);
     }
   }
-  function x(O, M, z, ee) {
+  function x(O, M, B, ee) {
     if (typeof O != "object" && typeof O != "boolean")
       throw new Error("schema should be object or boolean");
     var K = this._opts.serialize, I = K ? K(O) : O, q = this._cache.get(I);
@@ -3829,7 +3829,7 @@ function Sv() {
       schema: O,
       localRefs: ae,
       cacheKey: I,
-      meta: z
+      meta: B
     });
     return Z[0] != "#" && ee && (this._refs[Z] = le), this._cache.put(I, le), te && he && this.validateSchema(O, !0), le;
   }
@@ -3837,15 +3837,15 @@ function Sv() {
     if (O.compiling)
       return O.validate = K, K.schema = O.schema, K.errors = null, K.root = M || K, O.schema.$async === !0 && (K.$async = !0), K;
     O.compiling = !0;
-    var z;
-    O.meta && (z = this._opts, this._opts = this._metaOpts);
+    var B;
+    O.meta && (B = this._opts, this._opts = this._metaOpts);
     var ee;
     try {
       ee = t.call(this, O.schema, M, O.localRefs);
     } catch (I) {
       throw delete O.validate, I;
     } finally {
-      O.compiling = !1, O.meta && (this._opts = z);
+      O.compiling = !1, O.meta && (this._opts = B);
     }
     return O.validate = ee, O.refs = ee.refs, O.refVal = ee.refVal, O.root = ee.root, ee;
     function K() {
@@ -3877,11 +3877,11 @@ function Sv() {
   function L(O, M) {
     if (O = O || this.errors, !O) return "No errors";
     M = M || {};
-    for (var z = M.separator === void 0 ? ", " : M.separator, ee = M.dataVar === void 0 ? "data" : M.dataVar, K = "", I = 0; I < O.length; I++) {
+    for (var B = M.separator === void 0 ? ", " : M.separator, ee = M.dataVar === void 0 ? "data" : M.dataVar, K = "", I = 0; I < O.length; I++) {
       var q = O[I];
-      q && (K += ee + q.dataPath + " " + q.message + z);
+      q && (K += ee + q.dataPath + " " + q.message + B);
     }
-    return K.slice(0, -z.length);
+    return K.slice(0, -B.length);
   }
   function k(O, M) {
     return typeof M == "string" && (M = new RegExp(M)), this._formats[O] = M, this;
@@ -3889,26 +3889,26 @@ function Sv() {
   function U(O) {
     var M;
     if (O._opts.$data && (M = _v, O.addMetaSchema(M, M.$id, !0)), O._opts.meta !== !1) {
-      var z = td;
-      O._opts.$data && (z = u(z, d)), O.addMetaSchema(z, y, !0), O._refs["http://json-schema.org/schema"] = y;
+      var B = td;
+      O._opts.$data && (B = u(B, d)), O.addMetaSchema(B, y, !0), O._refs["http://json-schema.org/schema"] = y;
     }
   }
   function F(O) {
     var M = O._opts.schemas;
     if (M)
       if (Array.isArray(M)) O.addSchema(M);
-      else for (var z in M) O.addSchema(M[z], z);
+      else for (var B in M) O.addSchema(M[B], B);
   }
   function j(O) {
     for (var M in O._opts.formats) {
-      var z = O._opts.formats[M];
-      O.addFormat(M, z);
+      var B = O._opts.formats[M];
+      O.addFormat(M, B);
     }
   }
-  function B(O) {
+  function V(O) {
     for (var M in O._opts.keywords) {
-      var z = O._opts.keywords[M];
-      O.addKeyword(M, z);
+      var B = O._opts.keywords[M];
+      O.addKeyword(M, B);
     }
   }
   function G(O, M) {
@@ -3916,8 +3916,8 @@ function Sv() {
       throw new Error('schema with key or id "' + M + '" already exists');
   }
   function X(O) {
-    for (var M = s.copy(O._opts), z = 0; z < g.length; z++)
-      delete M[g[z]];
+    for (var M = s.copy(O._opts), B = 0; B < g.length; B++)
+      delete M[g[B]];
     return M;
   }
   function W(O) {
@@ -4991,10 +4991,10 @@ async function Qv(t, e, n) {
   if ("url" in t)
     i = new Jv(new URL(t.url));
   else {
-    const { loadProfileEnvironmentVariables: r } = await import("./load-profile-RepxD2W6.js"), a = n.loadProfile === "never" || !n.workingDirectory ? process.env : await Ue(
+    const { loadProfileEnvironmentVariables: r } = await import("./load-profile-BbmyxO_7.js"), a = n.loadProfile === "never" || !n.workingDirectory ? process.env : await Ue(
       r(n.workingDirectory, n.loadProfile)
     );
-    i = await import("./stdio-BNK3b-hX.js").then(
+    i = await import("./stdio-D9HyubOc.js").then(
       ({ StdioClientTransport: o }) => new o({
         ...t,
         stderr: "pipe",
@@ -5755,7 +5755,7 @@ IMPORTANT: The result of this tool (if any) should be displayed directly to the
     },
     source: "builtin"
   },
-  fn: import("./node-EWLyp36N.js").then(({ runRoutine: t }) => t)
+  fn: import("./node-VrazB_nQ.js").then(({ runRoutine: t }) => t)
 };
 let gu = !1;
 async function od(t, e = !1) {
@@ -5779,9 +5779,10 @@ async function fy(t, e = !1) {
     t.registerTool(Mp),
     t.registerTool(kp),
     t.registerTool(Fp),
-    t.registerTool(qp)
+    t.registerTool(qp),
+    t.registerTool(jp)
   ];
-  return n.push(t.registerTool(jp)), e && n.push(t.registerTool(cy)), {
+  return e && n.push(t.registerTool(cy)), {
     dispose() {
       for (const i of n)
         i.dispose();
@@ -7801,30 +7802,30 @@ var ud;
       if (typeof $ != "string") throw new TypeError("Path must be a string. Received " + JSON.stringify($));
     }
     function D($, L) {
-      for (var k, U = "", F = 0, j = -1, B = 0, G = 0; G <= $.length; ++G) {
+      for (var k, U = "", F = 0, j = -1, V = 0, G = 0; G <= $.length; ++G) {
         if (G < $.length) k = $.charCodeAt(G);
         else {
           if (k === 47) break;
           k = 47;
         }
         if (k === 47) {
-          if (!(j === G - 1 || B === 1)) if (j !== G - 1 && B === 2) {
+          if (!(j === G - 1 || V === 1)) if (j !== G - 1 && V === 2) {
             if (U.length < 2 || F !== 2 || U.charCodeAt(U.length - 1) !== 46 || U.charCodeAt(U.length - 2) !== 46) {
               if (U.length > 2) {
                 var X = U.lastIndexOf("/");
                 if (X !== U.length - 1) {
-                  X === -1 ? (U = "", F = 0) : F = (U = U.slice(0, X)).length - 1 - U.lastIndexOf("/"), j = G, B = 0;
+                  X === -1 ? (U = "", F = 0) : F = (U = U.slice(0, X)).length - 1 - U.lastIndexOf("/"), j = G, V = 0;
                   continue;
                 }
               } else if (U.length === 2 || U.length === 1) {
-                U = "", F = 0, j = G, B = 0;
+                U = "", F = 0, j = G, V = 0;
                 continue;
               }
             }
             L && (U.length > 0 ? U += "/.." : U = "..", F = 2);
           } else U.length > 0 ? U += "/" + $.slice(j + 1, G) : U = $.slice(j + 1, G), F = G - j - 1;
-          j = G, B = 0;
-        } else k === 46 && B !== -1 ? ++B : B = -1;
+          j = G, V = 0;
+        } else k === 46 && V !== -1 ? ++V : V = -1;
       }
       return U;
     }
@@ -7851,9 +7852,9 @@ var ud;
       if (S($), S(L), $ === L || ($ = E.resolve($)) === (L = E.resolve(L))) return "";
       for (var k = 1; k < $.length && $.charCodeAt(k) === 47; ++k) ;
       for (var U = $.length, F = U - k, j = 1; j < L.length && L.charCodeAt(j) === 47; ++j) ;
-      for (var B = L.length - j, G = F < B ? F : B, X = -1, W = 0; W <= G; ++W) {
+      for (var V = L.length - j, G = F < V ? F : V, X = -1, W = 0; W <= G; ++W) {
         if (W === G) {
-          if (B > G) {
+          if (V > G) {
             if (L.charCodeAt(j + W) === 47) return L.slice(j + W + 1);
             if (W === 0) return L.slice(j + W);
           } else F > G && ($.charCodeAt(k + W) === 47 ? X = W : W === 0 && (X = 0));
@@ -7883,7 +7884,7 @@ var ud;
       var k, U = 0, F = -1, j = !0;
       if (L !== void 0 && L.length > 0 && L.length <= $.length) {
         if (L.length === $.length && L === $) return "";
-        var B = L.length - 1, G = -1;
+        var V = L.length - 1, G = -1;
         for (k = $.length - 1; k >= 0; --k) {
           var X = $.charCodeAt(k);
           if (X === 47) {
@@ -7891,7 +7892,7 @@ var ud;
               U = k + 1;
               break;
             }
-          } else G === -1 && (j = !1, G = k + 1), B >= 0 && (X === L.charCodeAt(B) ? --B == -1 && (F = k) : (B = -1, F = G));
+          } else G === -1 && (j = !1, G = k + 1), V >= 0 && (X === L.charCodeAt(V) ? --V == -1 && (F = k) : (V = -1, F = G));
         }
         return U === F ? F = G : F === -1 && (F = $.length), $.slice(U, F);
       }
@@ -7904,11 +7905,11 @@ var ud;
       return F === -1 ? "" : $.slice(U, F);
     }, extname: function($) {
       S($);
-      for (var L = -1, k = 0, U = -1, F = !0, j = 0, B = $.length - 1; B >= 0; --B) {
-        var G = $.charCodeAt(B);
-        if (G !== 47) U === -1 && (F = !1, U = B + 1), G === 46 ? L === -1 ? L = B : j !== 1 && (j = 1) : L !== -1 && (j = -1);
+      for (var L = -1, k = 0, U = -1, F = !0, j = 0, V = $.length - 1; V >= 0; --V) {
+        var G = $.charCodeAt(V);
+        if (G !== 47) U === -1 && (F = !1, U = V + 1), G === 46 ? L === -1 ? L = V : j !== 1 && (j = 1) : L !== -1 && (j = -1);
         else if (!F) {
-          k = B + 1;
+          k = V + 1;
           break;
         }
       }
@@ -7925,12 +7926,12 @@ var ud;
       if ($.length === 0) return L;
       var k, U = $.charCodeAt(0), F = U === 47;
       F ? (L.root = "/", k = 1) : k = 0;
-      for (var j = -1, B = 0, G = -1, X = !0, W = $.length - 1, ne = 0; W >= k; --W) if ((U = $.charCodeAt(W)) !== 47) G === -1 && (X = !1, G = W + 1), U === 46 ? j === -1 ? j = W : ne !== 1 && (ne = 1) : j !== -1 && (ne = -1);
+      for (var j = -1, V = 0, G = -1, X = !0, W = $.length - 1, ne = 0; W >= k; --W) if ((U = $.charCodeAt(W)) !== 47) G === -1 && (X = !1, G = W + 1), U === 46 ? j === -1 ? j = W : ne !== 1 && (ne = 1) : j !== -1 && (ne = -1);
       else if (!X) {
-        B = W + 1;
+        V = W + 1;
         break;
       }
-      return j === -1 || G === -1 || ne === 0 || ne === 1 && j === G - 1 && j === B + 1 ? G !== -1 && (L.base = L.name = B === 0 && F ? $.slice(1, G) : $.slice(B, G)) : (B === 0 && F ? (L.name = $.slice(1, j), L.base = $.slice(1, G)) : (L.name = $.slice(B, j), L.base = $.slice(B, G)), L.ext = $.slice(j, G)), B > 0 ? L.dir = $.slice(0, B - 1) : F && (L.dir = "/"), L;
+      return j === -1 || G === -1 || ne === 0 || ne === 1 && j === G - 1 && j === V + 1 ? G !== -1 && (L.base = L.name = V === 0 && F ? $.slice(1, G) : $.slice(V, G)) : (V === 0 && F ? (L.name = $.slice(1, j), L.base = $.slice(1, G)) : (L.name = $.slice(V, j), L.base = $.slice(V, G)), L.ext = $.slice(j, G)), V > 0 ? L.dir = $.slice(0, V - 1) : F && (L.dir = "/"), L;
     }, sep: "/", delimiter: ":", win32: null, posix: null };
     E.posix = E, C.exports = E;
   } }, e = {};
@@ -8069,8 +8070,8 @@ var ud;
     if ($ && (E += $, E += ":"), (L || $ === "file") && (E += f, E += f), L) {
       let j = L.indexOf("@");
       if (j !== -1) {
-        const B = L.substr(0, j);
-        L = L.substr(j + 1), j = B.lastIndexOf(":"), j === -1 ? E += D(B, !1, !1) : (E += D(B.substr(0, j), !1, !1), E += ":", E += D(B.substr(j + 1), !1, !0)), E += "@";
+        const V = L.substr(0, j);
+        L = L.substr(j + 1), j = V.lastIndexOf(":"), j === -1 ? E += D(V, !1, !1) : (E += D(V.substr(0, j), !1, !1), E += ":", E += D(V.substr(j + 1), !1, !0)), E += "@";
       }
       L = L.toLowerCase(), j = L.lastIndexOf(":"), j === -1 ? E += D(L, !1, !0) : (E += D(L.substr(0, j), !1, !0), E += L.substr(j));
     }
@@ -10415,74 +10416,74 @@ function Bt() {
       b && (h.bigint === void 0 && (h.bigint = !1), "circularValue" in h || (h.circularValue = Error));
       const w = f(h), _ = g(h, "bigint"), A = y(h), P = typeof A == "function" ? A : void 0, T = d(h, "maximumDepth"), R = d(h, "maximumBreadth");
       function x($, L, k, U, F, j) {
-        let B = L[$];
-        switch (typeof B == "object" && B !== null && typeof B.toJSON == "function" && (B = B.toJSON($)), B = U.call(L, $, B), typeof B) {
+        let V = L[$];
+        switch (typeof V == "object" && V !== null && typeof V.toJSON == "function" && (V = V.toJSON($)), V = U.call(L, $, V), typeof V) {
           case "string":
-            return a(B);
+            return a(V);
           case "object": {
-            if (B === null)
+            if (V === null)
               return "null";
-            if (k.indexOf(B) !== -1)
+            if (k.indexOf(V) !== -1)
               return w;
             let G = "", X = ",";
             const W = j;
-            if (Array.isArray(B)) {
-              if (B.length === 0)
+            if (Array.isArray(V)) {
+              if (V.length === 0)
                 return "[]";
               if (T < k.length + 1)
                 return '"[Array]"';
-              k.push(B), F !== "" && (j += F, G += `
+              k.push(V), F !== "" && (j += F, G += `
 ${j}`, X = `,
 ${j}`);
-              const K = Math.min(B.length, R);
+              const K = Math.min(V.length, R);
               let I = 0;
               for (; I < K - 1; I++) {
-                const Z = x(String(I), B, k, U, F, j);
+                const Z = x(String(I), V, k, U, F, j);
                 G += Z !== void 0 ? Z : "null", G += X;
               }
-              const q = x(String(I), B, k, U, F, j);
-              if (G += q !== void 0 ? q : "null", B.length - 1 > R) {
-                const Z = B.length - R - 1;
+              const q = x(String(I), V, k, U, F, j);
+              if (G += q !== void 0 ? q : "null", V.length - 1 > R) {
+                const Z = V.length - R - 1;
                 G += `${X}"... ${p(Z)} not stringified"`;
               }
               return F !== "" && (G += `
 ${W}`), k.pop(), `[${G}]`;
             }
-            let ne = Object.keys(B);
+            let ne = Object.keys(V);
             const O = ne.length;
             if (O === 0)
               return "{}";
             if (T < k.length + 1)
               return '"[Object]"';
-            let M = "", z = "";
+            let M = "", B = "";
             F !== "" && (j += F, X = `,
 ${j}`, M = " ");
             const ee = Math.min(O, R);
-            A && !s(B) && (ne = o(ne, P)), k.push(B);
+            A && !s(V) && (ne = o(ne, P)), k.push(V);
             for (let K = 0; K < ee; K++) {
-              const I = ne[K], q = x(I, B, k, U, F, j);
-              q !== void 0 && (G += `${z}${a(I)}:${M}${q}`, z = X);
+              const I = ne[K], q = x(I, V, k, U, F, j);
+              q !== void 0 && (G += `${B}${a(I)}:${M}${q}`, B = X);
             }
             if (O > R) {
               const K = O - R;
-              G += `${z}"...":${M}"${p(K)} not stringified"`, z = X;
+              G += `${B}"...":${M}"${p(K)} not stringified"`, B = X;
             }
-            return F !== "" && z.length > 1 && (G = `
+            return F !== "" && B.length > 1 && (G = `
 ${j}${G}
 ${W}`), k.pop(), `{${G}}`;
           }
           case "number":
-            return isFinite(B) ? String(B) : b ? b(B) : "null";
+            return isFinite(V) ? String(V) : b ? b(V) : "null";
           case "boolean":
-            return B === !0 ? "true" : "false";
+            return V === !0 ? "true" : "false";
           case "undefined":
             return;
           case "bigint":
             if (_)
-              return String(B);
+              return String(V);
           // fallthrough
           default:
-            return b ? b(B) : void 0;
+            return b ? b(V) : void 0;
         }
       }
       function C($, L, k, U, F, j) {
@@ -10494,7 +10495,7 @@ ${W}`), k.pop(), `{${G}}`;
               return "null";
             if (k.indexOf(L) !== -1)
               return w;
-            const B = j;
+            const V = j;
             let G = "", X = ",";
             if (Array.isArray(L)) {
               if (L.length === 0)
@@ -10510,13 +10511,13 @@ ${j}`);
                 const ee = C(String(M), L[M], k, U, F, j);
                 G += ee !== void 0 ? ee : "null", G += X;
               }
-              const z = C(String(M), L[M], k, U, F, j);
-              if (G += z !== void 0 ? z : "null", L.length - 1 > R) {
+              const B = C(String(M), L[M], k, U, F, j);
+              if (G += B !== void 0 ? B : "null", L.length - 1 > R) {
                 const ee = L.length - R - 1;
                 G += `${X}"... ${p(ee)} not stringified"`;
               }
               return F !== "" && (G += `
-${B}`), k.pop(), `[${G}]`;
+${V}`), k.pop(), `[${G}]`;
             }
             k.push(L);
             let W = "";
@@ -10529,7 +10530,7 @@ ${j}`, W = " ");
             }
             return F !== "" && ne.length > 1 && (G = `
 ${j}${G}
-${B}`), k.pop(), `{${G}}`;
+${V}`), k.pop(), `{${G}}`;
           }
           case "number":
             return isFinite(L) ? String(L) : b ? b(L) : "null";
@@ -10569,23 +10570,23 @@ ${B}`), k.pop(), `{${G}}`;
               k.push(L), F += U;
               let M = `
 ${F}`;
-              const z = `,
+              const B = `,
 ${F}`, ee = Math.min(L.length, R);
               let K = 0;
               for (; K < ee - 1; K++) {
                 const q = S(String(K), L[K], k, U, F);
-                M += q !== void 0 ? q : "null", M += z;
+                M += q !== void 0 ? q : "null", M += B;
               }
               const I = S(String(K), L[K], k, U, F);
               if (M += I !== void 0 ? I : "null", L.length - 1 > R) {
                 const q = L.length - R - 1;
-                M += `${z}"... ${p(q)} not stringified"`;
+                M += `${B}"... ${p(q)} not stringified"`;
               }
               return M += `
 ${j}`, k.pop(), `[${M}]`;
             }
-            let B = Object.keys(L);
-            const G = B.length;
+            let V = Object.keys(L);
+            const G = V.length;
             if (G === 0)
               return "{}";
             if (T < k.length + 1)
@@ -10594,10 +10595,10 @@ ${j}`, k.pop(), `[${M}]`;
             const X = `,
 ${F}`;
             let W = "", ne = "", O = Math.min(G, R);
-            s(L) && (W += c(L, X, R), B = B.slice(L.length), O -= L.length, ne = X), A && (B = o(B, P)), k.push(L);
+            s(L) && (W += c(L, X, R), V = V.slice(L.length), O -= L.length, ne = X), A && (V = o(V, P)), k.push(L);
             for (let M = 0; M < O; M++) {
-              const z = B[M], ee = S(z, L[z], k, U, F);
-              ee !== void 0 && (W += `${ne}${a(z)}: ${ee}`, ne = X);
+              const B = V[M], ee = S(B, L[B], k, U, F);
+              ee !== void 0 && (W += `${ne}${a(B)}: ${ee}`, ne = X);
             }
             if (G > R) {
               const M = G - R;
@@ -10658,19 +10659,19 @@ ${j}`), k.pop(), `{${W}}`;
               return k.pop(), `[${U}]`;
             }
             let j = Object.keys(L);
-            const B = j.length;
-            if (B === 0)
+            const V = j.length;
+            if (V === 0)
               return "{}";
             if (T < k.length + 1)
               return '"[Object]"';
-            let G = "", X = Math.min(B, R);
+            let G = "", X = Math.min(V, R);
             F && s(L) && (U += c(L, ",", R), j = j.slice(L.length), X -= L.length, G = ","), A && (j = o(j, P)), k.push(L);
             for (let W = 0; W < X; W++) {
               const ne = j[W], O = D(ne, L[ne], k);
               O !== void 0 && (U += `${G}${a(ne)}:${O}`, G = ",");
             }
-            if (B > R) {
-              const W = B - R;
+            if (V > R) {
+              const W = V - R;
               U += `${G}"...":"${p(W)} not stringified"`;
             }
             return k.pop(), `{${U}}`;
@@ -12281,13 +12282,13 @@ function Ad() {
     s("read", I), I = parseInt(I, 10);
     var q = this._readableState, Z = I;
     if (I !== 0 && (q.emittedReadable = !1), I === 0 && q.needReadable && ((q.highWaterMark !== 0 ? q.length >= q.highWaterMark : q.length > 0) || q.ended))
-      return s("read: emitReadable", q.length, q.ended), q.length === 0 && q.ended ? z(this) : k(this), null;
+      return s("read: emitReadable", q.length, q.ended), q.length === 0 && q.ended ? B(this) : k(this), null;
     if (I = $(I, q), I === 0 && q.ended)
-      return q.length === 0 && z(this), null;
+      return q.length === 0 && B(this), null;
     var te = q.needReadable;
     s("need readable", te), (q.length === 0 || q.length - I < q.highWaterMark) && (te = !0, s("length less than watermark", te)), q.ended || q.reading ? (te = !1, s("reading or ended", te)) : te && (s("do read"), q.reading = !0, q.sync = !0, q.length === 0 && (q.needReadable = !0), this._read(q.highWaterMark), q.sync = !1, q.reading || (I = $(Z, q)));
     var he;
-    return I > 0 ? he = M(I, q) : he = null, he === null ? (q.needReadable = q.length <= q.highWaterMark, I = 0) : (q.length -= I, q.awaitDrain = 0), q.length === 0 && (q.ended || (q.needReadable = !0), Z !== I && q.ended && z(this)), he !== null && this.emit("data", he), he;
+    return I > 0 ? he = M(I, q) : he = null, he === null ? (q.needReadable = q.length <= q.highWaterMark, I = 0) : (q.length -= I, q.awaitDrain = 0), q.length === 0 && (q.ended || (q.needReadable = !0), Z !== I && q.ended && B(this)), he !== null && this.emit("data", he), he;
   };
   function L(I, q) {
     if (s("onEofChunk"), !q.ended) {
@@ -12341,7 +12342,7 @@ function Ad() {
     function Pe() {
       s("onend"), I.end();
     }
-    var Se = B(Z);
+    var Se = V(Z);
     I.on("drain", Se);
     var Be = !1;
     function Ne() {
@@ -12370,7 +12371,7 @@ function Ad() {
     }
     return I.emit("pipe", Z), te.flowing || (s("pipe resume"), Z.resume()), I;
   };
-  function B(I) {
+  function V(I) {
     return function() {
       var Z = I._readableState;
       s("pipeOnDrain", Z.awaitDrain), Z.awaitDrain && Z.awaitDrain--, Z.awaitDrain === 0 && e(I, "data") && (Z.flowing = !0, O(I));
@@ -12495,7 +12496,7 @@ function Ad() {
     var Z;
     return q.objectMode ? Z = q.buffer.shift() : !I || I >= q.length ? (q.decoder ? Z = q.buffer.join("") : q.buffer.length === 1 ? Z = q.buffer.first() : Z = q.buffer.concat(q.length), q.buffer.clear()) : Z = q.buffer.consume(I, q.decoder), Z;
   }
-  function z(I) {
+  function B(I) {
     var q = I._readableState;
     s("endReadable", q.endEmitted), q.endEmitted || (q.ended = !0, process.nextTick(ee, q, I));
   }
@@ -12605,17 +12606,17 @@ function yi() {
   zt()(T, i);
   function _() {
   }
-  function A(O, M, z) {
-    e = e || ut(), O = O || {}, typeof z != "boolean" && (z = M instanceof e), this.objectMode = !!O.objectMode, z && (this.objectMode = this.objectMode || !!O.writableObjectMode), this.highWaterMark = f(this, O, "writableHighWaterMark", z), this.finalCalled = !1, this.needDrain = !1, this.ending = !1, this.ended = !1, this.finished = !1, this.destroyed = !1;
+  function A(O, M, B) {
+    e = e || ut(), O = O || {}, typeof B != "boolean" && (B = M instanceof e), this.objectMode = !!O.objectMode, B && (this.objectMode = this.objectMode || !!O.writableObjectMode), this.highWaterMark = f(this, O, "writableHighWaterMark", B), this.finalCalled = !1, this.needDrain = !1, this.ending = !1, this.ended = !1, this.finished = !1, this.destroyed = !1;
     var ee = O.decodeStrings === !1;
     this.decodeStrings = !ee, this.defaultEncoding = O.defaultEncoding || "utf8", this.length = 0, this.writing = !1, this.corked = 0, this.sync = !0, this.bufferProcessing = !1, this.onwrite = function(K) {
       L(M, K);
     }, this.writecb = null, this.writelen = 0, this.bufferedRequest = null, this.lastBufferedRequest = null, this.pendingcb = 0, this.prefinished = !1, this.errorEmitted = !1, this.emitClose = O.emitClose !== !1, this.autoDestroy = !!O.autoDestroy, this.bufferedRequestCount = 0, this.corkedRequestsFree = new t(this);
   }
   A.prototype.getBuffer = function() {
-    for (var M = this.bufferedRequest, z = []; M; )
-      z.push(M), M = M.next;
-    return z;
+    for (var M = this.bufferedRequest, B = []; M; )
+      B.push(M), M = M.next;
+    return B;
   }, function() {
     try {
       Object.defineProperty(A.prototype, "buffer", {
@@ -12644,16 +12645,16 @@ function yi() {
     w(this, new m());
   };
   function R(O, M) {
-    var z = new h();
-    w(O, z), process.nextTick(M, z);
+    var B = new h();
+    w(O, B), process.nextTick(M, B);
   }
-  function x(O, M, z, ee) {
+  function x(O, M, B, ee) {
     var K;
-    return z === null ? K = new l() : typeof z != "string" && !M.objectMode && (K = new g("chunk", ["string", "Buffer"], z)), K ? (w(O, K), process.nextTick(ee, K), !1) : !0;
+    return B === null ? K = new l() : typeof B != "string" && !M.objectMode && (K = new g("chunk", ["string", "Buffer"], B)), K ? (w(O, K), process.nextTick(ee, K), !1) : !0;
   }
-  T.prototype.write = function(O, M, z) {
+  T.prototype.write = function(O, M, B) {
     var ee = this._writableState, K = !1, I = !ee.objectMode && u(O);
-    return I && !r.isBuffer(O) && (O = o(O)), typeof M == "function" && (z = M, M = null), I ? M = "buffer" : M || (M = ee.defaultEncoding), typeof z != "function" && (z = _), ee.ending ? R(this, z) : (I || x(this, ee, O, z)) && (ee.pendingcb++, K = S(this, ee, I, O, M, z)), K;
+    return I && !r.isBuffer(O) && (O = o(O)), typeof M == "function" && (B = M, M = null), I ? M = "buffer" : M || (M = ee.defaultEncoding), typeof B != "function" && (B = _), ee.ending ? R(this, B) : (I || x(this, ee, O, B)) && (ee.pendingcb++, K = S(this, ee, I, O, M, B)), K;
   }, T.prototype.cork = function() {
     this._writableState.corked++;
   }, T.prototype.uncork = function() {
@@ -12671,8 +12672,8 @@ function yi() {
       return this._writableState && this._writableState.getBuffer();
     }
   });
-  function C(O, M, z) {
-    return !O.objectMode && O.decodeStrings !== !1 && typeof M == "string" && (M = r.from(M, z)), M;
+  function C(O, M, B) {
+    return !O.objectMode && O.decodeStrings !== !1 && typeof M == "string" && (M = r.from(M, B)), M;
   }
   Object.defineProperty(T.prototype, "writableHighWaterMark", {
     // making it explicit this property is not enumerable
@@ -12683,10 +12684,10 @@ function yi() {
       return this._writableState.highWaterMark;
     }
   });
-  function S(O, M, z, ee, K, I) {
-    if (!z) {
+  function S(O, M, B, ee, K, I) {
+    if (!B) {
       var q = C(M, ee, K);
-      ee !== q && (z = !0, K = "buffer", ee = q);
+      ee !== q && (B = !0, K = "buffer", ee = q);
     }
     var Z = M.objectMode ? 1 : ee.length;
     M.length += Z;
@@ -12696,7 +12697,7 @@ function yi() {
       M.lastBufferedRequest = {
         chunk: ee,
         encoding: K,
-        isBuf: z,
+        isBuf: B,
         callback: I,
         next: null
       }, he ? he.next = M.lastBufferedRequest : M.bufferedRequest = M.lastBufferedRequest, M.bufferedRequestCount += 1;
@@ -12704,54 +12705,54 @@ function yi() {
       D(O, M, !1, Z, ee, K, I);
     return te;
   }
-  function D(O, M, z, ee, K, I, q) {
-    M.writelen = ee, M.writecb = q, M.writing = !0, M.sync = !0, M.destroyed ? M.onwrite(new v("write")) : z ? O._writev(K, M.onwrite) : O._write(K, I, M.onwrite), M.sync = !1;
+  function D(O, M, B, ee, K, I, q) {
+    M.writelen = ee, M.writecb = q, M.writing = !0, M.sync = !0, M.destroyed ? M.onwrite(new v("write")) : B ? O._writev(K, M.onwrite) : O._write(K, I, M.onwrite), M.sync = !1;
   }
-  function E(O, M, z, ee, K) {
-    --M.pendingcb, z ? (process.nextTick(K, ee), process.nextTick(X, O, M), O._writableState.errorEmitted = !0, w(O, ee)) : (K(ee), O._writableState.errorEmitted = !0, w(O, ee), X(O, M));
+  function E(O, M, B, ee, K) {
+    --M.pendingcb, B ? (process.nextTick(K, ee), process.nextTick(X, O, M), O._writableState.errorEmitted = !0, w(O, ee)) : (K(ee), O._writableState.errorEmitted = !0, w(O, ee), X(O, M));
   }
   function $(O) {
     O.writing = !1, O.writecb = null, O.length -= O.writelen, O.writelen = 0;
   }
   function L(O, M) {
-    var z = O._writableState, ee = z.sync, K = z.writecb;
+    var B = O._writableState, ee = B.sync, K = B.writecb;
     if (typeof K != "function") throw new p();
-    if ($(z), M) E(O, z, ee, M, K);
+    if ($(B), M) E(O, B, ee, M, K);
     else {
-      var I = j(z) || O.destroyed;
-      !I && !z.corked && !z.bufferProcessing && z.bufferedRequest && F(O, z), ee ? process.nextTick(k, O, z, I, K) : k(O, z, I, K);
+      var I = j(B) || O.destroyed;
+      !I && !B.corked && !B.bufferProcessing && B.bufferedRequest && F(O, B), ee ? process.nextTick(k, O, B, I, K) : k(O, B, I, K);
     }
   }
-  function k(O, M, z, ee) {
-    z || U(O, M), M.pendingcb--, ee(), X(O, M);
+  function k(O, M, B, ee) {
+    B || U(O, M), M.pendingcb--, ee(), X(O, M);
   }
   function U(O, M) {
     M.length === 0 && M.needDrain && (M.needDrain = !1, O.emit("drain"));
   }
   function F(O, M) {
     M.bufferProcessing = !0;
-    var z = M.bufferedRequest;
-    if (O._writev && z && z.next) {
+    var B = M.bufferedRequest;
+    if (O._writev && B && B.next) {
       var ee = M.bufferedRequestCount, K = new Array(ee), I = M.corkedRequestsFree;
-      I.entry = z;
-      for (var q = 0, Z = !0; z; )
-        K[q] = z, z.isBuf || (Z = !1), z = z.next, q += 1;
+      I.entry = B;
+      for (var q = 0, Z = !0; B; )
+        K[q] = B, B.isBuf || (Z = !1), B = B.next, q += 1;
       K.allBuffers = Z, D(O, M, !0, M.length, K, "", I.finish), M.pendingcb++, M.lastBufferedRequest = null, I.next ? (M.corkedRequestsFree = I.next, I.next = null) : M.corkedRequestsFree = new t(M), M.bufferedRequestCount = 0;
     } else {
-      for (; z; ) {
-        var te = z.chunk, he = z.encoding, ae = z.callback, le = M.objectMode ? 1 : te.length;
-        if (D(O, M, !1, le, te, he, ae), z = z.next, M.bufferedRequestCount--, M.writing)
+      for (; B; ) {
+        var te = B.chunk, he = B.encoding, ae = B.callback, le = M.objectMode ? 1 : te.length;
+        if (D(O, M, !1, le, te, he, ae), B = B.next, M.bufferedRequestCount--, M.writing)
           break;
       }
-      z === null && (M.lastBufferedRequest = null);
+      B === null && (M.lastBufferedRequest = null);
     }
-    M.bufferedRequest = z, M.bufferProcessing = !1;
+    M.bufferedRequest = B, M.bufferProcessing = !1;
   }
-  T.prototype._write = function(O, M, z) {
-    z(new d("_write()"));
-  }, T.prototype._writev = null, T.prototype.end = function(O, M, z) {
+  T.prototype._write = function(O, M, B) {
+    B(new d("_write()"));
+  }, T.prototype._writev = null, T.prototype.end = function(O, M, B) {
     var ee = this._writableState;
-    return typeof O == "function" ? (z = O, O = null, M = null) : typeof M == "function" && (z = M, M = null), O != null && this.write(O, M), ee.corked && (ee.corked = 1, this.uncork()), ee.ending || W(this, ee, z), this;
+    return typeof O == "function" ? (B = O, O = null, M = null) : typeof M == "function" && (B = M, M = null), O != null && this.write(O, M), ee.corked && (ee.corked = 1, this.uncork()), ee.ending || W(this, ee, B), this;
   }, Object.defineProperty(T.prototype, "writableLength", {
     // making it explicit this property is not enumerable
     // because otherwise some prototype manipulation in
@@ -12764,30 +12765,30 @@ function yi() {
   function j(O) {
     return O.ending && O.length === 0 && O.bufferedRequest === null && !O.finished && !O.writing;
   }
-  function B(O, M) {
-    O._final(function(z) {
-      M.pendingcb--, z && w(O, z), M.prefinished = !0, O.emit("prefinish"), X(O, M);
+  function V(O, M) {
+    O._final(function(B) {
+      M.pendingcb--, B && w(O, B), M.prefinished = !0, O.emit("prefinish"), X(O, M);
     });
   }
   function G(O, M) {
-    !M.prefinished && !M.finalCalled && (typeof O._final == "function" && !M.destroyed ? (M.pendingcb++, M.finalCalled = !0, process.nextTick(B, O, M)) : (M.prefinished = !0, O.emit("prefinish")));
+    !M.prefinished && !M.finalCalled && (typeof O._final == "function" && !M.destroyed ? (M.pendingcb++, M.finalCalled = !0, process.nextTick(V, O, M)) : (M.prefinished = !0, O.emit("prefinish")));
   }
   function X(O, M) {
-    var z = j(M);
-    if (z && (G(O, M), M.pendingcb === 0 && (M.finished = !0, O.emit("finish"), M.autoDestroy))) {
+    var B = j(M);
+    if (B && (G(O, M), M.pendingcb === 0 && (M.finished = !0, O.emit("finish"), M.autoDestroy))) {
       var ee = O._readableState;
       (!ee || ee.autoDestroy && ee.endEmitted) && O.destroy();
     }
-    return z;
+    return B;
   }
-  function W(O, M, z) {
-    M.ending = !0, X(O, M), z && (M.finished ? process.nextTick(z) : O.once("finish", z)), M.ended = !0, O.writable = !1;
+  function W(O, M, B) {
+    M.ending = !0, X(O, M), B && (M.finished ? process.nextTick(B) : O.once("finish", B)), M.ended = !0, O.writable = !1;
   }
-  function ne(O, M, z) {
+  function ne(O, M, B) {
     var ee = O.entry;
     for (O.entry = null; ee; ) {
       var K = ee.callback;
-      M.pendingcb--, K(z), ee = ee.next;
+      M.pendingcb--, K(B), ee = ee.next;
     }
     M.corkedRequestsFree.next = O;
   }
@@ -14842,12 +14843,12 @@ function ob() {
         function j(W, ne) {
           try {
             var O = JSON.parse(W);
-            G(O) && B(O);
+            G(O) && V(O);
           } catch (M) {
             ne || F.emit("error", M);
           }
         }
-        function B(W) {
+        function V(W) {
           if (D.rows && k.length >= D.rows && D.order !== "desc") {
             F.readable && F.destroy();
             return;
@@ -15090,12 +15091,12 @@ function ob() {
         var L = this, k = [];
         if (this.maxFiles) {
           for (var U = this.zippedArchive ? ".gz" : "", F = this.maxFiles - 1; F > 1; F--)
-            k.push(function(j, B) {
+            k.push(function(j, V) {
               var G = this, X = "".concat(E).concat(j - 1).concat(D).concat(U), W = p.join(this.dirname, X);
               d.exists(W, function(ne) {
                 if (!ne)
-                  return B(null);
-                X = "".concat(E).concat(j).concat(D).concat(U), d.rename(W, p.join(G.dirname, X), B);
+                  return V(null);
+                X = "".concat(E).concat(j).concat(D).concat(U), d.rename(W, p.join(G.dirname, X), V);
               });
             }.bind(this, F));
           m(k, function() {
@@ -16602,8 +16603,8 @@ function Js() {
     }, {
       key: "configure",
       value: function() {
-        var F = this, j = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, B = j.silent, G = j.format, X = j.defaultMeta, W = j.levels, ne = j.level, O = ne === void 0 ? "info" : ne, M = j.exitOnError, z = M === void 0 ? !0 : M, ee = j.transports, K = j.colors, I = j.emitErrs, q = j.formatters, Z = j.padLevels, te = j.rewriters, he = j.stripColors, ae = j.exceptionHandlers, le = j.rejectionHandlers;
-        if (this.transports.length && this.clear(), this.silent = B, this.format = G || this.format || bb()(), this.defaultMeta = X || null, this.levels = W || this.levels || S.npm.levels, this.level = O, this.exceptions && this.exceptions.unhandle(), this.rejections && this.rejections.unhandle(), this.exceptions = new A(this), this.rejections = new P(this), this.profilers = {}, this.exitOnError = z, ee && (ee = Array.isArray(ee) ? ee : [ee], ee.forEach(function(Pe) {
+        var F = this, j = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, V = j.silent, G = j.format, X = j.defaultMeta, W = j.levels, ne = j.level, O = ne === void 0 ? "info" : ne, M = j.exitOnError, B = M === void 0 ? !0 : M, ee = j.transports, K = j.colors, I = j.emitErrs, q = j.formatters, Z = j.padLevels, te = j.rewriters, he = j.stripColors, ae = j.exceptionHandlers, le = j.rejectionHandlers;
+        if (this.transports.length && this.clear(), this.silent = V, this.format = G || this.format || bb()(), this.defaultMeta = X || null, this.levels = W || this.levels || S.npm.levels, this.level = O, this.exceptions && this.exceptions.unhandle(), this.rejections && this.rejections.unhandle(), this.exceptions = new A(this), this.rejections = new P(this), this.profilers = {}, this.exitOnError = B, ee && (ee = Array.isArray(ee) ? ee : [ee], ee.forEach(function(Pe) {
           return F.add(Pe);
         })), K || I || q || Z || te || he)
           throw new Error(["{ colors, emitErrs, formatters, padLevels, rewriters, stripColors } were removed in winston@3.0.0.", "Use a custom winston.format(function) instead.", "See: https://github.com/winstonjs/winston/tree/master/UPGRADE-3.0.md"].join(`
@@ -16613,17 +16614,17 @@ function Js() {
     }, {
       key: "isLevelEnabled",
       value: function(F) {
-        var j = this, B = $(this.levels, F);
-        if (B === null)
+        var j = this, V = $(this.levels, F);
+        if (V === null)
           return !1;
         var G = $(this.levels, this.level);
         if (G === null)
           return !1;
         if (!this.transports || this.transports.length === 0)
-          return G >= B;
+          return G >= V;
         var X = this.transports.findIndex(function(W) {
           var ne = $(j.levels, W.level);
-          return ne === null && (ne = G), ne >= B;
+          return ne === null && (ne = G), ne >= V;
         });
         return X !== -1;
       }
@@ -16660,7 +16661,7 @@ function Js() {
     }, {
       key: "log",
       value: function(F, j) {
-        for (var B = arguments.length, G = new Array(B > 2 ? B - 2 : 0), X = 2; X < B; X++)
+        for (var V = arguments.length, G = new Array(V > 2 ? V - 2 : 0), X = 2; X < V; X++)
           G[X - 2] = arguments[X];
         if (arguments.length === 1)
           return F[b] = F.level, this._addDefaultMeta(F), this.write(F), this;
@@ -16686,14 +16687,14 @@ function Js() {
        */
     }, {
       key: "_transform",
-      value: function(F, j, B) {
+      value: function(F, j, V) {
         if (this.silent)
-          return B();
+          return V();
         F[b] || (F[b] = F.level), !this.levels[F[b]] && this.levels[F[b]] !== 0 && console.error("[winston] Unknown logger level: %s", F[b]), this._readableState.pipes || console.error("[winston] Attempt to write logs with no transports, which can increase memory usage: %j", F);
         try {
           this.push(this.format.transform(F, this.format.options));
         } finally {
-          this._writableState.sync = !1, B();
+          this._writableState.sync = !1, V();
         }
       }
       /**
@@ -16705,9 +16706,9 @@ function Js() {
       key: "_final",
       value: function(F) {
         var j = this.transports.slice();
-        l(j, function(B, G) {
-          if (!B || B.finished) return setImmediate(G);
-          B.once("finish", G), B.end();
+        l(j, function(V, G) {
+          if (!V || V.finished) return setImmediate(G);
+          V.once("finish", G), V.end();
         }, F);
       }
       /**
@@ -16735,8 +16736,8 @@ function Js() {
       value: function(F) {
         if (!F) return this;
         var j = F;
-        return (!_(F) || F.log.length > 2) && (j = this.transports.filter(function(B) {
-          return B.transport === F;
+        return (!_(F) || F.log.length > 2) && (j = this.transports.filter(function(V) {
+          return V.transport === F;
         })[0]), j && this.unpipe(j), this;
       }
       /**
@@ -16778,23 +16779,23 @@ function Js() {
       key: "query",
       value: function(F, j) {
         typeof F == "function" && (j = F, F = {}), F = F || {};
-        var B = {}, G = Object.assign({}, F.query || {});
+        var V = {}, G = Object.assign({}, F.query || {});
         function X(ne, O) {
-          F.query && typeof ne.formatQuery == "function" && (F.query = ne.formatQuery(G)), ne.query(F, function(M, z) {
+          F.query && typeof ne.formatQuery == "function" && (F.query = ne.formatQuery(G)), ne.query(F, function(M, B) {
             if (M)
               return O(M);
-            typeof ne.formatResults == "function" && (z = ne.formatResults(z, F.format)), O(null, z);
+            typeof ne.formatResults == "function" && (B = ne.formatResults(B, F.format)), O(null, B);
           });
         }
         function W(ne, O) {
-          X(ne, function(M, z) {
-            O && (z = M || z, z && (B[ne.name] = z), O()), O = null;
+          X(ne, function(M, B) {
+            O && (B = M || B, B && (V[ne.name] = B), O()), O = null;
           });
         }
         l(this.transports.filter(function(ne) {
           return !!ne.query;
         }), W, function() {
-          return j(null, B);
+          return j(null, V);
         });
       }
       /**
@@ -16805,15 +16806,15 @@ function Js() {
     }, {
       key: "stream",
       value: function() {
-        var F = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, j = new m(), B = [];
-        return j._streams = B, j.destroy = function() {
-          for (var G = B.length; G--; )
-            B[G].destroy();
+        var F = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, j = new m(), V = [];
+        return j._streams = V, j.destroy = function() {
+          for (var G = V.length; G--; )
+            V[G].destroy();
         }, this.transports.filter(function(G) {
           return !!G.stream;
         }).forEach(function(G) {
           var X = G.stream(F);
-          X && (B.push(X), X.on("log", function(W) {
+          X && (V.push(X), X.on("log", function(W) {
             W.transport = W.transport || [], W.transport.push(G.name), j.emit("log", W);
           }), X.on("error", function(W) {
             W.transport = W.transport || [], W.transport.push(G.name), j.emit("error", W);
@@ -16849,13 +16850,13 @@ function Js() {
       value: function(F) {
         var j = Date.now();
         if (this.profilers[F]) {
-          var B = this.profilers[F];
+          var V = this.profilers[F];
           delete this.profilers[F];
           for (var G = arguments.length, X = new Array(G > 1 ? G - 1 : 0), W = 1; W < G; W++)
             X[W - 1] = arguments[W];
           typeof X[X.length - 2] == "function" && (console.warn("Callback function no longer supported as of winston@3.0.0"), X.pop());
           var ne = e(X[X.length - 1]) === "object" ? X.pop() : {};
-          return ne.level = ne.level || "info", ne.durationMs = j - B, ne.message = ne.message || F, this.write(ne);
+          return ne.level = ne.level || "info", ne.durationMs = j - V, ne.message = ne.message || F, this.write(ne);
         }
         return this.profilers[F] = j, this;
       }
@@ -16901,10 +16902,10 @@ function Js() {
     }, {
       key: "_onEvent",
       value: function(F, j) {
-        function B(G) {
+        function V(G) {
           F === "error" && !this.transports.includes(j) && this.add(j), this.emit(F, G, j);
         }
-        j["__winston" + F] || (j["__winston" + F] = B.bind(this), j.on(F, j["__winston" + F]));
+        j["__winston" + F] || (j["__winston" + F] = V.bind(this), j.on(F, j["__winston" + F]));
       }
     }, {
       key: "_addDefaultMeta",
@@ -17806,7 +17807,7 @@ async function Hr(t, e, { stdin: n, stdout: i } = { stdin: process.stdin, stdout
     n.on("data", u), n.once("error", s);
   });
 }
-const Qd = import("./node-DIICN5y9.js").then(
+const Qd = import("./node-GgocwWwI.js").then(
   ({ nodeFileSystem: t }) => t
 ), ts = Ut(um.exec);
 async function Tw(t) {
@@ -17987,11 +17988,10 @@ class Lw {
               o.printedMessageIndexes,
               o.printedToolRuns
             );
-            (y.messages.length > 0 || y.toolResults.length > 0) && this.events.next({
+            y.blocks.length > 0 && this.events.next({
               type: "subthread-message",
               subThreadID: e,
-              messages: y.messages,
-              toolResults: y.toolResults,
+              blocks: y.blocks,
               color: o.color
             });
           }
@@ -18389,17 +18389,17 @@ async function Bw({
             J.error("Thread sync error", j, { threadID: d });
           }), F && E.type !== "confirming-compaction" && E.type !== "compacting") {
             const j = F.used / F.maxAvailable;
-            let B, G = E.compactionPromptState;
-            if (j > is.CRITICAL ? (B = "critical", G = "final") : j > is.WARNING && E.compactionPromptState === "none" ? (B = "moderate", G = "first") : j > is.SEVERE && E.compactionPromptState === "first" && (B = "severe", G = "final"), B)
+            let V, G = E.compactionPromptState;
+            if (j > is.CRITICAL ? (V = "critical", G = "final") : j > is.WARNING && E.compactionPromptState === "none" ? (V = "moderate", G = "first") : j > is.SEVERE && E.compactionPromptState === "first" && (V = "severe", G = "final"), V)
               return P.next({
                 type: "confirm",
                 confirmation: {
                   type: "compaction",
-                  severity: B
+                  severity: V
                 }
               }), {
                 type: "confirming-compaction",
-                severity: B,
+                severity: V,
                 tokenUsage: null,
                 // from here we consider the token usage to be unknown
                 compactionPromptState: G,
@@ -18418,10 +18418,10 @@ async function Bw({
           F.length > 0 && (J.info(`Updating allowlist with ${F.length} entries`, {
             entries: F
           }), s.get("commands.allowlist", "global").then((j) => {
-            const B = [...j ?? [], ...F];
+            const V = [...j ?? [], ...F];
             return s.set(
               "commands.allowlist",
-              B,
+              V,
               "global"
             );
           }).catch((j) => {
@@ -18439,10 +18439,9 @@ async function Bw({
               !0
               // Include user messages when continuing a thread
             );
-            (j.messages.length > 0 || j.toolResults.length > 0) && P.next({
+            j.blocks.length > 0 && P.next({
               type: "messages",
-              messages: j.messages,
-              toolResults: j.toolResults
+              blocks: j.blocks
             });
           }
           let F = E.tokenUsage;
@@ -18477,15 +18476,14 @@ async function Bw({
                 tokenUsage: F
               };
           if (E.type === "awaiting-agent" || E.type === "compacting") {
-            const j = $.thread.messages.at(-1), B = ls(
+            const j = $.thread.messages.at(-1), V = ls(
               $.thread,
               v,
               h
             );
-            if ((B.messages.length > 0 || B.toolResults.length > 0) && P.next({
+            if (V.blocks.length > 0 && P.next({
               type: "messages",
-              messages: B.messages,
-              toolResults: B.toolResults
+              blocks: V.blocks
             }), $.thread.messages.at(-1)?.content.some((M) => M.type === "summary"))
               return {
                 ...k(),
@@ -18530,30 +18528,30 @@ async function Bw({
             for (const M of W) {
               if (!ne.has(M.toolUseID))
                 continue;
-              const z = Yr($.thread, M.toolUseID), ee = E.toolConfirmationStatus.get(
+              const B = Yr($.thread, M.toolUseID), ee = E.toolConfirmationStatus.get(
                 M.toolUseID
               );
-              z && z.name === As && M.run.status === "blocked-on-user" && ee === void 0 && (E.toolConfirmationStatus.set(
+              B && B.name === As && M.run.status === "blocked-on-user" && ee === void 0 && (E.toolConfirmationStatus.set(
                 M.toolUseID,
                 "awaiting"
               ), O = !0, J.info("Added new tool to confirmation tracking", {
                 toolUseID: M.toolUseID,
-                toolName: z.name
+                toolName: B.name
               }));
             }
             if (O) {
               const M = Array.from(
                 E.toolConfirmationStatus.entries()
-              ).filter(([z, ee]) => ee === "awaiting");
+              ).filter(([B, ee]) => ee === "awaiting");
               if (M.length > 0) {
-                const [z] = M[0], ee = W.find(
-                  (I) => I.toolUseID === z
+                const [B] = M[0], ee = W.find(
+                  (I) => I.toolUseID === B
                 ), K = ee ? Yr($.thread, ee.toolUseID) : null;
                 if (ee && K)
                   return J.info(
                     `Starting tool confirmation process for ${M.length} tools`,
                     {
-                      firstToolID: z,
+                      firstToolID: B,
                       toolName: K.name
                     }
                   ), P.next({
@@ -18570,7 +18568,7 @@ async function Bw({
                   }), {
                     ...E,
                     type: "collecting-tool-confirmations",
-                    currentToolID: z,
+                    currentToolID: B,
                     tokenUsage: F
                   };
               }
@@ -18586,9 +18584,9 @@ async function Bw({
           const F = l.value.last?.messages.at(-1);
           let j = E.tokenUsage;
           if ($.status.state === "active") {
-            const B = l.value.last;
-            if (B) {
-              const G = Si(B);
+            const V = l.value.last;
+            if (V) {
+              const G = Si(V);
               G && (j = {
                 used: G.totalInputTokens,
                 maxAvailable: G.maxInputTokens
@@ -18639,10 +18637,10 @@ async function Bw({
                     retryable: !1
                   }), D.unsubscribe(), { ...E, type: "closing" };
                 {
-                  const B = $.status.ephemeralError.message;
-                  return J.error("Ephemeral error", { error: B }), E.type === "awaiting-agent" && E.displayedError !== B ? (P.next({
+                  const V = $.status.ephemeralError.message;
+                  return J.error("Ephemeral error", { error: V }), E.type === "awaiting-agent" && E.displayedError !== V ? (P.next({
                     type: "error",
-                    error: { type: "other", error: B },
+                    error: { type: "other", error: V },
                     retryable: !1
                   }), {
                     ...E,
@@ -18654,9 +18652,9 @@ async function Bw({
               switch ($.status.inferenceState) {
                 case "running":
                   {
-                    const B = l.value.last;
-                    if (B) {
-                      const G = $n(B);
+                    const V = l.value.last;
+                    if (V) {
+                      const G = $n(V);
                       G && P.next({
                         type: "state",
                         state: G
@@ -18673,7 +18671,7 @@ async function Bw({
                   return { ...k(), tokenUsage: j };
                 case "idle":
                   if (F?.content.some(
-                    (B) => B.type === "tool_result" && B.run.status === "blocked-on-user"
+                    (V) => V.type === "tool_result" && V.run.status === "blocked-on-user"
                   ))
                     return {
                       ...E,
@@ -18681,24 +18679,24 @@ async function Bw({
                       tokenUsage: j
                     };
                   if (l.value.last?.messages.some(
-                    (B) => B.role === "user" && B.content.some(
+                    (V) => V.role === "user" && V.content.some(
                       (G) => G.type === "tool_result" && G.run.status === "in-progress"
                     )
                   ) ?? !1) {
-                    const B = l.value.last?.messages.flatMap(
+                    const V = l.value.last?.messages.flatMap(
                       (X) => X.content
                     ).filter(
                       (X) => X.type === "tool_result" && "run" in X && "status" in X.run && X.run.status === "in-progress"
-                    ), G = B?.length ?? 0;
+                    ), G = V?.length ?? 0;
                     if (G > 0) {
-                      const X = G === 1 && B?.[0] && l.value.last ? Yr(
+                      const X = G === 1 && V?.[0] && l.value.last ? Yr(
                         l.value.last,
-                        B[0].toolUseID
-                      ) : void 0, W = G > 1 && B && l.value.last ? B.slice(
+                        V[0].toolUseID
+                      ) : void 0, W = G > 1 && V && l.value.last ? V.slice(
                         1,
                         Math.min(
                           4,
-                          B.length
+                          V.length
                         )
                       ).map((O) => Yr(
                         l.value.last,
@@ -18748,17 +18746,17 @@ async function Bw({
           J.info("Sending batch tool confirmations to worker", {
             toolCount: $.responses.size,
             responses: Array.from($.responses.entries()).map(
-              ([j, B]) => ({ id: j, accepted: B })
+              ([j, V]) => ({ id: j, accepted: V })
             )
-          }), $.responses.forEach((j, B) => {
+          }), $.responses.forEach((j, V) => {
             J.info("Sending individual tool confirmation to worker", {
-              toolUseID: B,
+              toolUseID: V,
               accepted: j
             }), b.handle({
               type: "user:tool-input",
-              toolUse: B,
+              toolUse: V,
               value: { accepted: j }
-            }), E.toolConfirmationStatus.set(B, "sent");
+            }), E.toolConfirmationStatus.set(V, "sent");
           }), J.info(
             "Transitioning to awaiting-agent after sending batch confirmations"
           );
@@ -18779,18 +18777,18 @@ async function Bw({
           const F = l.value.last;
           if (F) {
             const j = Si(F);
-            j && u.getTokenCountForThread(F).then((B) => {
-              if (B !== null) {
+            j && u.getTokenCountForThread(F).then((V) => {
+              if (V !== null) {
                 const G = {
-                  used: B,
+                  used: V,
                   maxAvailable: j.maxInputTokens
                 };
                 P.next({ type: "token-usage", tokenUsage: G });
               }
-            }).catch((B) => {
+            }).catch((V) => {
               J.error(
                 "Failed to calculate post-compaction token usage",
-                B
+                V
               );
             });
           }
@@ -18838,11 +18836,10 @@ async function Bw({
                 color: $.color
               }), E;
             if ($.type === "subthread-message")
-              return ($.messages.length > 0 || $.toolResults.length > 0) && P.next({
+              return $.blocks.length > 0 && P.next({
                 type: "subthread-messages",
                 subThreadID: $.subThreadID,
-                messages: $.messages,
-                toolResults: $.toolResults,
+                blocks: $.blocks,
                 color: $.color
               }), E;
             if ($.type === "subagent-finished")
@@ -18876,20 +18873,20 @@ async function Bw({
                   type: "user:message",
                   message: { content: [{ type: "text", text: F }] }
                 }).then(() => {
-                  t && t.sync().catch((B) => {
-                    J.error("Thread sync after submit error", B, {
+                  t && t.sync().catch((V) => {
+                    J.error("Thread sync after submit error", V, {
                       threadID: d
                     });
                   });
-                }).catch((B) => {
-                  J.error("Handle user message failed", B);
+                }).catch((V) => {
+                  J.error("Handle user message failed", V);
                 });
                 const j = l.value.last;
                 if (j) {
-                  const B = $n(j);
-                  B && P.next({
+                  const V = $n(j);
+                  V && P.next({
                     type: "state",
-                    state: B
+                    state: V
                   });
                 }
                 return {
@@ -18947,9 +18944,9 @@ async function Bw({
                         if (!l.value.isSet)
                           return J.error("Thread not available for finding next tool"), E;
                         const O = (l.value.last.messages.at(-1)?.content.filter(
-                          (z) => z.type === "tool_result" && z.run.status === "blocked-on-user"
+                          (B) => B.type === "tool_result" && B.run.status === "blocked-on-user"
                         ) ?? []).find(
-                          (z) => z.toolUseID === X
+                          (B) => B.toolUseID === X
                         ), M = O ? Yr(l.value.last, O.toolUseID) : null;
                         if (O && M)
                           return J.info(
@@ -18989,7 +18986,7 @@ async function Bw({
                           }))
                         }
                       );
-                      const B = new Map(
+                      const V = new Map(
                         j.map(([X, W]) => [
                           X,
                           W === "confirmed"
@@ -18997,7 +18994,7 @@ async function Bw({
                       );
                       A.next({
                         type: "batch-tool-confirmations-complete",
-                        responses: B
+                        responses: V
                       });
                       const G = j.length;
                       return P.next({
@@ -19064,7 +19061,7 @@ async function Bw({
 }
 async function zw(t) {
   try {
-    const e = await Fw("0.0.1749556889-gbc568f");
+    const e = await Fw("0.0.1749585689-g82b91d");
     e.hasUpdate && e.latestVersion ? (t.next({ type: "update-start-updating" }), setTimeout(async () => {
       try {
         await Uw(e.latestVersion), t.next({
@@ -19185,48 +19182,55 @@ function Vw(t) {
                   default:
                     return { status: d.status };
                 }
-              }, y = s.messages.map(([d, p]) => {
-                if (p.role === "user") {
-                  const { role: m, content: v, meta: l } = p, h = {
-                    role: m,
-                    content: c(v),
-                    meta: l
-                  };
-                  return [d, h];
-                } else if (p.role === "assistant") {
-                  const { role: m, content: v, state: l } = p, h = {
-                    role: m,
-                    content: c(v),
-                    state: l
-                  };
-                  return [d, h];
-                } else if (p.role === "info") {
-                  const { role: m, content: v } = p, l = {
-                    role: m,
-                    content: c(v)
-                  };
-                  return [d, l];
+              }, y = [], g = [];
+              for (const d of s.blocks)
+                if (d.type === "message") {
+                  const [p, m] = d.data;
+                  if (m.role === "user") {
+                    const { role: v, content: l, meta: h } = m, b = {
+                      role: v,
+                      content: c(l),
+                      meta: h
+                    };
+                    y.push([p, b]);
+                  } else if (m.role === "assistant") {
+                    const { role: v, content: l, state: h } = m, b = {
+                      role: v,
+                      content: c(l),
+                      state: h
+                    };
+                    y.push([p, b]);
+                  } else if (m.role === "info") {
+                    const { role: v, content: l } = m, h = {
+                      role: v,
+                      content: c(l)
+                    };
+                    y.push([p, h]);
+                  } else
+                    y.push([p, m]);
+                } else if (d.type === "toolResult") {
+                  const [p, m] = d.data;
+                  if (p.input && m.run !== void 0) {
+                    const v = {
+                      type: p.type,
+                      id: p.id,
+                      name: p.name,
+                      input: {}
+                    }, l = {
+                      type: m.type,
+                      toolUseID: m.toolUseID,
+                      run: f(m.run)
+                    };
+                    g.push([
+                      v,
+                      l
+                    ]);
+                  } else
+                    J.warn("Skipping tool result", {
+                      useBlock: p,
+                      resultBlock: m
+                    });
                 }
-                return [d, p];
-              }), g = s.toolResults.flatMap(([d, p]) => {
-                if (d.input && p.run !== void 0) {
-                  const m = {
-                    type: d.type,
-                    id: d.id,
-                    name: d.name,
-                    input: {}
-                  }, v = {
-                    type: p.type,
-                    toolUseID: p.toolUseID,
-                    run: f(p.run)
-                  };
-                  return [[m, v]];
-                } else
-                  return J.warn("Skipping tool result", {
-                    useBlock: d,
-                    resultBlock: p
-                  }), [];
-              });
               return r({
                 type: "messages",
                 messages: y,
@@ -19297,13 +19301,19 @@ function Vw(t) {
                 taskDescription: s.taskDescription,
                 result: s.result
               }), u;
-            case "subthread-messages":
+            case "subthread-messages": {
+              const c = s.blocks.filter(
+                (y) => y.type === "message"
+              ).length, f = s.blocks.filter(
+                (y) => y.type === "toolResult"
+              ).length;
               return r({
                 type: "subthread-activity",
                 subThreadID: s.subThreadID,
-                messageCount: s.messages.length,
-                toolResultCount: s.toolResults.length
+                messageCount: c,
+                toolResultCount: f
               }), u;
+            }
             case "state":
               switch (s.state.type) {
                 case "shutting-down":
@@ -20354,8 +20364,7 @@ Interrupt the agent with `, { foreground: "gray" })}${i.print("Ctrl+C", { foregr
               );
               return fl(
                 {
-                  messages: h.messages,
-                  toolResults: h.toolResults
+                  blocks: h.blocks
                 },
                 (_) => e.write(_ + `
 `),
@@ -20391,8 +20400,7 @@ Interrupt the agent with `, { foreground: "gray" })}${i.print("Ctrl+C", { foregr
               );
               return fl(
                 {
-                  messages: h.messages,
-                  toolResults: h.toolResults
+                  blocks: h.blocks
                 },
                 (_) => e.write(_ + `
 `),
@@ -20915,7 +20923,7 @@ async function At(t, e) {
   ei({
     logLevel: e.logLevel || process.env.AMP_LOG_LEVEL,
     logFile: e.logFile || process.env.AMP_LOG_FILE
-  }), rm("0.0.1749556889-gbc568f");
+  }), rm("0.0.1749585689-g82b91d");
   const n = e.settingsFile ?? process.env.AMP_SETTINGS_FILE;
   J.info("Using settings file", { settingsFile: n });
   const i = Vn(), r = fd({ settingsFile: n }), a = process.env.AMP_API_KEY;
@@ -21023,7 +21031,7 @@ function m_(t) {
   const e = new Pu().name("amp").description("AI-powered coding assistant").option("--thread-id [THREAD_ID]", "ID of the thread to continue running", void 0);
   e.option("-V, --version", "output the version number", () => {
     if (t.isTTY) {
-      const a = "0.0.1749556889-gbc568f".match(/^(\d+\.\d+)\.(\d+)-(.+)$/);
+      const a = "0.0.1749585689-g82b91d".match(/^(\d+\.\d+)\.(\d+)-(.+)$/);
       if (a) {
         const [, , o] = a;
         try {
@@ -21034,21 +21042,21 @@ function m_(t) {
               day: "numeric"
             });
             Ie.write(
-              `0.0.1749556889-gbc568f ${t.printer.print(`(released ${s})`, { foreground: "gray" })}
+              `0.0.1749585689-g82b91d ${t.printer.print(`(released ${s})`, { foreground: "gray" })}
 `
             );
           } else
-            Ie.write(`0.0.1749556889-gbc568f
+            Ie.write(`0.0.1749585689-g82b91d
 `);
         } catch {
-          Ie.write(`0.0.1749556889-gbc568f
+          Ie.write(`0.0.1749585689-g82b91d
 `);
         }
       } else
-        Ie.write(`0.0.1749556889-gbc568f
+        Ie.write(`0.0.1749585689-g82b91d
 `);
     } else
-      Ie.write(`0.0.1749556889-gbc568f
+      Ie.write(`0.0.1749585689-g82b91d
 `);
     process.exit(0);
   }), e.addHelpText(