@freecodecamp/universe-cli 0.5.1 → 0.7.0

package/dist/index.cjs

@@ -34,45 +34,45 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var require_src = __commonJS({
   "node_modules/.pnpm/sisteransi@1.0.5/node_modules/sisteransi/src/index.js"(exports2, module2) {
     "use strict";
-    var ESC = "\x1B";
-    var CSI = `${ESC}[`;
+    var ESC2 = "\x1B";
+    var CSI2 = `${ESC2}[`;
     var beep = "\x07";
     var cursor = {
       to(x, y2) {
-        if (!y2) return `${CSI}${x + 1}G`;
-        return `${CSI}${y2 + 1};${x + 1}H`;
+        if (!y2) return `${CSI2}${x + 1}G`;
+        return `${CSI2}${y2 + 1};${x + 1}H`;
       },
       move(x, y2) {
         let ret = "";
-        if (x < 0) ret += `${CSI}${-x}D`;
-        else if (x > 0) ret += `${CSI}${x}C`;
-        if (y2 < 0) ret += `${CSI}${-y2}A`;
-        else if (y2 > 0) ret += `${CSI}${y2}B`;
+        if (x < 0) ret += `${CSI2}${-x}D`;
+        else if (x > 0) ret += `${CSI2}${x}C`;
+        if (y2 < 0) ret += `${CSI2}${-y2}A`;
+        else if (y2 > 0) ret += `${CSI2}${y2}B`;
         return ret;
       },
-      up: (count = 1) => `${CSI}${count}A`,
-      down: (count = 1) => `${CSI}${count}B`,
-      forward: (count = 1) => `${CSI}${count}C`,
-      backward: (count = 1) => `${CSI}${count}D`,
-      nextLine: (count = 1) => `${CSI}E`.repeat(count),
-      prevLine: (count = 1) => `${CSI}F`.repeat(count),
-      left: `${CSI}G`,
-      hide: `${CSI}?25l`,
-      show: `${CSI}?25h`,
-      save: `${ESC}7`,
-      restore: `${ESC}8`
+      up: (count = 1) => `${CSI2}${count}A`,
+      down: (count = 1) => `${CSI2}${count}B`,
+      forward: (count = 1) => `${CSI2}${count}C`,
+      backward: (count = 1) => `${CSI2}${count}D`,
+      nextLine: (count = 1) => `${CSI2}E`.repeat(count),
+      prevLine: (count = 1) => `${CSI2}F`.repeat(count),
+      left: `${CSI2}G`,
+      hide: `${CSI2}?25l`,
+      show: `${CSI2}?25h`,
+      save: `${ESC2}7`,
+      restore: `${ESC2}8`
     };
     var scroll = {
-      up: (count = 1) => `${CSI}S`.repeat(count),
-      down: (count = 1) => `${CSI}T`.repeat(count)
+      up: (count = 1) => `${CSI2}S`.repeat(count),
+      down: (count = 1) => `${CSI2}T`.repeat(count)
     };
     var erase = {
-      screen: `${CSI}2J`,
-      up: (count = 1) => `${CSI}1J`.repeat(count),
-      down: (count = 1) => `${CSI}J`.repeat(count),
-      line: `${CSI}2K`,
-      lineEnd: `${CSI}K`,
-      lineStart: `${CSI}1K`,
+      screen: `${CSI2}2J`,
+      up: (count = 1) => `${CSI2}1J`.repeat(count),
+      down: (count = 1) => `${CSI2}J`.repeat(count),
+      line: `${CSI2}2K`,
+      lineEnd: `${CSI2}K`,
+      lineStart: `${CSI2}1K`,
       lines(count) {
         let clear = "";
         for (let i = 0; i < count; i++)
@@ -1117,12 +1117,12 @@ var require_foldFlowLines = __commonJS({
                 ch = text[i += 1];
                 overflow = true;
               }
-              const j = i > escEnd + 1 ? i - 2 : escStart - 1;
-              if (escapedFolds[j])
+              const j2 = i > escEnd + 1 ? i - 2 : escStart - 1;
+              if (escapedFolds[j2])
                 return text;
-              folds.push(j);
-              escapedFolds[j] = true;
-              end = j + endStep;
+              folds.push(j2);
+              escapedFolds[j2] = true;
+              end = j2 + endStep;
               split = void 0;
             } else {
               overflow = true;
@@ -3110,7 +3110,7 @@ var require_timestamp = __commonJS({
       const sign = str[0];
       const parts = sign === "-" || sign === "+" ? str.substring(1) : str;
       const num = (n) => asBigInt ? BigInt(n) : Number(n);
-      const res = parts.replace(/_/g, "").split(":").reduce((res2, p) => res2 * num(60) + num(p), num(0));
+      const res = parts.replace(/_/g, "").split(":").reduce((res2, p2) => res2 * num(60) + num(p2), num(0));
       return sign === "-" ? num(-1) * res : res;
     }
     function stringifySexagesimal(node) {
@@ -7400,7 +7400,7 @@ function lib_default(args, opts) {
   args = args || [];
   opts = opts || {};
   var k, arr, arg, name, val, out = { _: [] };
-  var i = 0, j = 0, idx = 0, len = args.length;
+  var i = 0, j2 = 0, idx = 0, len = args.length;
   const alibi = opts.alias !== void 0;
   const strict = opts.unknown !== void 0;
   const defaults = opts.default !== void 0;
@@ -7413,11 +7413,11 @@ function lib_default(args, opts) {
   }
   for (i = opts.boolean.length; i-- > 0; ) {
     arr = opts.alias[opts.boolean[i]] || [];
-    for (j = arr.length; j-- > 0; ) opts.boolean.push(arr[j]);
+    for (j2 = arr.length; j2-- > 0; ) opts.boolean.push(arr[j2]);
   }
   for (i = opts.string.length; i-- > 0; ) {
     arr = opts.alias[opts.string[i]] || [];
-    for (j = arr.length; j-- > 0; ) opts.string.push(arr[j]);
+    for (j2 = arr.length; j2-- > 0; ) opts.string.push(arr[j2]);
   }
   if (defaults) for (k in opts.default) {
     name = typeof opts.default[k];
@@ -7434,20 +7434,20 @@ function lib_default(args, opts) {
       out._ = out._.concat(args.slice(++i));
       break;
     }
-    for (j = 0; j < arg.length; j++) if (arg.charCodeAt(j) !== 45) break;
-    if (j === 0) out._.push(arg);
-    else if (arg.substring(j, j + 3) === "no-") {
-      name = arg.substring(j + 3);
+    for (j2 = 0; j2 < arg.length; j2++) if (arg.charCodeAt(j2) !== 45) break;
+    if (j2 === 0) out._.push(arg);
+    else if (arg.substring(j2, j2 + 3) === "no-") {
+      name = arg.substring(j2 + 3);
       if (strict && !~keys.indexOf(name)) return opts.unknown(arg);
       out[name] = false;
     } else {
-      for (idx = j + 1; idx < arg.length; idx++) if (arg.charCodeAt(idx) === 61) break;
-      name = arg.substring(j, idx);
+      for (idx = j2 + 1; idx < arg.length; idx++) if (arg.charCodeAt(idx) === 61) break;
+      name = arg.substring(j2, idx);
       val = arg.substring(++idx) || i + 1 === len || ("" + args[i + 1]).charCodeAt(0) === 45 || args[++i];
-      arr = j === 2 ? [name] : name;
+      arr = j2 === 2 ? [name] : name;
       for (idx = 0; idx < arr.length; idx++) {
         name = arr[idx];
-        if (strict && !~keys.indexOf(name)) return opts.unknown("-".repeat(j) + name);
+        if (strict && !~keys.indexOf(name)) return opts.unknown("-".repeat(j2) + name);
         toVal(out, name, idx + 1 < arr.length || val, opts);
       }
     }
@@ -8014,16 +8014,384 @@ var import_node_process = require("process");
 var _ = __toESM(require("readline"), 1);
 var import_node_readline = __toESM(require("readline"), 1);
 
+// node_modules/.pnpm/fast-string-truncated-width@1.2.1/node_modules/fast-string-truncated-width/dist/utils.js
+var isAmbiguous = (x) => {
+  return x === 161 || x === 164 || x === 167 || x === 168 || x === 170 || x === 173 || x === 174 || x >= 176 && x <= 180 || x >= 182 && x <= 186 || x >= 188 && x <= 191 || x === 198 || x === 208 || x === 215 || x === 216 || x >= 222 && x <= 225 || x === 230 || x >= 232 && x <= 234 || x === 236 || x === 237 || x === 240 || x === 242 || x === 243 || x >= 247 && x <= 250 || x === 252 || x === 254 || x === 257 || x === 273 || x === 275 || x === 283 || x === 294 || x === 295 || x === 299 || x >= 305 && x <= 307 || x === 312 || x >= 319 && x <= 322 || x === 324 || x >= 328 && x <= 331 || x === 333 || x === 338 || x === 339 || x === 358 || x === 359 || x === 363 || x === 462 || x === 464 || x === 466 || x === 468 || x === 470 || x === 472 || x === 474 || x === 476 || x === 593 || x === 609 || x === 708 || x === 711 || x >= 713 && x <= 715 || x === 717 || x === 720 || x >= 728 && x <= 731 || x === 733 || x === 735 || x >= 768 && x <= 879 || x >= 913 && x <= 929 || x >= 931 && x <= 937 || x >= 945 && x <= 961 || x >= 963 && x <= 969 || x === 1025 || x >= 1040 && x <= 1103 || x === 1105 || x === 8208 || x >= 8211 && x <= 8214 || x === 8216 || x === 8217 || x === 8220 || x === 8221 || x >= 8224 && x <= 8226 || x >= 8228 && x <= 8231 || x === 8240 || x === 8242 || x === 8243 || x === 8245 || x === 8251 || x === 8254 || x === 8308 || x === 8319 || x >= 8321 && x <= 8324 || x === 8364 || x === 8451 || x === 8453 || x === 8457 || x === 8467 || x === 8470 || x === 8481 || x === 8482 || x === 8486 || x === 8491 || x === 8531 || x === 8532 || x >= 8539 && x <= 8542 || x >= 8544 && x <= 8555 || x >= 8560 && x <= 8569 || x === 8585 || x >= 8592 && x <= 8601 || x === 8632 || x === 8633 || x === 8658 || x === 8660 || x === 8679 || x === 8704 || x === 8706 || x === 8707 || x === 8711 || x === 8712 || x === 8715 || x === 8719 || x === 8721 || x === 8725 || x === 8730 || x >= 8733 && x <= 8736 || x === 8739 || x === 8741 || x >= 8743 && x <= 8748 || x === 8750 || x >= 8756 && x <= 8759 || x === 8764 || x === 8765 || x === 8776 || x === 8780 || x === 8786 || x === 8800 || x === 8801 || x >= 8804 && x <= 8807 || x === 8810 || x === 8811 || x === 8814 || x === 8815 || x === 8834 || x === 8835 || x === 8838 || x === 8839 || x === 8853 || x === 8857 || x === 8869 || x === 8895 || x === 8978 || x >= 9312 && x <= 9449 || x >= 9451 && x <= 9547 || x >= 9552 && x <= 9587 || x >= 9600 && x <= 9615 || x >= 9618 && x <= 9621 || x === 9632 || x === 9633 || x >= 9635 && x <= 9641 || x === 9650 || x === 9651 || x === 9654 || x === 9655 || x === 9660 || x === 9661 || x === 9664 || x === 9665 || x >= 9670 && x <= 9672 || x === 9675 || x >= 9678 && x <= 9681 || x >= 9698 && x <= 9701 || x === 9711 || x === 9733 || x === 9734 || x === 9737 || x === 9742 || x === 9743 || x === 9756 || x === 9758 || x === 9792 || x === 9794 || x === 9824 || x === 9825 || x >= 9827 && x <= 9829 || x >= 9831 && x <= 9834 || x === 9836 || x === 9837 || x === 9839 || x === 9886 || x === 9887 || x === 9919 || x >= 9926 && x <= 9933 || x >= 9935 && x <= 9939 || x >= 9941 && x <= 9953 || x === 9955 || x === 9960 || x === 9961 || x >= 9963 && x <= 9969 || x === 9972 || x >= 9974 && x <= 9977 || x === 9979 || x === 9980 || x === 9982 || x === 9983 || x === 10045 || x >= 10102 && x <= 10111 || x >= 11094 && x <= 11097 || x >= 12872 && x <= 12879 || x >= 57344 && x <= 63743 || x >= 65024 && x <= 65039 || x === 65533 || x >= 127232 && x <= 127242 || x >= 127248 && x <= 127277 || x >= 127280 && x <= 127337 || x >= 127344 && x <= 127373 || x === 127375 || x === 127376 || x >= 127387 && x <= 127404 || x >= 917760 && x <= 917999 || x >= 983040 && x <= 1048573 || x >= 1048576 && x <= 1114109;
+};
+var isFullWidth = (x) => {
+  return x === 12288 || x >= 65281 && x <= 65376 || x >= 65504 && x <= 65510;
+};
+var isWide = (x) => {
+  return x >= 4352 && x <= 4447 || x === 8986 || x === 8987 || x === 9001 || x === 9002 || x >= 9193 && x <= 9196 || x === 9200 || x === 9203 || x === 9725 || x === 9726 || x === 9748 || x === 9749 || x >= 9800 && x <= 9811 || x === 9855 || x === 9875 || x === 9889 || x === 9898 || x === 9899 || x === 9917 || x === 9918 || x === 9924 || x === 9925 || x === 9934 || x === 9940 || x === 9962 || x === 9970 || x === 9971 || x === 9973 || x === 9978 || x === 9981 || x === 9989 || x === 9994 || x === 9995 || x === 10024 || x === 10060 || x === 10062 || x >= 10067 && x <= 10069 || x === 10071 || x >= 10133 && x <= 10135 || x === 10160 || x === 10175 || x === 11035 || x === 11036 || x === 11088 || x === 11093 || x >= 11904 && x <= 11929 || x >= 11931 && x <= 12019 || x >= 12032 && x <= 12245 || x >= 12272 && x <= 12287 || x >= 12289 && x <= 12350 || x >= 12353 && x <= 12438 || x >= 12441 && x <= 12543 || x >= 12549 && x <= 12591 || x >= 12593 && x <= 12686 || x >= 12688 && x <= 12771 || x >= 12783 && x <= 12830 || x >= 12832 && x <= 12871 || x >= 12880 && x <= 19903 || x >= 19968 && x <= 42124 || x >= 42128 && x <= 42182 || x >= 43360 && x <= 43388 || x >= 44032 && x <= 55203 || x >= 63744 && x <= 64255 || x >= 65040 && x <= 65049 || x >= 65072 && x <= 65106 || x >= 65108 && x <= 65126 || x >= 65128 && x <= 65131 || x >= 94176 && x <= 94180 || x === 94192 || x === 94193 || x >= 94208 && x <= 100343 || x >= 100352 && x <= 101589 || x >= 101632 && x <= 101640 || x >= 110576 && x <= 110579 || x >= 110581 && x <= 110587 || x === 110589 || x === 110590 || x >= 110592 && x <= 110882 || x === 110898 || x >= 110928 && x <= 110930 || x === 110933 || x >= 110948 && x <= 110951 || x >= 110960 && x <= 111355 || x === 126980 || x === 127183 || x === 127374 || x >= 127377 && x <= 127386 || x >= 127488 && x <= 127490 || x >= 127504 && x <= 127547 || x >= 127552 && x <= 127560 || x === 127568 || x === 127569 || x >= 127584 && x <= 127589 || x >= 127744 && x <= 127776 || x >= 127789 && x <= 127797 || x >= 127799 && x <= 127868 || x >= 127870 && x <= 127891 || x >= 127904 && x <= 127946 || x >= 127951 && x <= 127955 || x >= 127968 && x <= 127984 || x === 127988 || x >= 127992 && x <= 128062 || x === 128064 || x >= 128066 && x <= 128252 || x >= 128255 && x <= 128317 || x >= 128331 && x <= 128334 || x >= 128336 && x <= 128359 || x === 128378 || x === 128405 || x === 128406 || x === 128420 || x >= 128507 && x <= 128591 || x >= 128640 && x <= 128709 || x === 128716 || x >= 128720 && x <= 128722 || x >= 128725 && x <= 128727 || x >= 128732 && x <= 128735 || x === 128747 || x === 128748 || x >= 128756 && x <= 128764 || x >= 128992 && x <= 129003 || x === 129008 || x >= 129292 && x <= 129338 || x >= 129340 && x <= 129349 || x >= 129351 && x <= 129535 || x >= 129648 && x <= 129660 || x >= 129664 && x <= 129672 || x >= 129680 && x <= 129725 || x >= 129727 && x <= 129733 || x >= 129742 && x <= 129755 || x >= 129760 && x <= 129768 || x >= 129776 && x <= 129784 || x >= 131072 && x <= 196605 || x >= 196608 && x <= 262141;
+};
+
 // node_modules/.pnpm/fast-string-truncated-width@1.2.1/node_modules/fast-string-truncated-width/dist/index.js
+var ANSI_RE = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/y;
+var CONTROL_RE = /[\x00-\x08\x0A-\x1F\x7F-\x9F]{1,1000}/y;
+var TAB_RE = /\t{1,1000}/y;
 var EMOJI_RE = new RegExp("[\\u{1F1E6}-\\u{1F1FF}]{2}|\\u{1F3F4}[\\u{E0061}-\\u{E007A}]{2}[\\u{E0030}-\\u{E0039}\\u{E0061}-\\u{E007A}]{1,3}\\u{E007F}|(?:\\p{Emoji}\\uFE0F\\u20E3?|\\p{Emoji_Modifier_Base}\\p{Emoji_Modifier}?|\\p{Emoji_Presentation})(?:\\u200D(?:\\p{Emoji_Modifier_Base}\\p{Emoji_Modifier}?|\\p{Emoji_Presentation}|\\p{Emoji}\\uFE0F\\u20E3?))*", "yu");
+var LATIN_RE = /(?:[\x20-\x7E\xA0-\xFF](?!\uFE0F)){1,1000}/y;
 var MODIFIER_RE = new RegExp("\\p{M}+", "gu");
+var NO_TRUNCATION = { limit: Infinity, ellipsis: "" };
+var getStringTruncatedWidth = (input, truncationOptions = {}, widthOptions = {}) => {
+  const LIMIT = truncationOptions.limit ?? Infinity;
+  const ELLIPSIS = truncationOptions.ellipsis ?? "";
+  const ELLIPSIS_WIDTH = truncationOptions?.ellipsisWidth ?? (ELLIPSIS ? getStringTruncatedWidth(ELLIPSIS, NO_TRUNCATION, widthOptions).width : 0);
+  const ANSI_WIDTH = widthOptions.ansiWidth ?? 0;
+  const CONTROL_WIDTH = widthOptions.controlWidth ?? 0;
+  const TAB_WIDTH = widthOptions.tabWidth ?? 8;
+  const AMBIGUOUS_WIDTH = widthOptions.ambiguousWidth ?? 1;
+  const EMOJI_WIDTH = widthOptions.emojiWidth ?? 2;
+  const FULL_WIDTH_WIDTH = widthOptions.fullWidthWidth ?? 2;
+  const REGULAR_WIDTH = widthOptions.regularWidth ?? 1;
+  const WIDE_WIDTH = widthOptions.wideWidth ?? 2;
+  let indexPrev = 0;
+  let index = 0;
+  let length = input.length;
+  let lengthExtra = 0;
+  let truncationEnabled = false;
+  let truncationIndex = length;
+  let truncationLimit = Math.max(0, LIMIT - ELLIPSIS_WIDTH);
+  let unmatchedStart = 0;
+  let unmatchedEnd = 0;
+  let width = 0;
+  let widthExtra = 0;
+  outer: while (true) {
+    if (unmatchedEnd > unmatchedStart || index >= length && index > indexPrev) {
+      const unmatched = input.slice(unmatchedStart, unmatchedEnd) || input.slice(indexPrev, index);
+      lengthExtra = 0;
+      for (const char of unmatched.replaceAll(MODIFIER_RE, "")) {
+        const codePoint = char.codePointAt(0) || 0;
+        if (isFullWidth(codePoint)) {
+          widthExtra = FULL_WIDTH_WIDTH;
+        } else if (isWide(codePoint)) {
+          widthExtra = WIDE_WIDTH;
+        } else if (AMBIGUOUS_WIDTH !== REGULAR_WIDTH && isAmbiguous(codePoint)) {
+          widthExtra = AMBIGUOUS_WIDTH;
+        } else {
+          widthExtra = REGULAR_WIDTH;
+        }
+        if (width + widthExtra > truncationLimit) {
+          truncationIndex = Math.min(truncationIndex, Math.max(unmatchedStart, indexPrev) + lengthExtra);
+        }
+        if (width + widthExtra > LIMIT) {
+          truncationEnabled = true;
+          break outer;
+        }
+        lengthExtra += char.length;
+        width += widthExtra;
+      }
+      unmatchedStart = unmatchedEnd = 0;
+    }
+    if (index >= length)
+      break;
+    LATIN_RE.lastIndex = index;
+    if (LATIN_RE.test(input)) {
+      lengthExtra = LATIN_RE.lastIndex - index;
+      widthExtra = lengthExtra * REGULAR_WIDTH;
+      if (width + widthExtra > truncationLimit) {
+        truncationIndex = Math.min(truncationIndex, index + Math.floor((truncationLimit - width) / REGULAR_WIDTH));
+      }
+      if (width + widthExtra > LIMIT) {
+        truncationEnabled = true;
+        break;
+      }
+      width += widthExtra;
+      unmatchedStart = indexPrev;
+      unmatchedEnd = index;
+      index = indexPrev = LATIN_RE.lastIndex;
+      continue;
+    }
+    ANSI_RE.lastIndex = index;
+    if (ANSI_RE.test(input)) {
+      if (width + ANSI_WIDTH > truncationLimit) {
+        truncationIndex = Math.min(truncationIndex, index);
+      }
+      if (width + ANSI_WIDTH > LIMIT) {
+        truncationEnabled = true;
+        break;
+      }
+      width += ANSI_WIDTH;
+      unmatchedStart = indexPrev;
+      unmatchedEnd = index;
+      index = indexPrev = ANSI_RE.lastIndex;
+      continue;
+    }
+    CONTROL_RE.lastIndex = index;
+    if (CONTROL_RE.test(input)) {
+      lengthExtra = CONTROL_RE.lastIndex - index;
+      widthExtra = lengthExtra * CONTROL_WIDTH;
+      if (width + widthExtra > truncationLimit) {
+        truncationIndex = Math.min(truncationIndex, index + Math.floor((truncationLimit - width) / CONTROL_WIDTH));
+      }
+      if (width + widthExtra > LIMIT) {
+        truncationEnabled = true;
+        break;
+      }
+      width += widthExtra;
+      unmatchedStart = indexPrev;
+      unmatchedEnd = index;
+      index = indexPrev = CONTROL_RE.lastIndex;
+      continue;
+    }
+    TAB_RE.lastIndex = index;
+    if (TAB_RE.test(input)) {
+      lengthExtra = TAB_RE.lastIndex - index;
+      widthExtra = lengthExtra * TAB_WIDTH;
+      if (width + widthExtra > truncationLimit) {
+        truncationIndex = Math.min(truncationIndex, index + Math.floor((truncationLimit - width) / TAB_WIDTH));
+      }
+      if (width + widthExtra > LIMIT) {
+        truncationEnabled = true;
+        break;
+      }
+      width += widthExtra;
+      unmatchedStart = indexPrev;
+      unmatchedEnd = index;
+      index = indexPrev = TAB_RE.lastIndex;
+      continue;
+    }
+    EMOJI_RE.lastIndex = index;
+    if (EMOJI_RE.test(input)) {
+      if (width + EMOJI_WIDTH > truncationLimit) {
+        truncationIndex = Math.min(truncationIndex, index);
+      }
+      if (width + EMOJI_WIDTH > LIMIT) {
+        truncationEnabled = true;
+        break;
+      }
+      width += EMOJI_WIDTH;
+      unmatchedStart = indexPrev;
+      unmatchedEnd = index;
+      index = indexPrev = EMOJI_RE.lastIndex;
+      continue;
+    }
+    index += 1;
+  }
+  return {
+    width: truncationEnabled ? truncationLimit : width,
+    index: truncationEnabled ? truncationIndex : length,
+    truncated: truncationEnabled,
+    ellipsed: truncationEnabled && LIMIT >= ELLIPSIS_WIDTH
+  };
+};
+var dist_default = getStringTruncatedWidth;
+
+// node_modules/.pnpm/fast-string-width@1.1.0/node_modules/fast-string-width/dist/index.js
+var NO_TRUNCATION2 = {
+  limit: Infinity,
+  ellipsis: "",
+  ellipsisWidth: 0
+};
+var fastStringWidth = (input, options = {}) => {
+  return dist_default(input, NO_TRUNCATION2, options).width;
+};
+var dist_default2 = fastStringWidth;
 
 // node_modules/.pnpm/fast-wrap-ansi@0.1.6/node_modules/fast-wrap-ansi/lib/main.js
+var ESC = "\x1B";
+var CSI = "\x9B";
+var END_CODE = 39;
 var ANSI_ESCAPE_BELL = "\x07";
 var ANSI_CSI = "[";
 var ANSI_OSC = "]";
+var ANSI_SGR_TERMINATOR = "m";
 var ANSI_ESCAPE_LINK = `${ANSI_OSC}8;;`;
 var GROUP_REGEX = new RegExp(`(?:\\${ANSI_CSI}(?<code>\\d+)m|\\${ANSI_ESCAPE_LINK}(?<uri>.*)${ANSI_ESCAPE_BELL})`, "y");
+var getClosingCode = (openingCode) => {
+  if (openingCode >= 30 && openingCode <= 37)
+    return 39;
+  if (openingCode >= 90 && openingCode <= 97)
+    return 39;
+  if (openingCode >= 40 && openingCode <= 47)
+    return 49;
+  if (openingCode >= 100 && openingCode <= 107)
+    return 49;
+  if (openingCode === 1 || openingCode === 2)
+    return 22;
+  if (openingCode === 3)
+    return 23;
+  if (openingCode === 4)
+    return 24;
+  if (openingCode === 7)
+    return 27;
+  if (openingCode === 8)
+    return 28;
+  if (openingCode === 9)
+    return 29;
+  if (openingCode === 0)
+    return 0;
+  return void 0;
+};
+var wrapAnsiCode = (code) => `${ESC}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`;
+var wrapAnsiHyperlink = (url2) => `${ESC}${ANSI_ESCAPE_LINK}${url2}${ANSI_ESCAPE_BELL}`;
+var wrapWord = (rows, word, columns) => {
+  const characters = word[Symbol.iterator]();
+  let isInsideEscape = false;
+  let isInsideLinkEscape = false;
+  let lastRow = rows.at(-1);
+  let visible = lastRow === void 0 ? 0 : dist_default2(lastRow);
+  let currentCharacter = characters.next();
+  let nextCharacter = characters.next();
+  let rawCharacterIndex = 0;
+  while (!currentCharacter.done) {
+    const character = currentCharacter.value;
+    const characterLength = dist_default2(character);
+    if (visible + characterLength <= columns) {
+      rows[rows.length - 1] += character;
+    } else {
+      rows.push(character);
+      visible = 0;
+    }
+    if (character === ESC || character === CSI) {
+      isInsideEscape = true;
+      isInsideLinkEscape = word.startsWith(ANSI_ESCAPE_LINK, rawCharacterIndex + 1);
+    }
+    if (isInsideEscape) {
+      if (isInsideLinkEscape) {
+        if (character === ANSI_ESCAPE_BELL) {
+          isInsideEscape = false;
+          isInsideLinkEscape = false;
+        }
+      } else if (character === ANSI_SGR_TERMINATOR) {
+        isInsideEscape = false;
+      }
+    } else {
+      visible += characterLength;
+      if (visible === columns && !nextCharacter.done) {
+        rows.push("");
+        visible = 0;
+      }
+    }
+    currentCharacter = nextCharacter;
+    nextCharacter = characters.next();
+    rawCharacterIndex += character.length;
+  }
+  lastRow = rows.at(-1);
+  if (!visible && lastRow !== void 0 && lastRow.length && rows.length > 1) {
+    rows[rows.length - 2] += rows.pop();
+  }
+};
+var stringVisibleTrimSpacesRight = (string4) => {
+  const words = string4.split(" ");
+  let last = words.length;
+  while (last) {
+    if (dist_default2(words[last - 1])) {
+      break;
+    }
+    last--;
+  }
+  if (last === words.length) {
+    return string4;
+  }
+  return words.slice(0, last).join(" ") + words.slice(last).join("");
+};
+var exec = (string4, columns, options = {}) => {
+  if (options.trim !== false && string4.trim() === "") {
+    return "";
+  }
+  let returnValue = "";
+  let escapeCode;
+  let escapeUrl;
+  const words = string4.split(" ");
+  let rows = [""];
+  let rowLength = 0;
+  for (let index = 0; index < words.length; index++) {
+    const word = words[index];
+    if (options.trim !== false) {
+      const row = rows.at(-1) ?? "";
+      const trimmed = row.trimStart();
+      if (row.length !== trimmed.length) {
+        rows[rows.length - 1] = trimmed;
+        rowLength = dist_default2(trimmed);
+      }
+    }
+    if (index !== 0) {
+      if (rowLength >= columns && (options.wordWrap === false || options.trim === false)) {
+        rows.push("");
+        rowLength = 0;
+      }
+      if (rowLength || options.trim === false) {
+        rows[rows.length - 1] += " ";
+        rowLength++;
+      }
+    }
+    const wordLength = dist_default2(word);
+    if (options.hard && wordLength > columns) {
+      const remainingColumns = columns - rowLength;
+      const breaksStartingThisLine = 1 + Math.floor((wordLength - remainingColumns - 1) / columns);
+      const breaksStartingNextLine = Math.floor((wordLength - 1) / columns);
+      if (breaksStartingNextLine < breaksStartingThisLine) {
+        rows.push("");
+      }
+      wrapWord(rows, word, columns);
+      rowLength = dist_default2(rows.at(-1) ?? "");
+      continue;
+    }
+    if (rowLength + wordLength > columns && rowLength && wordLength) {
+      if (options.wordWrap === false && rowLength < columns) {
+        wrapWord(rows, word, columns);
+        rowLength = dist_default2(rows.at(-1) ?? "");
+        continue;
+      }
+      rows.push("");
+      rowLength = 0;
+    }
+    if (rowLength + wordLength > columns && options.wordWrap === false) {
+      wrapWord(rows, word, columns);
+      rowLength = dist_default2(rows.at(-1) ?? "");
+      continue;
+    }
+    rows[rows.length - 1] += word;
+    rowLength += wordLength;
+  }
+  if (options.trim !== false) {
+    rows = rows.map((row) => stringVisibleTrimSpacesRight(row));
+  }
+  const preString = rows.join("\n");
+  let inSurrogate = false;
+  for (let i = 0; i < preString.length; i++) {
+    const character = preString[i];
+    returnValue += character;
+    if (!inSurrogate) {
+      inSurrogate = character >= "\uD800" && character <= "\uDBFF";
+    } else {
+      continue;
+    }
+    if (character === ESC || character === CSI) {
+      GROUP_REGEX.lastIndex = i + 1;
+      const groupsResult = GROUP_REGEX.exec(preString);
+      const groups = groupsResult?.groups;
+      if (groups?.code !== void 0) {
+        const code = Number.parseFloat(groups.code);
+        escapeCode = code === END_CODE ? void 0 : code;
+      } else if (groups?.uri !== void 0) {
+        escapeUrl = groups.uri.length === 0 ? void 0 : groups.uri;
+      }
+    }
+    if (preString[i + 1] === "\n") {
+      if (escapeUrl) {
+        returnValue += wrapAnsiHyperlink("");
+      }
+      const closingCode = escapeCode ? getClosingCode(escapeCode) : void 0;
+      if (escapeCode && closingCode) {
+        returnValue += wrapAnsiCode(closingCode);
+      }
+    } else if (character === "\n") {
+      if (escapeCode && getClosingCode(escapeCode)) {
+        returnValue += wrapAnsiCode(escapeCode);
+      }
+      if (escapeUrl) {
+        returnValue += wrapAnsiHyperlink(escapeUrl);
+      }
+    }
+  }
+  return returnValue;
+};
+var CRLF_OR_LF = /\r?\n/;
+function wrapAnsi(string4, columns, options) {
+  return String(string4).normalize().split(CRLF_OR_LF).map((line) => exec(line, columns, options)).join("\n");
+}
 
 // node_modules/.pnpm/@clack+core@1.2.0/node_modules/@clack/core/dist/index.mjs
 var import_sisteransi = __toESM(require_src(), 1);
@@ -8031,7 +8399,196 @@ var import_node_tty = require("tty");
 var E = ["up", "down", "left", "right", "space", "enter", "cancel"];
 var G = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
 var u = { actions: new Set(E), aliases: /* @__PURE__ */ new Map([["k", "up"], ["j", "down"], ["h", "left"], ["l", "right"], ["", "cancel"], ["escape", "cancel"]]), messages: { cancel: "Canceled", error: "Something went wrong" }, withGuide: true, date: { monthNames: [...G], messages: { required: "Please enter a valid date", invalidMonth: "There are only 12 months in a year", invalidDay: (r, t2) => `There are only ${r} days in ${t2}`, afterMin: (r) => `Date must be on or after ${r.toISOString().slice(0, 10)}`, beforeMax: (r) => `Date must be on or before ${r.toISOString().slice(0, 10)}` } } };
+function V(r, t2) {
+  if (typeof r == "string") return u.aliases.get(r) === t2;
+  for (const e of r) if (e !== void 0 && V(e, t2)) return true;
+  return false;
+}
+function j(r, t2) {
+  if (r === t2) return;
+  const e = r.split(`
+`), s = t2.split(`
+`), i = Math.max(e.length, s.length), n = [];
+  for (let o = 0; o < i; o++) e[o] !== s[o] && n.push(o);
+  return { lines: n, numLinesBefore: e.length, numLinesAfter: s.length, numLines: i };
+}
 var Y = globalThis.process.platform.startsWith("win");
+var C = /* @__PURE__ */ Symbol("clack:cancel");
+function q(r) {
+  return r === C;
+}
+function w(r, t2) {
+  const e = r;
+  e.isTTY && e.setRawMode(t2);
+}
+function z({ input: r = import_node_process.stdin, output: t2 = import_node_process.stdout, overwrite: e = true, hideCursor: s = true } = {}) {
+  const i = _.createInterface({ input: r, output: t2, prompt: "", tabSize: 1 });
+  _.emitKeypressEvents(r, i), r instanceof import_node_tty.ReadStream && r.isTTY && r.setRawMode(true);
+  const n = (o, { name: a, sequence: h }) => {
+    const l = String(o);
+    if (V([l, a, h], "cancel")) {
+      s && t2.write(import_sisteransi.cursor.show), process.exit(0);
+      return;
+    }
+    if (!e) return;
+    const f = a === "return" ? 0 : -1, v = a === "return" ? -1 : 0;
+    _.moveCursor(t2, f, v, () => {
+      _.clearLine(t2, 1, () => {
+        r.once("keypress", n);
+      });
+    });
+  };
+  return s && t2.write(import_sisteransi.cursor.hide), r.once("keypress", n), () => {
+    r.off("keypress", n), s && t2.write(import_sisteransi.cursor.show), r instanceof import_node_tty.ReadStream && r.isTTY && !Y && r.setRawMode(false), i.terminal = false, i.close();
+  };
+}
+var O = (r) => "columns" in r && typeof r.columns == "number" ? r.columns : 80;
+var A = (r) => "rows" in r && typeof r.rows == "number" ? r.rows : 20;
+function R(r, t2, e, s = e) {
+  const i = O(r ?? import_node_process.stdout);
+  return wrapAnsi(t2, i - e.length, { hard: true, trim: false }).split(`
+`).map((n, o) => `${o === 0 ? s : e}${n}`).join(`
+`);
+}
+var p = class {
+  input;
+  output;
+  _abortSignal;
+  rl;
+  opts;
+  _render;
+  _track = false;
+  _prevFrame = "";
+  _subscribers = /* @__PURE__ */ new Map();
+  _cursor = 0;
+  state = "initial";
+  error = "";
+  value;
+  userInput = "";
+  constructor(t2, e = true) {
+    const { input: s = import_node_process.stdin, output: i = import_node_process.stdout, render: n, signal: o, ...a } = t2;
+    this.opts = a, this.onKeypress = this.onKeypress.bind(this), this.close = this.close.bind(this), this.render = this.render.bind(this), this._render = n.bind(this), this._track = e, this._abortSignal = o, this.input = s, this.output = i;
+  }
+  unsubscribe() {
+    this._subscribers.clear();
+  }
+  setSubscriber(t2, e) {
+    const s = this._subscribers.get(t2) ?? [];
+    s.push(e), this._subscribers.set(t2, s);
+  }
+  on(t2, e) {
+    this.setSubscriber(t2, { cb: e });
+  }
+  once(t2, e) {
+    this.setSubscriber(t2, { cb: e, once: true });
+  }
+  emit(t2, ...e) {
+    const s = this._subscribers.get(t2) ?? [], i = [];
+    for (const n of s) n.cb(...e), n.once && i.push(() => s.splice(s.indexOf(n), 1));
+    for (const n of i) n();
+  }
+  prompt() {
+    return new Promise((t2) => {
+      if (this._abortSignal) {
+        if (this._abortSignal.aborted) return this.state = "cancel", this.close(), t2(C);
+        this._abortSignal.addEventListener("abort", () => {
+          this.state = "cancel", this.close();
+        }, { once: true });
+      }
+      this.rl = import_node_readline.default.createInterface({ input: this.input, tabSize: 2, prompt: "", escapeCodeTimeout: 50, terminal: true }), this.rl.prompt(), this.opts.initialUserInput !== void 0 && this._setUserInput(this.opts.initialUserInput, true), this.input.on("keypress", this.onKeypress), w(this.input, true), this.output.on("resize", this.render), this.render(), this.once("submit", () => {
+        this.output.write(import_sisteransi.cursor.show), this.output.off("resize", this.render), w(this.input, false), t2(this.value);
+      }), this.once("cancel", () => {
+        this.output.write(import_sisteransi.cursor.show), this.output.off("resize", this.render), w(this.input, false), t2(C);
+      });
+    });
+  }
+  _isActionKey(t2, e) {
+    return t2 === "	";
+  }
+  _setValue(t2) {
+    this.value = t2, this.emit("value", this.value);
+  }
+  _setUserInput(t2, e) {
+    this.userInput = t2 ?? "", this.emit("userInput", this.userInput), e && this._track && this.rl && (this.rl.write(this.userInput), this._cursor = this.rl.cursor);
+  }
+  _clearUserInput() {
+    this.rl?.write(null, { ctrl: true, name: "u" }), this._setUserInput("");
+  }
+  onKeypress(t2, e) {
+    if (this._track && e.name !== "return" && (e.name && this._isActionKey(t2, e) && this.rl?.write(null, { ctrl: true, name: "h" }), this._cursor = this.rl?.cursor ?? 0, this._setUserInput(this.rl?.line)), this.state === "error" && (this.state = "active"), e?.name && (!this._track && u.aliases.has(e.name) && this.emit("cursor", u.aliases.get(e.name)), u.actions.has(e.name) && this.emit("cursor", e.name)), t2 && (t2.toLowerCase() === "y" || t2.toLowerCase() === "n") && this.emit("confirm", t2.toLowerCase() === "y"), this.emit("key", t2?.toLowerCase(), e), e?.name === "return") {
+      if (this.opts.validate) {
+        const s = this.opts.validate(this.value);
+        s && (this.error = s instanceof Error ? s.message : s, this.state = "error", this.rl?.write(this.userInput));
+      }
+      this.state !== "error" && (this.state = "submit");
+    }
+    V([t2, e?.name, e?.sequence], "cancel") && (this.state = "cancel"), (this.state === "submit" || this.state === "cancel") && this.emit("finalize"), this.render(), (this.state === "submit" || this.state === "cancel") && this.close();
+  }
+  close() {
+    this.input.unpipe(), this.input.removeListener("keypress", this.onKeypress), this.output.write(`
+`), w(this.input, false), this.rl?.close(), this.rl = void 0, this.emit(`${this.state}`, this.value), this.unsubscribe();
+  }
+  restoreCursor() {
+    const t2 = wrapAnsi(this._prevFrame, process.stdout.columns, { hard: true, trim: false }).split(`
+`).length - 1;
+    this.output.write(import_sisteransi.cursor.move(-999, t2 * -1));
+  }
+  render() {
+    const t2 = wrapAnsi(this._render(this) ?? "", process.stdout.columns, { hard: true, trim: false });
+    if (t2 !== this._prevFrame) {
+      if (this.state === "initial") this.output.write(import_sisteransi.cursor.hide);
+      else {
+        const e = j(this._prevFrame, t2), s = A(this.output);
+        if (this.restoreCursor(), e) {
+          const i = Math.max(0, e.numLinesAfter - s), n = Math.max(0, e.numLinesBefore - s);
+          let o = e.lines.find((a) => a >= i);
+          if (o === void 0) {
+            this._prevFrame = t2;
+            return;
+          }
+          if (e.lines.length === 1) {
+            this.output.write(import_sisteransi.cursor.move(0, o - n)), this.output.write(import_sisteransi.erase.lines(1));
+            const a = t2.split(`
+`);
+            this.output.write(a[o]), this._prevFrame = t2, this.output.write(import_sisteransi.cursor.move(0, a.length - o - 1));
+            return;
+          } else if (e.lines.length > 1) {
+            if (i < n) o = i;
+            else {
+              const h = o - n;
+              h > 0 && this.output.write(import_sisteransi.cursor.move(0, h));
+            }
+            this.output.write(import_sisteransi.erase.down());
+            const a = t2.split(`
+`).slice(o);
+            this.output.write(a.join(`
+`)), this._prevFrame = t2;
+            return;
+          }
+        }
+        this.output.write(import_sisteransi.erase.down());
+      }
+      this.output.write(t2), this.state === "initial" && (this.state = "active"), this._prevFrame = t2;
+    }
+  }
+};
+var Q = class extends p {
+  get cursor() {
+    return this.value ? 0 : 1;
+  }
+  get _value() {
+    return this.cursor === 0;
+  }
+  constructor(t2) {
+    super(t2, false), this.value = !!t2.initialValue, this.on("userInput", () => {
+      this.value = this._value;
+    }), this.on("confirm", (e) => {
+      this.output.write(import_sisteransi.cursor.move(0, -1)), this.value = e, this.state = "submit", this.close();
+    }), this.on("cursor", () => {
+      this.value = !this.value;
+    });
+  }
+};
 
 // node_modules/.pnpm/@clack+prompts@1.2.0/node_modules/@clack/prompts/dist/index.mjs
 var import_node_util2 = require("util");
@@ -8043,40 +8600,81 @@ function Ze() {
   return import_node_process2.default.platform !== "win32" ? import_node_process2.default.env.TERM !== "linux" : !!import_node_process2.default.env.CI || !!import_node_process2.default.env.WT_SESSION || !!import_node_process2.default.env.TERMINUS_SUBLIME || import_node_process2.default.env.ConEmuTask === "{cmd::Cmder}" || import_node_process2.default.env.TERM_PROGRAM === "Terminus-Sublime" || import_node_process2.default.env.TERM_PROGRAM === "vscode" || import_node_process2.default.env.TERM === "xterm-256color" || import_node_process2.default.env.TERM === "alacritty" || import_node_process2.default.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
 }
 var ee = Ze();
-var w = (e, i) => ee ? e : i;
-var _e = w("\u25C6", "*");
-var oe = w("\u25A0", "x");
-var ue = w("\u25B2", "x");
-var F = w("\u25C7", "o");
-var le = w("\u250C", "T");
-var d = w("\u2502", "|");
-var E2 = w("\u2514", "\u2014");
-var Ie = w("\u2510", "T");
-var Ee = w("\u2518", "\u2014");
-var z2 = w("\u25CF", ">");
-var H2 = w("\u25CB", " ");
-var te = w("\u25FB", "[\u2022]");
-var U = w("\u25FC", "[+]");
-var J = w("\u25FB", "[ ]");
-var xe = w("\u25AA", "\u2022");
-var se = w("\u2500", "-");
-var ce = w("\u256E", "+");
-var Ge = w("\u251C", "+");
-var $e = w("\u256F", "+");
-var de = w("\u2570", "+");
-var Oe = w("\u256D", "+");
-var he = w("\u25CF", "\u2022");
-var pe = w("\u25C6", "*");
-var me = w("\u25B2", "!");
-var ge = w("\u25A0", "x");
+var ae = () => process.env.CI === "true";
+var w2 = (e, i) => ee ? e : i;
+var _e = w2("\u25C6", "*");
+var oe = w2("\u25A0", "x");
+var ue = w2("\u25B2", "x");
+var F = w2("\u25C7", "o");
+var le = w2("\u250C", "T");
+var d = w2("\u2502", "|");
+var E2 = w2("\u2514", "\u2014");
+var Ie = w2("\u2510", "T");
+var Ee = w2("\u2518", "\u2014");
+var z2 = w2("\u25CF", ">");
+var H2 = w2("\u25CB", " ");
+var te = w2("\u25FB", "[\u2022]");
+var U = w2("\u25FC", "[+]");
+var J = w2("\u25FB", "[ ]");
+var xe = w2("\u25AA", "\u2022");
+var se = w2("\u2500", "-");
+var ce = w2("\u256E", "+");
+var Ge = w2("\u251C", "+");
+var $e = w2("\u256F", "+");
+var de = w2("\u2570", "+");
+var Oe = w2("\u256D", "+");
+var he = w2("\u25CF", "\u2022");
+var pe = w2("\u25C6", "*");
+var me = w2("\u25B2", "!");
+var ge = w2("\u25A0", "x");
+var V2 = (e) => {
+  switch (e) {
+    case "initial":
+    case "active":
+      return (0, import_node_util2.styleText)("cyan", _e);
+    case "cancel":
+      return (0, import_node_util2.styleText)("red", oe);
+    case "error":
+      return (0, import_node_util2.styleText)("yellow", ue);
+    case "submit":
+      return (0, import_node_util2.styleText)("green", F);
+  }
+};
+var ot2 = (e) => {
+  const i = e.active ?? "Yes", s = e.inactive ?? "No";
+  return new Q({ active: i, inactive: s, signal: e.signal, input: e.input, output: e.output, initialValue: e.initialValue ?? true, render() {
+    const r = e.withGuide ?? u.withGuide, u2 = `${V2(this.state)}  `, n = r ? `${(0, import_node_util2.styleText)("gray", d)}  ` : "", o = R(e.output, e.message, n, u2), c2 = `${r ? `${(0, import_node_util2.styleText)("gray", d)}
+` : ""}${o}
+`, a = this.value ? i : s;
+    switch (this.state) {
+      case "submit": {
+        const l = r ? `${(0, import_node_util2.styleText)("gray", d)}  ` : "";
+        return `${c2}${l}${(0, import_node_util2.styleText)("dim", a)}`;
+      }
+      case "cancel": {
+        const l = r ? `${(0, import_node_util2.styleText)("gray", d)}  ` : "";
+        return `${c2}${l}${(0, import_node_util2.styleText)(["strikethrough", "dim"], a)}${r ? `
+${(0, import_node_util2.styleText)("gray", d)}` : ""}`;
+      }
+      default: {
+        const l = r ? `${(0, import_node_util2.styleText)("cyan", d)}  ` : "", $2 = r ? (0, import_node_util2.styleText)("cyan", E2) : "";
+        return `${c2}${l}${this.value ? `${(0, import_node_util2.styleText)("green", z2)} ${i}` : `${(0, import_node_util2.styleText)("dim", H2)} ${(0, import_node_util2.styleText)("dim", i)}`}${e.vertical ? r ? `
+${(0, import_node_util2.styleText)("cyan", d)}  ` : `
+` : ` ${(0, import_node_util2.styleText)("dim", "/")} `}${this.value ? `${(0, import_node_util2.styleText)("dim", H2)} ${(0, import_node_util2.styleText)("dim", s)}` : `${(0, import_node_util2.styleText)("green", z2)} ${s}`}
+${$2}
+`;
+      }
+    }
+  } }).prompt();
+};
 var O2 = { message: (e = [], { symbol: i = (0, import_node_util2.styleText)("gray", d), secondarySymbol: s = (0, import_node_util2.styleText)("gray", d), output: r = process.stdout, spacing: u2 = 1, withGuide: n } = {}) => {
   const o = [], c2 = n ?? u.withGuide, a = c2 ? s : "", l = c2 ? `${i}  ` : "", $2 = c2 ? `${s}  ` : "";
-  for (let p = 0; p < u2; p++) o.push(a);
+  for (let p2 = 0; p2 < u2; p2++) o.push(a);
   const y2 = Array.isArray(e) ? e : e.split(`
 `);
   if (y2.length > 0) {
-    const [p, ...m] = y2;
-    p.length > 0 ? o.push(`${l}${p}`) : o.push(c2 ? i : "");
+    const [p2, ...m] = y2;
+    p2.length > 0 ? o.push(`${l}${p2}`) : o.push(c2 ? i : "");
     for (const g of m) g.length > 0 ? o.push(`${$2}${g}`) : o.push(c2 ? s : "");
   }
   r.write(`${o.join(`
@@ -8095,7 +8693,60 @@ var O2 = { message: (e = [], { symbol: i = (0, import_node_util2.styleText)("gra
 }, error: (e, i) => {
   O2.message(e, { ...i, symbol: (0, import_node_util2.styleText)("red", ge) });
 } };
-var Ve = { light: w("\u2500", "-"), heavy: w("\u2501", "="), block: w("\u2588", "#") };
+var Ct = (e) => (0, import_node_util2.styleText)("magenta", e);
+var fe = ({ indicator: e = "dots", onCancel: i, output: s = process.stdout, cancelMessage: r, errorMessage: u2, frames: n = ee ? ["\u25D2", "\u25D0", "\u25D3", "\u25D1"] : ["\u2022", "o", "O", "0"], delay: o = ee ? 80 : 120, signal: c2, ...a } = {}) => {
+  const l = ae();
+  let $2, y2, p2 = false, m = false, g = "", S2, h = performance.now();
+  const f = O(s), v = a?.styleFrame ?? Ct, T = (_2) => {
+    const A2 = _2 > 1 ? u2 ?? u.messages.error : r ?? u.messages.cancel;
+    m = _2 === 1, p2 && (W(A2, _2), m && typeof i == "function" && i());
+  }, C2 = () => T(2), b = () => T(1), x = () => {
+    process.on("uncaughtExceptionMonitor", C2), process.on("unhandledRejection", C2), process.on("SIGINT", b), process.on("SIGTERM", b), process.on("exit", T), c2 && c2.addEventListener("abort", b);
+  }, G2 = () => {
+    process.removeListener("uncaughtExceptionMonitor", C2), process.removeListener("unhandledRejection", C2), process.removeListener("SIGINT", b), process.removeListener("SIGTERM", b), process.removeListener("exit", T), c2 && c2.removeEventListener("abort", b);
+  }, M2 = () => {
+    if (S2 === void 0) return;
+    l && s.write(`
+`);
+    const _2 = wrapAnsi(S2, f, { hard: true, trim: false }).split(`
+`);
+    _2.length > 1 && s.write(import_sisteransi2.cursor.up(_2.length - 1)), s.write(import_sisteransi2.cursor.to(0)), s.write(import_sisteransi2.erase.down());
+  }, R2 = (_2) => _2.replace(/\.+$/, ""), j2 = (_2) => {
+    const A2 = (performance.now() - _2) / 1e3, k = Math.floor(A2 / 60), L = Math.floor(A2 % 60);
+    return k > 0 ? `[${k}m ${L}s]` : `[${L}s]`;
+  }, D2 = a.withGuide ?? u.withGuide, ie = (_2 = "") => {
+    p2 = true, $2 = z({ output: s }), g = R2(_2), h = performance.now(), D2 && s.write(`${(0, import_node_util2.styleText)("gray", d)}
+`);
+    let A2 = 0, k = 0;
+    x(), y2 = setInterval(() => {
+      if (l && g === S2) return;
+      M2(), S2 = g;
+      const L = v(n[A2]);
+      let Z;
+      if (l) Z = `${L}  ${g}...`;
+      else if (e === "timer") Z = `${L}  ${g} ${j2(h)}`;
+      else {
+        const Be = ".".repeat(Math.floor(k)).slice(0, 3);
+        Z = `${L}  ${g}${Be}`;
+      }
+      const Ne = wrapAnsi(Z, f, { hard: true, trim: false });
+      s.write(Ne), A2 = A2 + 1 < n.length ? A2 + 1 : 0, k = k < 4 ? k + 0.125 : 0;
+    }, o);
+  }, W = (_2 = "", A2 = 0, k = false) => {
+    if (!p2) return;
+    p2 = false, clearInterval(y2), M2();
+    const L = A2 === 0 ? (0, import_node_util2.styleText)("green", F) : A2 === 1 ? (0, import_node_util2.styleText)("red", oe) : (0, import_node_util2.styleText)("red", ue);
+    g = _2 ?? g, k || (e === "timer" ? s.write(`${L}  ${g} ${j2(h)}
+`) : s.write(`${L}  ${g}
+`)), G2(), $2();
+  };
+  return { start: ie, stop: (_2 = "") => W(_2, 0), message: (_2 = "") => {
+    g = R2(_2 ?? g);
+  }, cancel: (_2 = "") => W(_2, 1), error: (_2 = "") => W(_2, 2), clear: () => W("", 0, true), get isCancelled() {
+    return m;
+  } };
+};
+var Ve = { light: w2("\u2500", "-"), heavy: w2("\u2501", "="), block: w2("\u2588", "#") };
 var je = `${(0, import_node_util2.styleText)("gray", d)}  `;
 
 // src/output/exit-codes.ts
@@ -8215,14 +8866,14 @@ async function ensureDirectory(absPath) {
   }
 }
 async function runBuild(options, deps = {}) {
-  const exec = deps.exec ?? defaultExec;
+  const exec2 = deps.exec ?? defaultExec;
   const absCwd = (0, import_node_path3.isAbsolute)(options.cwd) ? options.cwd : (0, import_node_path3.resolve)(options.cwd);
   const absOutput = (0, import_node_path3.isAbsolute)(options.outputDir) ? options.outputDir : (0, import_node_path3.resolve)(absCwd, options.outputDir);
   if (!options.command) {
     await ensureDirectory(absOutput);
     return { skipped: true, outputDir: absOutput };
   }
-  const code = await exec({ command: options.command, cwd: absCwd });
+  const code = await exec2({ command: options.command, cwd: absCwd });
   if (code !== 0) {
     throw new ConfigError(
       `build command failed with exit code ${code}: ${options.command}`
@@ -8372,7 +9023,7 @@ function normalize(rel) {
   return out;
 }
 function createIgnoreFilter(patterns) {
-  const compiled = patterns.filter((p) => p.length > 0).map(compilePattern);
+  const compiled = patterns.filter((p2) => p2.length > 0).map(compilePattern);
   return (relPath) => {
     const norm = normalize(relPath);
     for (const c2 of compiled) {
@@ -11532,7 +12183,7 @@ var $ZodUnion = /* @__PURE__ */ $constructor("$ZodUnion", (inst, def) => {
   defineLazy(inst._zod, "pattern", () => {
     if (def.options.every((o) => o._zod.pattern)) {
       const patterns = def.options.map((o) => o._zod.pattern);
-      return new RegExp(`^(${patterns.map((p) => cleanRegex(p.source)).join("|")})$`);
+      return new RegExp(`^(${patterns.map((p2) => cleanRegex(p2.source)).join("|")})$`);
     }
     return void 0;
   });
@@ -18209,9 +18860,9 @@ var $ZodRegistry = class {
     return this;
   }
   get(schema) {
-    const p = schema._zod.parent;
-    if (p) {
-      const pm = { ...this.get(p) ?? {} };
+    const p2 = schema._zod.parent;
+    if (p2) {
+      const pm = { ...this.get(p2) ?? {} };
       delete pm.id;
       const f = { ...pm, ...this._map.get(schema) };
       return Object.keys(f).length ? f : void 0;
@@ -22249,17 +22900,17 @@ function editDistance(a, b) {
     () => new Array(n + 1).fill(0)
   );
   for (let i = 0; i <= m; i++) d2[i][0] = i;
-  for (let j = 0; j <= n; j++) d2[0][j] = j;
+  for (let j2 = 0; j2 <= n; j2++) d2[0][j2] = j2;
   for (let i = 1; i <= m; i++) {
-    for (let j = 1; j <= n; j++) {
-      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
-      d2[i][j] = Math.min(
-        d2[i - 1][j] + 1,
-        d2[i][j - 1] + 1,
-        d2[i - 1][j - 1] + cost
+    for (let j2 = 1; j2 <= n; j2++) {
+      const cost = a[i - 1] === b[j2 - 1] ? 0 : 1;
+      d2[i][j2] = Math.min(
+        d2[i - 1][j2] + 1,
+        d2[i][j2 - 1] + 1,
+        d2[i - 1][j2 - 1] + cost
       );
-      if (i > 1 && j > 1 && a[i - 1] === b[j - 2] && a[i - 2] === b[j - 1]) {
-        d2[i][j] = Math.min(d2[i][j], d2[i - 2][j - 2] + 1);
+      if (i > 1 && j2 > 1 && a[i - 1] === b[j2 - 2] && a[i - 2] === b[j2 - 1]) {
+        d2[i][j2] = Math.min(d2[i][j2], d2[i - 2][j2 - 2] + 1);
       }
     }
   }
@@ -22286,6 +22937,14 @@ function suggest(target, candidates, threshold = 2) {
 }
 
 // src/lib/proxy-client.ts
+var DEFAULT_FETCH_TIMEOUT_MS = 3e4;
+function parseFetchTimeoutMs(env) {
+  const raw = env["UNIVERSE_FETCH_TIMEOUT_MS"];
+  if (raw === void 0 || raw === "") return void 0;
+  const n = Number(raw);
+  if (!Number.isFinite(n) || n < 0) return void 0;
+  return Math.floor(n);
+}
 var ProxyError = class extends CliError {
   exitCode;
   status;
@@ -22297,6 +22956,13 @@ var ProxyError = class extends CliError {
     this.exitCode = mapExitCode(status);
   }
 };
+var AliasDriftError = class extends ProxyError {
+  current;
+  constructor(message, current) {
+    super(409, "alias_drift", message);
+    this.current = current;
+  }
+};
 function mapExitCode(status) {
   if (status === 401 || status === 403) return EXIT_CREDENTIALS;
   if (status === 422 || status === 0 || status >= 500) return EXIT_STORAGE;
@@ -22332,9 +22998,11 @@ async function readErrorEnvelope(response) {
     };
   }
   if (isProxyErrorEnvelope(raw) && raw.error) {
+    const current = typeof raw.current === "string" ? raw.current : void 0;
     return {
       code: raw.error.code ?? `http_${status}`,
-      message: raw.error.message ?? response.statusText ?? "request failed"
+      message: raw.error.message ?? response.statusText ?? "request failed",
+      ...current === void 0 ? {} : { current }
     };
   }
   return {
@@ -22342,12 +23010,36 @@ async function readErrorEnvelope(response) {
     message: response.statusText || "request failed"
   };
 }
+function throwProxyError(status, env) {
+  if (status === 409 && env.code === "alias_drift") {
+    throw new AliasDriftError(env.message, env.current ?? "");
+  }
+  throw new ProxyError(status, env.code, env.message);
+}
 function stripTrailingSlash(url2) {
   return url2.endsWith("/") ? url2.slice(0, -1) : url2;
 }
 function createProxyClient(cfg) {
   const base = stripTrailingSlash(cfg.baseUrl);
   const fetchImpl = cfg.fetch ?? globalThis.fetch.bind(globalThis);
+  const timeoutMs = cfg.timeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS;
+  function withTimeoutSignal(init) {
+    if (timeoutMs <= 0) return init;
+    const timeoutSignal = AbortSignal.timeout(timeoutMs);
+    const merged = init.signal ? AbortSignal.any([init.signal, timeoutSignal]) : timeoutSignal;
+    return { ...init, signal: merged };
+  }
+  function translateFetchError(err) {
+    if (err instanceof DOMException && (err.name === "TimeoutError" || err.name === "AbortError")) {
+      throw new ProxyError(
+        0,
+        "timeout",
+        `proxy timed out after ${timeoutMs}ms`
+      );
+    }
+    const message = err instanceof Error ? err.message : String(err);
+    throw new ProxyError(0, "network_error", `proxy unreachable: ${message}`);
+  }
   async function userBearer() {
     const tok = await cfg.getAuthToken();
     return `Bearer ${tok}`;
@@ -22355,14 +23047,13 @@ function createProxyClient(cfg) {
   async function call(url2, init) {
     let response;
     try {
-      response = await fetchImpl(url2, init);
+      response = await fetchImpl(url2, withTimeoutSignal(init));
     } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      throw new ProxyError(0, "network_error", `proxy unreachable: ${message}`);
+      translateFetchError(err);
     }
     if (!response.ok) {
       const env = await readErrorEnvelope(response);
-      throw new ProxyError(response.status, env.code, env.message);
+      throwProxyError(response.status, env);
     }
     if (response.status === 204) {
       return void 0;
@@ -22426,18 +23117,53 @@ function createProxyClient(cfg) {
         }
       });
     },
+    async getAlias(req) {
+      const url2 = `${base}/api/site/${encodeURIComponent(req.site)}/alias/${encodeURIComponent(req.mode)}`;
+      let response;
+      try {
+        response = await fetchImpl(
+          url2,
+          withTimeoutSignal({
+            method: "GET",
+            headers: {
+              Authorization: await userBearer(),
+              Accept: "application/json"
+            }
+          })
+        );
+      } catch (err) {
+        translateFetchError(err);
+      }
+      if (response.status === 404) return null;
+      if (!response.ok) {
+        const env = await readErrorEnvelope(response);
+        throwProxyError(response.status, env);
+      }
+      return await response.json();
+    },
     async sitePromote(req) {
       const url2 = `${base}/api/site/${encodeURIComponent(req.site)}/promote`;
+      const headers = {
+        Authorization: await userBearer(),
+        Accept: "application/json"
+      };
+      const body = {};
+      if (req.deployId !== void 0) body.deployId = req.deployId;
+      if (req.expectedCurrent !== void 0)
+        body.expectedCurrent = req.expectedCurrent;
+      const hasBody = Object.keys(body).length > 0;
+      if (hasBody) headers["Content-Type"] = "application/json";
       return call(url2, {
         method: "POST",
-        headers: {
-          Authorization: await userBearer(),
-          Accept: "application/json"
-        }
+        headers,
+        ...hasBody ? { body: JSON.stringify(body) } : {}
       });
     },
     async siteRollback(req) {
       const url2 = `${base}/api/site/${encodeURIComponent(req.site)}/rollback`;
+      const body = { to: req.to };
+      if (req.expectedCurrent !== void 0)
+        body.expectedCurrent = req.expectedCurrent;
       return call(url2, {
         method: "POST",
         headers: {
@@ -22445,7 +23171,7 @@ function createProxyClient(cfg) {
           Accept: "application/json",
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({ to: req.to })
+        body: JSON.stringify(body)
       });
     },
     async registerSite(req) {
@@ -22650,6 +23376,103 @@ function buildErrorEnvelope(command, code, message, issues) {
   };
 }
 
+// src/output/redact.ts
+var AWS_KEY_PREFIX_PATTERN = /(?:AKIA|ASIA|AROA|AIDA|ACCA|ANPA|ABIA|AGPA)[A-Z0-9]{12,}/g;
+var URL_CREDS_PATTERN = /https?:\/\/[^@\s]+@/g;
+var CREDENTIAL_CONTEXT_PATTERN = /(?:access_key_id|secret_access_key|accessKeyId|secretAccessKey|secret|password|token|key|credential|auth)\s*[=:]\s*([A-Za-z0-9/+=]{21,})/gi;
+var HEX_CREDENTIAL_CONTEXT_PATTERN = /(?:secret|password|token|key|credential|auth|access_key_id|secret_access_key)\s*[=:]\s*([a-f0-9]{32,})/gi;
+var JSON_CREDENTIAL_PATTERN = /"(?:secret|password|token|key|credential|auth|access_key_id|secret_access_key|accessKeyId|secretAccessKey)"\s*:\s*"[^"]+"/gi;
+var BEARER_PATTERN = /\bBearer\s+[A-Za-z0-9._~+/=-]+/gi;
+var CREDENTIAL_KEY_PATTERN = /(?:secret|password|token|key|credential|auth)/i;
+var EXACT_CREDENTIAL_KEYS = /* @__PURE__ */ new Set([
+  "accesskeyid",
+  "secretaccesskey",
+  "access_key_id",
+  "secret_access_key"
+]);
+var STANDALONE_LONG_SECRET = /^[A-Za-z0-9/+=]{21,}$/;
+function maskAwsKey(match) {
+  return match.slice(0, 4) + "****" + match.slice(-4);
+}
+function maskUrlCreds(match) {
+  const atIndex = match.lastIndexOf("@");
+  const protocolEnd = match.indexOf("://") + 3;
+  return match.slice(0, protocolEnd) + "****:****@" + match.slice(atIndex + 1);
+}
+function redact(value) {
+  let result = value;
+  result = result.replace(URL_CREDS_PATTERN, maskUrlCreds);
+  result = result.replace(AWS_KEY_PREFIX_PATTERN, maskAwsKey);
+  result = result.replace(BEARER_PATTERN, "Bearer ****");
+  result = result.replace(JSON_CREDENTIAL_PATTERN, (match) => {
+    const colonIndex = match.indexOf(":");
+    return match.slice(0, colonIndex + 1) + '"****"';
+  });
+  result = result.replace(
+    CREDENTIAL_CONTEXT_PATTERN,
+    (_match, _secret, _offset, _full) => {
+      const eqIndex = _match.indexOf("=");
+      const colonIndex = _match.indexOf(":");
+      const sepIndex = eqIndex >= 0 && colonIndex >= 0 ? Math.min(eqIndex, colonIndex) : eqIndex >= 0 ? eqIndex : colonIndex;
+      const prefix = _match.slice(0, sepIndex + 1);
+      return prefix + "****";
+    }
+  );
+  result = result.replace(HEX_CREDENTIAL_CONTEXT_PATTERN, (_match, _secret) => {
+    const eqIndex = _match.indexOf("=");
+    const colonIndex = _match.indexOf(":");
+    const sepIndex = eqIndex >= 0 && colonIndex >= 0 ? Math.min(eqIndex, colonIndex) : eqIndex >= 0 ? eqIndex : colonIndex;
+    const prefix = _match.slice(0, sepIndex + 1);
+    return prefix + "****";
+  });
+  return result;
+}
+function redactValue(value, keyName) {
+  if (typeof value === "string") {
+    if (keyName && EXACT_CREDENTIAL_KEYS.has(keyName.toLowerCase())) {
+      return "****";
+    }
+    const redacted = redact(value);
+    if (redacted === value && keyName && CREDENTIAL_KEY_PATTERN.test(keyName) && STANDALONE_LONG_SECRET.test(value)) {
+      return "****";
+    }
+    return redacted;
+  }
+  if (Array.isArray(value)) {
+    return value.map((v) => redactValue(v, keyName));
+  }
+  if (value !== null && typeof value === "object") {
+    return redactObject(value);
+  }
+  return value;
+}
+function redactObject(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    result[key] = redactValue(value, key);
+  }
+  return result;
+}
+
+// src/output/format.ts
+function outputError(ctx, code, message, optsOrIssues) {
+  const opts = Array.isArray(optsOrIssues) ? { issues: optsOrIssues } : optsOrIssues ?? {};
+  const redactedMessage = redact(message);
+  const redactedIssues = opts.issues?.map(redact);
+  if (ctx.json) {
+    const envelope = buildErrorEnvelope(
+      ctx.command,
+      code,
+      redactedMessage,
+      redactedIssues
+    );
+    const payload = opts.extras ? { ...envelope, ...redactObject(opts.extras) } : envelope;
+    process.stdout.write(JSON.stringify(payload) + "\n");
+  } else {
+    (opts.logError ?? ((m) => O2.error(m)))(redactedMessage);
+  }
+}
+
 // src/commands/deploy.ts
 var defaultReadPlatformYaml = async (cwd) => {
   return (0, import_promises4.readFile)((0, import_node_path5.resolve)(cwd, "platform.yaml"), "utf-8");
@@ -22743,6 +23566,7 @@ async function deploy(options, deps = {}) {
   const build = deps.runBuild ?? runBuild;
   const walk = deps.walkFiles ?? walkFiles;
   const upload = deps.uploadFiles ?? uploadFiles;
+  const mkSpinner = deps.createSpinner ?? (() => fe());
   const success2 = deps.logSuccess ?? ((s) => O2.success(s));
   const info = deps.logInfo ?? ((s) => O2.info(s));
   const warn = deps.logWarn ?? ((s) => O2.warn(s));
@@ -22759,7 +23583,8 @@ async function deploy(options, deps = {}) {
     const baseUrl = env["UNIVERSE_PROXY_URL"] ?? DEFAULT_PROXY_URL;
     const client = mkClient({
       baseUrl,
-      getAuthToken: () => identity.token
+      getAuthToken: () => identity.token,
+      timeoutMs: parseFetchTimeoutMs(env)
     });
     let me2;
     try {
@@ -22810,17 +23635,22 @@ async function deploy(options, deps = {}) {
     } catch (err) {
       rethrowProxy("deploy init failed", err);
     }
+    const spin = options.json ? null : mkSpinner();
+    spin?.start(`Uploading 0/${filtered.length} files`);
     const uploadResult = await upload({
       client,
       deployId: initResult.deployId,
       jwt: initResult.jwt,
-      files: filtered
+      files: filtered,
+      onProgress: spin ? (p2) => spin.message(`Uploading ${p2.uploaded}/${p2.total} \u2014 ${p2.current}`) : void 0
     });
     if (uploadResult.errors.length > 0) {
+      spin?.error(`Upload failed: ${uploadResult.errors.length} file(s)`);
       const message = `Upload partially failed: ${uploadResult.errors.length} file(s) failed:
   - ${uploadResult.errors.join("\n  - ")}`;
       throw new PartialUploadError(message);
     }
+    spin?.stop(`Uploaded ${uploadResult.fileCount} files`);
     const mode = options.promote ? "production" : "preview";
     let finalizeResult;
     try {
@@ -22833,6 +23663,25 @@ async function deploy(options, deps = {}) {
     } catch (err) {
       rethrowProxy("deploy finalize failed", err);
     }
+    if (options.promote && !options.json) {
+      try {
+        const preview = await client.getAlias({
+          site: config2.site,
+          mode: "preview"
+        });
+        if (preview && preview.deployId !== finalizeResult.deployId) {
+          warn(
+            `Preview alias still points to ${preview.deployId}; it will not auto-update. Run \`universe static deploy\` (without --promote) to refresh preview.`
+          );
+        }
+      } catch (err) {
+        if (err instanceof ProxyError && (err.status === 401 || err.status === 403)) {
+          warn(
+            `Preview alias probe got ${err.status} (${err.code}) \u2014 token may need rotation: ${err.message}`
+          );
+        }
+      }
+    }
     if (options.json) {
       emitJson(
         buildEnvelope("deploy", true, {
@@ -22879,11 +23728,9 @@ async function deploy(options, deps = {}) {
       code = EXIT_USAGE;
       message = String(err);
     }
-    if (options.json) {
-      emitJson(buildErrorEnvelope("deploy", code, message));
-    } else {
-      error48(message);
-    }
+    outputError({ json: options.json, command: "deploy" }, code, message, {
+      logError: error48
+    });
     exit(code);
   }
 }
@@ -23024,17 +23871,12 @@ async function login(options, deps = {}) {
     });
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    if (options.json) {
-      emitJson2({
-        schemaVersion: "1",
-        command: "login",
-        success: false,
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        error: { code: EXIT_CREDENTIALS, message }
-      });
-    } else {
-      error48(message);
-    }
+    outputError(
+      { json: options.json, command: "login" },
+      EXIT_CREDENTIALS,
+      message,
+      { logError: error48 }
+    );
     exit(EXIT_CREDENTIALS);
     return;
   }
@@ -23077,7 +23919,7 @@ var defaultReadPlatformYaml2 = async (cwd) => {
 function emitJson4(envelope) {
   process.stdout.write(JSON.stringify(envelope) + "\n");
 }
-var DEPLOY_ID_RE = /^(\d{8})-(\d{6})-([a-f0-9]+)$/i;
+var DEPLOY_ID_RE = /^(\d{8})-(\d{6})-(\S+)$/;
 function parseDeployId(deployId) {
   const m = DEPLOY_ID_RE.exec(deployId);
   if (!m) return { deployId, timestamp: null, sha: null };
@@ -23143,7 +23985,8 @@ async function ls(options, deps = {}) {
     const baseUrl = env["UNIVERSE_PROXY_URL"] ?? DEFAULT_PROXY_URL;
     const client = mkClient({
       baseUrl,
-      getAuthToken: () => identity.token
+      getAuthToken: () => identity.token,
+      timeoutMs: parseFetchTimeoutMs(env)
     });
     const raw = await client.siteDeploys({ site });
     const sorted = [...raw].sort(
@@ -23167,11 +24010,9 @@ async function ls(options, deps = {}) {
     success2(formatTable(deploys));
   } catch (err) {
     const { code, message } = wrapProxyError("ls", err);
-    if (options.json) {
-      emitJson4(buildErrorEnvelope("ls", code, message));
-    } else {
-      error48(message);
-    }
+    outputError({ json: options.json, command: "ls" }, code, message, {
+      logError: error48
+    });
     exit(code);
   }
 }
@@ -23179,6 +24020,11 @@ async function ls(options, deps = {}) {
 // src/commands/promote.ts
 var import_promises6 = require("fs/promises");
 var import_node_path7 = require("path");
+var defaultPromptConfirm = async (msg) => {
+  const r = await ot2({ message: msg, initialValue: false });
+  if (q(r)) return false;
+  return r === true;
+};
 var defaultReadPlatformYaml3 = async (cwd) => {
   return (0, import_promises6.readFile)((0, import_node_path7.resolve)(cwd, "platform.yaml"), "utf-8");
 };
@@ -23210,6 +24056,7 @@ async function promote(options, deps = {}) {
   const success2 = deps.logSuccess ?? ((s) => O2.success(s));
   const error48 = deps.logError ?? ((s) => O2.error(s));
   const exit = deps.exit ?? exitWithCode;
+  const promptConfirm = deps.promptConfirm ?? defaultPromptConfirm;
   try {
     const identity = await resolveId({ env });
     if (!identity) {
@@ -23221,16 +24068,80 @@ async function promote(options, deps = {}) {
     const baseUrl = env["UNIVERSE_PROXY_URL"] ?? DEFAULT_PROXY_URL;
     const client = mkClient({
       baseUrl,
-      getAuthToken: () => identity.token
+      getAuthToken: () => identity.token,
+      timeoutMs: parseFetchTimeoutMs(env)
     });
     let result;
     if (options.from) {
-      result = await client.siteRollback({
+      const prod = await client.getAlias({
         site: config2.site,
-        to: options.from
+        mode: "production"
       });
+      const initialExpected = prod?.deployId ?? "";
+      try {
+        result = await client.siteRollback({
+          site: config2.site,
+          to: options.from,
+          expectedCurrent: initialExpected
+        });
+      } catch (err) {
+        if (!(err instanceof AliasDriftError)) throw err;
+        if (options.json) throw err;
+        error48(
+          `drift: production moved to ${err.current}, expected ${initialExpected}`
+        );
+        const ok = await promptConfirm(
+          `Retry promote --from with expectedCurrent='${err.current}'?`
+        );
+        if (!ok) throw err;
+        result = await client.siteRollback({
+          site: config2.site,
+          to: options.from,
+          expectedCurrent: err.current
+        });
+      }
     } else {
-      result = await client.sitePromote({ site: config2.site });
+      const preview = await client.getAlias({
+        site: config2.site,
+        mode: "preview"
+      });
+      if (preview === null) {
+        throw new ConfigError(
+          "no preview alias to promote \u2014 run `universe static deploy` first"
+        );
+      }
+      const prod = await client.getAlias({
+        site: config2.site,
+        mode: "production"
+      });
+      if (!options.json) {
+        success2(
+          `Promoting ${preview.deployId} \u2192 ${prod?.deployId ?? "<none>"}`
+        );
+      }
+      const initialExpected = prod?.deployId ?? "";
+      try {
+        result = await client.sitePromote({
+          site: config2.site,
+          deployId: preview.deployId,
+          expectedCurrent: initialExpected
+        });
+      } catch (err) {
+        if (!(err instanceof AliasDriftError)) throw err;
+        if (options.json) throw err;
+        error48(
+          `drift: production moved to ${err.current}, expected ${initialExpected}`
+        );
+        const ok = await promptConfirm(
+          `Retry promote with expectedCurrent='${err.current}'?`
+        );
+        if (!ok) throw err;
+        result = await client.sitePromote({
+          site: config2.site,
+          deployId: preview.deployId,
+          expectedCurrent: err.current
+        });
+      }
     }
     if (options.json) {
       emitJson5(
@@ -23256,11 +24167,11 @@ async function promote(options, deps = {}) {
     }
   } catch (err) {
     const { code, message } = wrapProxyError("promote", err);
-    if (options.json) {
-      emitJson5(buildErrorEnvelope("promote", code, message));
-    } else {
-      error48(message);
-    }
+    const extras = err instanceof AliasDriftError ? { current: err.current } : void 0;
+    outputError({ json: options.json, command: "promote" }, code, message, {
+      logError: error48,
+      extras
+    });
     exit(code);
   }
 }
@@ -23268,6 +24179,11 @@ async function promote(options, deps = {}) {
 // src/commands/rollback.ts
 var import_promises7 = require("fs/promises");
 var import_node_path8 = require("path");
+var defaultPromptConfirm2 = async (msg) => {
+  const r = await ot2({ message: msg, initialValue: false });
+  if (q(r)) return false;
+  return r === true;
+};
 var defaultReadPlatformYaml4 = async (cwd) => {
   return (0, import_promises7.readFile)((0, import_node_path8.resolve)(cwd, "platform.yaml"), "utf-8");
 };
@@ -23299,6 +24215,7 @@ async function rollback(options, deps = {}) {
   const success2 = deps.logSuccess ?? ((s) => O2.success(s));
   const error48 = deps.logError ?? ((s) => O2.error(s));
   const exit = deps.exit ?? exitWithCode;
+  const promptConfirm = deps.promptConfirm ?? defaultPromptConfirm2;
   try {
     if (!options.to || options.to.trim().length === 0) {
       throw new UsageError(
@@ -23315,12 +24232,38 @@ async function rollback(options, deps = {}) {
     const baseUrl = env["UNIVERSE_PROXY_URL"] ?? DEFAULT_PROXY_URL;
     const client = mkClient({
       baseUrl,
-      getAuthToken: () => identity.token
+      getAuthToken: () => identity.token,
+      timeoutMs: parseFetchTimeoutMs(env)
     });
-    const result = await client.siteRollback({
+    const to = options.to.trim();
+    const prod = await client.getAlias({
       site: config2.site,
-      to: options.to.trim()
+      mode: "production"
     });
+    const initialExpected = prod?.deployId ?? "";
+    let result;
+    try {
+      result = await client.siteRollback({
+        site: config2.site,
+        to,
+        expectedCurrent: initialExpected
+      });
+    } catch (err) {
+      if (!(err instanceof AliasDriftError)) throw err;
+      if (options.json) throw err;
+      error48(
+        `drift: production moved to ${err.current}, expected ${initialExpected}`
+      );
+      const ok = await promptConfirm(
+        `Retry rollback with expectedCurrent='${err.current}'?`
+      );
+      if (!ok) throw err;
+      result = await client.siteRollback({
+        site: config2.site,
+        to,
+        expectedCurrent: err.current
+      });
+    }
     if (options.json) {
       emitJson6(
         buildEnvelope("rollback", true, {
@@ -23343,11 +24286,11 @@ async function rollback(options, deps = {}) {
     }
   } catch (err) {
     const { code, message } = wrapProxyError("rollback", err);
-    if (options.json) {
-      emitJson6(buildErrorEnvelope("rollback", code, message));
-    } else {
-      error48(message);
-    }
+    const extras = err instanceof AliasDriftError ? { current: err.current } : void 0;
+    outputError({ json: options.json, command: "rollback" }, code, message, {
+      logError: error48,
+      extras
+    });
     exit(code);
   }
 }
@@ -23367,18 +24310,20 @@ async function whoami(options, deps = {}) {
   const identity = await resolve6({ env });
   if (!identity) {
     const msg = "No GitHub identity available. Run `universe login`, set $GITHUB_TOKEN, or install the gh CLI.";
-    if (options.json) {
-      emitJson7(buildErrorEnvelope("whoami", EXIT_CREDENTIALS, msg));
-    } else {
-      error48(msg);
-    }
+    outputError(
+      { json: options.json, command: "whoami" },
+      EXIT_CREDENTIALS,
+      msg,
+      { logError: error48 }
+    );
     exit(EXIT_CREDENTIALS);
     return;
   }
   const baseUrl = env["UNIVERSE_PROXY_URL"] ?? DEFAULT_PROXY_URL2;
   const client = mkClient({
     baseUrl,
-    getAuthToken: () => identity.token
+    getAuthToken: () => identity.token,
+    timeoutMs: parseFetchTimeoutMs(env)
   });
   try {
     const result = await client.whoami();
@@ -23404,11 +24349,9 @@ async function whoami(options, deps = {}) {
   } catch (err) {
     const exitCode = err instanceof CliError ? err.exitCode : EXIT_CREDENTIALS;
     const message = err instanceof ProxyError ? `whoami failed (${err.code}): ${err.message}` : err instanceof Error ? err.message : String(err);
-    if (options.json) {
-      emitJson7(buildErrorEnvelope("whoami", exitCode, message));
-    } else {
-      error48(message);
-    }
+    outputError({ json: options.json, command: "whoami" }, exitCode, message, {
+      logError: error48
+    });
     exit(exitCode);
   }
 }
@@ -23435,7 +24378,8 @@ async function setupClient(deps) {
   const baseUrl = env["UNIVERSE_PROXY_URL"] ?? DEFAULT_PROXY_URL;
   const client = mkClient({
     baseUrl,
-    getAuthToken: () => identity.token
+    getAuthToken: () => identity.token,
+    timeoutMs: parseFetchTimeoutMs(env)
   });
   return { client, identitySource: identity.source };
 }
@@ -23462,7 +24406,7 @@ async function ls2(options, deps = {}) {
   const error48 = deps.logError ?? ((s) => O2.error(s));
   const exit = deps.exit ?? exitWithCode;
   try {
-    const { client } = await setupClient(deps);
+    const { client, identitySource } = await setupClient(deps);
     let rows = await client.listSites();
     let scope = "all";
     if (options.mine) {
@@ -23476,7 +24420,8 @@ async function ls2(options, deps = {}) {
         buildEnvelope(command, true, {
           count: rows.length,
           scope,
-          sites: rows
+          sites: rows,
+          identitySource
         })
       );
     } else {
@@ -23484,11 +24429,9 @@ async function ls2(options, deps = {}) {
     }
   } catch (err) {
     const { code, message } = wrapProxyError(command, err);
-    if (options.json) {
-      emitJson8(buildErrorEnvelope(command, code, message));
-    } else {
-      error48(message);
-    }
+    outputError({ json: options.json, command }, code, message, {
+      logError: error48
+    });
     exit(code);
   }
 }
@@ -23504,7 +24447,7 @@ async function register(options, deps = {}) {
       throw new UsageError("slug is required (positional argument)");
     }
     const teams = parseTeamsFlag(options.team);
-    const { client } = await setupClient(deps);
+    const { client, identitySource } = await setupClient(deps);
     const row = await client.registerSite({
       slug: options.slug,
       teams: teams.length > 0 ? teams : void 0
@@ -23515,7 +24458,8 @@ async function register(options, deps = {}) {
           slug: row.slug,
           teams: row.teams,
           createdAt: row.createdAt,
-          createdBy: row.createdBy
+          createdBy: row.createdBy,
+          identitySource
         })
       );
     } else {
@@ -23532,11 +24476,9 @@ async function register(options, deps = {}) {
     }
   } catch (err) {
     const { code, message } = wrapProxyError(command, err);
-    if (options.json) {
-      emitJson8(buildErrorEnvelope(command, code, message));
-    } else {
-      error48(message);
-    }
+    outputError({ json: options.json, command }, code, message, {
+      logError: error48
+    });
     exit(code);
   }
 }
@@ -23551,13 +24493,14 @@ async function rm2(options, deps = {}) {
     if (!options.slug || options.slug.trim().length === 0) {
       throw new UsageError("slug is required (positional argument)");
     }
-    const { client } = await setupClient(deps);
+    const { client, identitySource } = await setupClient(deps);
     await client.deleteSite({ slug: options.slug });
     if (options.json) {
       emitJson8(
         buildEnvelope(command, true, {
           slug: options.slug,
-          deleted: true
+          deleted: true,
+          identitySource
         })
       );
     } else {
@@ -23572,11 +24515,9 @@ async function rm2(options, deps = {}) {
     }
   } catch (err) {
     const { code, message } = wrapProxyError(command, err);
-    if (options.json) {
-      emitJson8(buildErrorEnvelope(command, code, message));
-    } else {
-      error48(message);
-    }
+    outputError({ json: options.json, command }, code, message, {
+      logError: error48
+    });
     exit(code);
   }
 }
@@ -23597,7 +24538,7 @@ async function update(options, deps = {}) {
         "--team is required with at least one slug; use `sites rm` to remove a site"
       );
     }
-    const { client } = await setupClient(deps);
+    const { client, identitySource } = await setupClient(deps);
     const row = await client.updateSite({
       slug: options.slug,
       teams
@@ -23607,7 +24548,8 @@ async function update(options, deps = {}) {
         buildEnvelope(command, true, {
           slug: row.slug,
           teams: row.teams,
-          updatedAt: row.updatedAt
+          updatedAt: row.updatedAt,
+          identitySource
         })
       );
     } else {
@@ -23623,78 +24565,15 @@ async function update(options, deps = {}) {
     }
   } catch (err) {
     const { code, message } = wrapProxyError(command, err);
-    if (options.json) {
-      emitJson8(buildErrorEnvelope(command, code, message));
-    } else {
-      error48(message);
-    }
+    outputError({ json: options.json, command }, code, message, {
+      logError: error48
+    });
     exit(code);
   }
 }
 
-// src/output/redact.ts
-var AWS_KEY_PREFIX_PATTERN = /(?:AKIA|ASIA|AROA|AIDA|ACCA|ANPA|ABIA|AGPA)[A-Z0-9]{12,}/g;
-var URL_CREDS_PATTERN = /https?:\/\/[^@\s]+@/g;
-var CREDENTIAL_CONTEXT_PATTERN = /(?:access_key_id|secret_access_key|accessKeyId|secretAccessKey|secret|password|token|key|credential|auth)\s*[=:]\s*([A-Za-z0-9/+=]{21,})/gi;
-var HEX_CREDENTIAL_CONTEXT_PATTERN = /(?:secret|password|token|key|credential|auth|access_key_id|secret_access_key)\s*[=:]\s*([a-f0-9]{32,})/gi;
-var JSON_CREDENTIAL_PATTERN = /"(?:secret|password|token|key|credential|auth|access_key_id|secret_access_key|accessKeyId|secretAccessKey)"\s*:\s*"[^"]+"/gi;
-var BEARER_PATTERN = /\bBearer\s+[A-Za-z0-9._~+/=-]+/gi;
-function maskAwsKey(match) {
-  return match.slice(0, 4) + "****" + match.slice(-4);
-}
-function maskUrlCreds(match) {
-  const atIndex = match.lastIndexOf("@");
-  const protocolEnd = match.indexOf("://") + 3;
-  return match.slice(0, protocolEnd) + "****:****@" + match.slice(atIndex + 1);
-}
-function redact(value) {
-  let result = value;
-  result = result.replace(URL_CREDS_PATTERN, maskUrlCreds);
-  result = result.replace(AWS_KEY_PREFIX_PATTERN, maskAwsKey);
-  result = result.replace(BEARER_PATTERN, "Bearer ****");
-  result = result.replace(JSON_CREDENTIAL_PATTERN, (match) => {
-    const colonIndex = match.indexOf(":");
-    return match.slice(0, colonIndex + 1) + '"****"';
-  });
-  result = result.replace(
-    CREDENTIAL_CONTEXT_PATTERN,
-    (_match, _secret, _offset, _full) => {
-      const eqIndex = _match.indexOf("=");
-      const colonIndex = _match.indexOf(":");
-      const sepIndex = eqIndex >= 0 && colonIndex >= 0 ? Math.min(eqIndex, colonIndex) : eqIndex >= 0 ? eqIndex : colonIndex;
-      const prefix = _match.slice(0, sepIndex + 1);
-      return prefix + "****";
-    }
-  );
-  result = result.replace(HEX_CREDENTIAL_CONTEXT_PATTERN, (_match, _secret) => {
-    const eqIndex = _match.indexOf("=");
-    const colonIndex = _match.indexOf(":");
-    const sepIndex = eqIndex >= 0 && colonIndex >= 0 ? Math.min(eqIndex, colonIndex) : eqIndex >= 0 ? eqIndex : colonIndex;
-    const prefix = _match.slice(0, sepIndex + 1);
-    return prefix + "****";
-  });
-  return result;
-}
-
-// src/output/format.ts
-function outputError(ctx, code, message, issues) {
-  const redactedMessage = redact(message);
-  const redactedIssues = issues?.map(redact);
-  if (ctx.json) {
-    const envelope = buildErrorEnvelope(
-      ctx.command,
-      code,
-      redactedMessage,
-      redactedIssues
-    );
-    process.stdout.write(JSON.stringify(envelope) + "\n");
-  } else {
-    O2.error(redactedMessage);
-  }
-}
-
 // src/cli.ts
-var version2 = true ? "0.5.1" : "0.0.0";
+var version2 = true ? "0.7.0" : "0.0.0";
 function handleActionError(command, json2, err) {
   const ctx = { json: json2, command };
   const message = err instanceof Error ? err.message : "unknown error";