reasonix 0.30.1 → 0.30.3

package/dashboard/dist/app.js

@@ -98,7 +98,7 @@ var require_core = __commonJS({
         const pieces = name.split(".");
         return [
           `${prefix}${pieces.shift()}`,
-          ...pieces.map((x3, i3) => `${x3}${"_".repeat(i3 + 1)}`)
+          ...pieces.map((x2, i3) => `${x2}${"_".repeat(i3 + 1)}`)
         ].join(" ");
       }
       return `${prefix}${name}`;
@@ -288,7 +288,7 @@ var require_core = __commonJS({
       return concat("(?:", re, ")?");
     }
     function concat(...args) {
-      const joined = args.map((x3) => source(x3)).join("");
+      const joined = args.map((x2) => source(x2)).join("");
       return joined;
     }
     function stripOptionsFromArgs(args) {
@@ -302,7 +302,7 @@ var require_core = __commonJS({
     }
     function either(...args) {
       const opts = stripOptionsFromArgs(args);
-      const joined = "(" + (opts.capture ? "" : "?:") + args.map((x3) => source(x3)).join("|") + ")";
+      const joined = "(" + (opts.capture ? "" : "?:") + args.map((x2) => source(x2)).join("|") + ")";
       return joined;
     }
     function countMatchGroups(re) {
@@ -363,8 +363,8 @@ var require_core = __commonJS({
         end: /$/,
         relevance: 0,
         /** @type {ModeCallback} */
-        "on:begin": (m2, resp) => {
-          if (m2.index !== 0) resp.ignoreMatch();
+        "on:begin": (m3, resp) => {
+          if (m3.index !== 0) resp.ignoreMatch();
         }
       }, opts);
     };
@@ -509,12 +509,12 @@ var require_core = __commonJS({
         mode,
         {
           /** @type {ModeCallback} */
-          "on:begin": (m2, resp) => {
-            resp.data._beginMatch = m2[1];
+          "on:begin": (m3, resp) => {
+            resp.data._beginMatch = m3[1];
           },
           /** @type {ModeCallback} */
-          "on:end": (m2, resp) => {
-            if (resp.data._beginMatch !== m2[1]) resp.ignoreMatch();
+          "on:end": (m3, resp) => {
+            if (resp.data._beginMatch !== m3[1]) resp.ignoreMatch();
           }
         }
       );
@@ -632,7 +632,7 @@ var require_core = __commonJS({
       return compiledKeywords;
       function compileList(scopeName2, keywordList) {
         if (caseInsensitive) {
-          keywordList = keywordList.map((x3) => x3.toLowerCase());
+          keywordList = keywordList.map((x2) => x2.toLowerCase());
         }
         keywordList.forEach(function(keyword) {
           const pair = keyword.split("|");
@@ -791,9 +791,9 @@ var require_core = __commonJS({
         }
         /** @param {string} s */
         exec(s3) {
-          const m2 = this.getMatcher(this.regexIndex);
-          m2.lastIndex = this.lastIndex;
-          let result = m2.exec(s3);
+          const m3 = this.getMatcher(this.regexIndex);
+          m3.lastIndex = this.lastIndex;
+          let result = m3.exec(s3);
           if (this.resumingScanAtSamePosition()) {
             if (result && result.index === this.lastIndex) ;
             else {
@@ -920,7 +920,7 @@ var require_core = __commonJS({
       }
       return mode;
     }
-    var version = "11.10.0";
+    var version = "11.11.1";
     var HTMLInjectionError = class extends Error {
       constructor(reason, html6) {
         super(reason);
@@ -1234,6 +1234,7 @@ var require_core = __commonJS({
             }
           }
           if (match.type === "illegal" && lexeme === "") {
+            modeBuffer += "\n";
             return 1;
           }
           if (iterations > 1e5 && iterations > match.index * 3) {
@@ -1420,19 +1421,19 @@ var require_core = __commonJS({
       }
       let wantsHighlight = false;
       function highlightAll() {
+        function boot() {
+          highlightAll();
+        }
         if (document.readyState === "loading") {
+          if (!wantsHighlight) {
+            window.addEventListener("DOMContentLoaded", boot, false);
+          }
           wantsHighlight = true;
           return;
         }
         const blocks = document.querySelectorAll(options2.cssSelector);
         blocks.forEach(highlightElement);
       }
-      function boot() {
-        if (wantsHighlight) highlightAll();
-      }
-      if (typeof window !== "undefined" && window.addEventListener) {
-        window.addEventListener("DOMContentLoaded", boot, false);
-      }
       function registerLanguage(languageName, languageDefinition) {
         let lang = null;
         try {
@@ -1922,6 +1923,7 @@ var require_bash = __commonJS({
         "else",
         "elif",
         "fi",
+        "time",
         "for",
         "while",
         "until",
@@ -1930,6 +1932,7 @@ var require_bash = __commonJS({
         "done",
         "case",
         "esac",
+        "coproc",
         "function",
         "select"
       ];
@@ -2241,9 +2244,10 @@ var require_c = __commonJS({
       const NUMBERS = {
         className: "number",
         variants: [
-          { begin: "\\b(0b[01']+)" },
-          { begin: "(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)" },
-          { begin: "(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)" }
+          { match: /\b(0b[01']+)/ },
+          { match: /(-?)\b([\d']+(\.[\d']*)?|\.[\d']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)/ },
+          { match: /(-?)\b(0[xX][a-fA-F0-9]+(?:'[a-fA-F0-9]+)*(?:\.[a-fA-F0-9]*(?:'[a-fA-F0-9]*)*)?(?:[pP][-+]?[0-9]+)?(l|L)?(u|U)?)/ },
+          { match: /(-?)\b\d+(?:'\d+)*(?:\.\d*(?:'\d*)*)?(?:[eE][-+]?\d+)?/ }
         ],
         relevance: 0
       };
@@ -2694,6 +2698,8 @@ var require_cpp = __commonJS({
         "counting_semaphore",
         "deque",
         "false_type",
+        "flat_map",
+        "flat_set",
         "future",
         "imaginary",
         "initializer_list",
@@ -3013,7 +3019,7 @@ var require_cpp = __commonJS({
             PREPROCESSOR,
             {
               // containers: ie, `vector <int> rooms (9);`
-              begin: "\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function)\\s*<(?!<)",
+              begin: "\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array|tuple|optional|variant|function|flat_map|flat_set)\\s*<(?!<)",
               end: ">",
               keywords: CPP_KEYWORDS,
               contains: [
@@ -3159,11 +3165,14 @@ var require_csharp = __commonJS({
         "alias",
         "and",
         "ascending",
+        "args",
         "async",
         "await",
         "by",
         "descending",
+        "dynamic",
         "equals",
+        "file",
         "from",
         "get",
         "global",
@@ -3179,7 +3188,10 @@ var require_csharp = __commonJS({
         "or",
         "orderby",
         "partial",
+        "record",
         "remove",
+        "required",
+        "scoped",
         "select",
         "set",
         "unmanaged",
@@ -3745,7 +3757,9 @@ var require_css = __commonJS({
       "align-self",
       "alignment-baseline",
       "all",
+      "anchor-name",
       "animation",
+      "animation-composition",
       "animation-delay",
       "animation-direction",
       "animation-duration",
@@ -3753,8 +3767,14 @@ var require_css = __commonJS({
       "animation-iteration-count",
       "animation-name",
       "animation-play-state",
+      "animation-range",
+      "animation-range-end",
+      "animation-range-start",
+      "animation-timeline",
       "animation-timing-function",
       "appearance",
+      "aspect-ratio",
+      "backdrop-filter",
       "backface-visibility",
       "background",
       "background-attachment",
@@ -3764,6 +3784,8 @@ var require_css = __commonJS({
       "background-image",
       "background-origin",
       "background-position",
+      "background-position-x",
+      "background-position-y",
       "background-repeat",
       "background-size",
       "baseline-shift",
@@ -3789,6 +3811,8 @@ var require_css = __commonJS({
       "border-bottom-width",
       "border-collapse",
       "border-color",
+      "border-end-end-radius",
+      "border-end-start-radius",
       "border-image",
       "border-image-outset",
       "border-image-repeat",
@@ -3813,8 +3837,6 @@ var require_css = __commonJS({
       "border-left-width",
       "border-radius",
       "border-right",
-      "border-end-end-radius",
-      "border-end-start-radius",
       "border-right-color",
       "border-right-style",
       "border-right-width",
@@ -3830,14 +3852,20 @@ var require_css = __commonJS({
       "border-top-width",
       "border-width",
       "bottom",
+      "box-align",
       "box-decoration-break",
+      "box-direction",
+      "box-flex",
+      "box-flex-group",
+      "box-lines",
+      "box-ordinal-group",
+      "box-orient",
+      "box-pack",
       "box-shadow",
       "box-sizing",
       "break-after",
       "break-before",
       "break-inside",
-      "cx",
-      "cy",
       "caption-side",
       "caret-color",
       "clear",
@@ -3861,19 +3889,31 @@ var require_css = __commonJS({
       "column-width",
       "columns",
       "contain",
+      "contain-intrinsic-block-size",
+      "contain-intrinsic-height",
+      "contain-intrinsic-inline-size",
+      "contain-intrinsic-size",
+      "contain-intrinsic-width",
+      "container",
+      "container-name",
+      "container-type",
       "content",
       "content-visibility",
       "counter-increment",
       "counter-reset",
+      "counter-set",
       "cue",
       "cue-after",
       "cue-before",
       "cursor",
+      "cx",
+      "cy",
       "direction",
       "display",
       "dominant-baseline",
       "empty-cells",
       "enable-background",
+      "field-sizing",
       "fill",
       "fill-opacity",
       "fill-rule",
@@ -3886,29 +3926,39 @@ var require_css = __commonJS({
       "flex-shrink",
       "flex-wrap",
       "float",
-      "flow",
       "flood-color",
       "flood-opacity",
+      "flow",
       "font",
       "font-display",
       "font-family",
       "font-feature-settings",
       "font-kerning",
       "font-language-override",
+      "font-optical-sizing",
+      "font-palette",
       "font-size",
       "font-size-adjust",
+      "font-smooth",
       "font-smoothing",
       "font-stretch",
       "font-style",
       "font-synthesis",
+      "font-synthesis-position",
+      "font-synthesis-small-caps",
+      "font-synthesis-style",
+      "font-synthesis-weight",
       "font-variant",
+      "font-variant-alternates",
       "font-variant-caps",
       "font-variant-east-asian",
+      "font-variant-emoji",
       "font-variant-ligatures",
       "font-variant-numeric",
       "font-variant-position",
       "font-variation-settings",
       "font-weight",
+      "forced-color-adjust",
       "gap",
       "glyph-orientation-horizontal",
       "glyph-orientation-vertical",
@@ -3930,14 +3980,19 @@ var require_css = __commonJS({
       "grid-template-rows",
       "hanging-punctuation",
       "height",
+      "hyphenate-character",
+      "hyphenate-limit-chars",
       "hyphens",
       "icon",
       "image-orientation",
       "image-rendering",
       "image-resolution",
       "ime-mode",
+      "initial-letter",
+      "initial-letter-align",
       "inline-size",
       "inset",
+      "inset-area",
       "inset-block",
       "inset-block-end",
       "inset-block-start",
@@ -3945,24 +4000,20 @@ var require_css = __commonJS({
       "inset-inline-end",
       "inset-inline-start",
       "isolation",
-      "kerning",
       "justify-content",
       "justify-items",
       "justify-self",
+      "kerning",
       "left",
       "letter-spacing",
       "lighting-color",
       "line-break",
       "line-height",
+      "line-height-step",
       "list-style",
       "list-style-image",
       "list-style-position",
       "list-style-type",
-      "marker",
-      "marker-end",
-      "marker-mid",
-      "marker-start",
-      "mask",
       "margin",
       "margin-block",
       "margin-block-end",
@@ -3974,6 +4025,11 @@ var require_css = __commonJS({
       "margin-left",
       "margin-right",
       "margin-top",
+      "margin-trim",
+      "marker",
+      "marker-end",
+      "marker-mid",
+      "marker-start",
       "marks",
       "mask",
       "mask-border",
@@ -3992,6 +4048,10 @@ var require_css = __commonJS({
       "mask-repeat",
       "mask-size",
       "mask-type",
+      "masonry-auto-flow",
+      "math-depth",
+      "math-shift",
+      "math-style",
       "max-block-size",
       "max-height",
       "max-inline-size",
@@ -4010,6 +4070,12 @@ var require_css = __commonJS({
       "normal",
       "object-fit",
       "object-position",
+      "offset",
+      "offset-anchor",
+      "offset-distance",
+      "offset-path",
+      "offset-position",
+      "offset-rotate",
       "opacity",
       "order",
       "orphans",
@@ -4019,9 +4085,19 @@ var require_css = __commonJS({
       "outline-style",
       "outline-width",
       "overflow",
+      "overflow-anchor",
+      "overflow-block",
+      "overflow-clip-margin",
+      "overflow-inline",
       "overflow-wrap",
       "overflow-x",
       "overflow-y",
+      "overlay",
+      "overscroll-behavior",
+      "overscroll-behavior-block",
+      "overscroll-behavior-inline",
+      "overscroll-behavior-x",
+      "overscroll-behavior-y",
       "padding",
       "padding-block",
       "padding-block-end",
@@ -4033,16 +4109,24 @@ var require_css = __commonJS({
       "padding-left",
       "padding-right",
       "padding-top",
+      "page",
       "page-break-after",
       "page-break-before",
       "page-break-inside",
+      "paint-order",
       "pause",
       "pause-after",
       "pause-before",
       "perspective",
       "perspective-origin",
+      "place-content",
+      "place-items",
+      "place-self",
       "pointer-events",
       "position",
+      "position-anchor",
+      "position-visibility",
+      "print-color-adjust",
       "quotes",
       "r",
       "resize",
@@ -4052,7 +4136,10 @@ var require_css = __commonJS({
       "right",
       "rotate",
       "row-gap",
+      "ruby-align",
+      "ruby-position",
       "scale",
+      "scroll-behavior",
       "scroll-margin",
       "scroll-margin-block",
       "scroll-margin-block-end",
@@ -4078,6 +4165,9 @@ var require_css = __commonJS({
       "scroll-snap-align",
       "scroll-snap-stop",
       "scroll-snap-type",
+      "scroll-timeline",
+      "scroll-timeline-axis",
+      "scroll-timeline-name",
       "scrollbar-color",
       "scrollbar-gutter",
       "scrollbar-width",
@@ -4085,6 +4175,10 @@ var require_css = __commonJS({
       "shape-margin",
       "shape-outside",
       "shape-rendering",
+      "speak",
+      "speak-as",
+      "src",
+      // @font-face
       "stop-color",
       "stop-opacity",
       "stroke",
@@ -4095,20 +4189,17 @@ var require_css = __commonJS({
       "stroke-miterlimit",
       "stroke-opacity",
       "stroke-width",
-      "speak",
-      "speak-as",
-      "src",
-      // @font-face
       "tab-size",
       "table-layout",
-      "text-anchor",
       "text-align",
       "text-align-all",
       "text-align-last",
+      "text-anchor",
       "text-combine-upright",
       "text-decoration",
       "text-decoration-color",
       "text-decoration-line",
+      "text-decoration-skip",
       "text-decoration-skip-ink",
       "text-decoration-style",
       "text-decoration-thickness",
@@ -4122,23 +4213,37 @@ var require_css = __commonJS({
       "text-overflow",
       "text-rendering",
       "text-shadow",
+      "text-size-adjust",
       "text-transform",
       "text-underline-offset",
       "text-underline-position",
+      "text-wrap",
+      "text-wrap-mode",
+      "text-wrap-style",
+      "timeline-scope",
       "top",
+      "touch-action",
       "transform",
       "transform-box",
       "transform-origin",
       "transform-style",
       "transition",
+      "transition-behavior",
       "transition-delay",
       "transition-duration",
       "transition-property",
       "transition-timing-function",
       "translate",
       "unicode-bidi",
+      "user-modify",
+      "user-select",
       "vector-effect",
       "vertical-align",
+      "view-timeline",
+      "view-timeline-axis",
+      "view-timeline-inset",
+      "view-timeline-name",
+      "view-transition-name",
       "visibility",
       "voice-balance",
       "voice-duration",
@@ -4149,6 +4254,7 @@ var require_css = __commonJS({
       "voice-stress",
       "voice-volume",
       "white-space",
+      "white-space-collapse",
       "widows",
       "width",
       "will-change",
@@ -4158,7 +4264,8 @@ var require_css = __commonJS({
       "writing-mode",
       "x",
       "y",
-      "z-index"
+      "z-index",
+      "zoom"
     ].sort().reverse();
     function css(hljs) {
       const regex = hljs.regex;
@@ -4469,8 +4576,8 @@ var require_markdown = __commonJS({
         ITALIC,
         BOLD_WITHOUT_ITALIC,
         ITALIC_WITHOUT_BOLD
-      ].forEach((m2) => {
-        m2.contains = m2.contains.concat(CONTAINABLE);
+      ].forEach((m3) => {
+        m3.contains = m3.contains.concat(CONTAINABLE);
       });
       CONTAINABLE = CONTAINABLE.concat(BOLD, ITALIC);
       const HEADER = {
@@ -4920,7 +5027,7 @@ var require_ruby = __commonJS({
         },
         {
           className: "params",
-          begin: /\|/,
+          begin: /\|(?!=)/,
           end: /\|/,
           excludeBegin: true,
           excludeEnd: true,
@@ -5399,7 +5506,7 @@ var require_java = __commonJS({
     };
     function recurRegex(re, substitution, depth) {
       if (depth === -1) return "";
-      return re.replace(substitution, (_4) => {
+      return re.replace(substitution, (_3) => {
         return recurRegex(re, substitution, depth - 1);
       });
     }
@@ -5450,7 +5557,8 @@ var require_java = __commonJS({
         "sealed",
         "yield",
         "permits",
-        "goto"
+        "goto",
+        "when"
       ];
       const BUILT_INS = [
         "super",
@@ -5673,7 +5781,9 @@ var require_javascript = __commonJS({
       "import",
       "from",
       "export",
-      "extends"
+      "extends",
+      // It's reached stage 3, which is "recommended for implementation":
+      "using"
     ];
     var LITERALS = [
       "true",
@@ -5820,14 +5930,14 @@ var require_javascript = __commonJS({
               response.ignoreMatch();
             }
           }
-          let m2;
+          let m3;
           const afterMatch = match.input.substring(afterMatchIndex);
-          if (m2 = afterMatch.match(/^\s*=/)) {
+          if (m3 = afterMatch.match(/^\s*=/)) {
             response.ignoreMatch();
             return;
           }
-          if (m2 = afterMatch.match(/^\s+extends\s+/)) {
-            if (m2.index === 0) {
+          if (m3 = afterMatch.match(/^\s+extends\s+/)) {
+            if (m3.index === 0) {
               response.ignoreMatch();
               return;
             }
@@ -6003,7 +6113,7 @@ var require_javascript = __commonJS({
         className: "params",
         // convert this to negative lookbehind in v12
         begin: /(\s*)\(/,
-        // to match the parms with 
+        // to match the parms with
         end: /\)/,
         excludeBegin: true,
         excludeEnd: true,
@@ -6116,7 +6226,7 @@ var require_javascript = __commonJS({
             ...BUILT_IN_GLOBALS,
             "super",
             "import"
-          ].map((x3) => `${x3}\\s*\\(`)),
+          ].map((x2) => `${x2}\\s*\\(`)),
           IDENT_RE$1,
           regex.lookahead(/\s*\(/)
         ),
@@ -6199,8 +6309,8 @@ var require_javascript = __commonJS({
           NUMBER,
           CLASS_REFERENCE,
           {
-            className: "attr",
-            begin: IDENT_RE$1 + regex.lookahead(":"),
+            scope: "attr",
+            match: IDENT_RE$1 + regex.lookahead(":"),
             relevance: 0
           },
           FUNCTION_VARIABLE,
@@ -6938,7 +7048,9 @@ var require_less = __commonJS({
       "align-self",
       "alignment-baseline",
       "all",
+      "anchor-name",
       "animation",
+      "animation-composition",
       "animation-delay",
       "animation-direction",
       "animation-duration",
@@ -6946,8 +7058,14 @@ var require_less = __commonJS({
       "animation-iteration-count",
       "animation-name",
       "animation-play-state",
+      "animation-range",
+      "animation-range-end",
+      "animation-range-start",
+      "animation-timeline",
       "animation-timing-function",
       "appearance",
+      "aspect-ratio",
+      "backdrop-filter",
       "backface-visibility",
       "background",
       "background-attachment",
@@ -6957,6 +7075,8 @@ var require_less = __commonJS({
       "background-image",
       "background-origin",
       "background-position",
+      "background-position-x",
+      "background-position-y",
       "background-repeat",
       "background-size",
       "baseline-shift",
@@ -6982,6 +7102,8 @@ var require_less = __commonJS({
       "border-bottom-width",
       "border-collapse",
       "border-color",
+      "border-end-end-radius",
+      "border-end-start-radius",
       "border-image",
       "border-image-outset",
       "border-image-repeat",
@@ -7006,8 +7128,6 @@ var require_less = __commonJS({
       "border-left-width",
       "border-radius",
       "border-right",
-      "border-end-end-radius",
-      "border-end-start-radius",
       "border-right-color",
       "border-right-style",
       "border-right-width",
@@ -7023,14 +7143,20 @@ var require_less = __commonJS({
       "border-top-width",
       "border-width",
       "bottom",
+      "box-align",
       "box-decoration-break",
+      "box-direction",
+      "box-flex",
+      "box-flex-group",
+      "box-lines",
+      "box-ordinal-group",
+      "box-orient",
+      "box-pack",
       "box-shadow",
       "box-sizing",
       "break-after",
       "break-before",
       "break-inside",
-      "cx",
-      "cy",
       "caption-side",
       "caret-color",
       "clear",
@@ -7054,19 +7180,31 @@ var require_less = __commonJS({
       "column-width",
       "columns",
       "contain",
+      "contain-intrinsic-block-size",
+      "contain-intrinsic-height",
+      "contain-intrinsic-inline-size",
+      "contain-intrinsic-size",
+      "contain-intrinsic-width",
+      "container",
+      "container-name",
+      "container-type",
       "content",
       "content-visibility",
       "counter-increment",
       "counter-reset",
+      "counter-set",
       "cue",
       "cue-after",
       "cue-before",
       "cursor",
+      "cx",
+      "cy",
       "direction",
       "display",
       "dominant-baseline",
       "empty-cells",
       "enable-background",
+      "field-sizing",
       "fill",
       "fill-opacity",
       "fill-rule",
@@ -7079,29 +7217,39 @@ var require_less = __commonJS({
       "flex-shrink",
       "flex-wrap",
       "float",
-      "flow",
       "flood-color",
       "flood-opacity",
+      "flow",
       "font",
       "font-display",
       "font-family",
       "font-feature-settings",
       "font-kerning",
       "font-language-override",
+      "font-optical-sizing",
+      "font-palette",
       "font-size",
       "font-size-adjust",
+      "font-smooth",
       "font-smoothing",
       "font-stretch",
       "font-style",
       "font-synthesis",
+      "font-synthesis-position",
+      "font-synthesis-small-caps",
+      "font-synthesis-style",
+      "font-synthesis-weight",
       "font-variant",
+      "font-variant-alternates",
       "font-variant-caps",
       "font-variant-east-asian",
+      "font-variant-emoji",
       "font-variant-ligatures",
       "font-variant-numeric",
       "font-variant-position",
       "font-variation-settings",
       "font-weight",
+      "forced-color-adjust",
       "gap",
       "glyph-orientation-horizontal",
       "glyph-orientation-vertical",
@@ -7123,14 +7271,19 @@ var require_less = __commonJS({
       "grid-template-rows",
       "hanging-punctuation",
       "height",
+      "hyphenate-character",
+      "hyphenate-limit-chars",
       "hyphens",
       "icon",
       "image-orientation",
       "image-rendering",
       "image-resolution",
       "ime-mode",
+      "initial-letter",
+      "initial-letter-align",
       "inline-size",
       "inset",
+      "inset-area",
       "inset-block",
       "inset-block-end",
       "inset-block-start",
@@ -7138,24 +7291,20 @@ var require_less = __commonJS({
       "inset-inline-end",
       "inset-inline-start",
       "isolation",
-      "kerning",
       "justify-content",
       "justify-items",
       "justify-self",
+      "kerning",
       "left",
       "letter-spacing",
       "lighting-color",
       "line-break",
       "line-height",
+      "line-height-step",
       "list-style",
       "list-style-image",
       "list-style-position",
       "list-style-type",
-      "marker",
-      "marker-end",
-      "marker-mid",
-      "marker-start",
-      "mask",
       "margin",
       "margin-block",
       "margin-block-end",
@@ -7167,6 +7316,11 @@ var require_less = __commonJS({
       "margin-left",
       "margin-right",
       "margin-top",
+      "margin-trim",
+      "marker",
+      "marker-end",
+      "marker-mid",
+      "marker-start",
       "marks",
       "mask",
       "mask-border",
@@ -7185,6 +7339,10 @@ var require_less = __commonJS({
       "mask-repeat",
       "mask-size",
       "mask-type",
+      "masonry-auto-flow",
+      "math-depth",
+      "math-shift",
+      "math-style",
       "max-block-size",
       "max-height",
       "max-inline-size",
@@ -7203,6 +7361,12 @@ var require_less = __commonJS({
       "normal",
       "object-fit",
       "object-position",
+      "offset",
+      "offset-anchor",
+      "offset-distance",
+      "offset-path",
+      "offset-position",
+      "offset-rotate",
       "opacity",
       "order",
       "orphans",
@@ -7212,9 +7376,19 @@ var require_less = __commonJS({
       "outline-style",
       "outline-width",
       "overflow",
+      "overflow-anchor",
+      "overflow-block",
+      "overflow-clip-margin",
+      "overflow-inline",
       "overflow-wrap",
       "overflow-x",
       "overflow-y",
+      "overlay",
+      "overscroll-behavior",
+      "overscroll-behavior-block",
+      "overscroll-behavior-inline",
+      "overscroll-behavior-x",
+      "overscroll-behavior-y",
       "padding",
       "padding-block",
       "padding-block-end",
@@ -7226,16 +7400,24 @@ var require_less = __commonJS({
       "padding-left",
       "padding-right",
       "padding-top",
+      "page",
       "page-break-after",
       "page-break-before",
       "page-break-inside",
+      "paint-order",
       "pause",
       "pause-after",
       "pause-before",
       "perspective",
       "perspective-origin",
+      "place-content",
+      "place-items",
+      "place-self",
       "pointer-events",
       "position",
+      "position-anchor",
+      "position-visibility",
+      "print-color-adjust",
       "quotes",
       "r",
       "resize",
@@ -7245,7 +7427,10 @@ var require_less = __commonJS({
       "right",
       "rotate",
       "row-gap",
+      "ruby-align",
+      "ruby-position",
       "scale",
+      "scroll-behavior",
       "scroll-margin",
       "scroll-margin-block",
       "scroll-margin-block-end",
@@ -7271,6 +7456,9 @@ var require_less = __commonJS({
       "scroll-snap-align",
       "scroll-snap-stop",
       "scroll-snap-type",
+      "scroll-timeline",
+      "scroll-timeline-axis",
+      "scroll-timeline-name",
       "scrollbar-color",
       "scrollbar-gutter",
       "scrollbar-width",
@@ -7278,6 +7466,10 @@ var require_less = __commonJS({
       "shape-margin",
       "shape-outside",
       "shape-rendering",
+      "speak",
+      "speak-as",
+      "src",
+      // @font-face
       "stop-color",
       "stop-opacity",
       "stroke",
@@ -7288,20 +7480,17 @@ var require_less = __commonJS({
       "stroke-miterlimit",
       "stroke-opacity",
       "stroke-width",
-      "speak",
-      "speak-as",
-      "src",
-      // @font-face
       "tab-size",
       "table-layout",
-      "text-anchor",
       "text-align",
       "text-align-all",
       "text-align-last",
+      "text-anchor",
       "text-combine-upright",
       "text-decoration",
       "text-decoration-color",
       "text-decoration-line",
+      "text-decoration-skip",
       "text-decoration-skip-ink",
       "text-decoration-style",
       "text-decoration-thickness",
@@ -7315,23 +7504,37 @@ var require_less = __commonJS({
       "text-overflow",
       "text-rendering",
       "text-shadow",
+      "text-size-adjust",
       "text-transform",
       "text-underline-offset",
       "text-underline-position",
+      "text-wrap",
+      "text-wrap-mode",
+      "text-wrap-style",
+      "timeline-scope",
       "top",
+      "touch-action",
       "transform",
       "transform-box",
       "transform-origin",
       "transform-style",
       "transition",
+      "transition-behavior",
       "transition-delay",
       "transition-duration",
       "transition-property",
       "transition-timing-function",
       "translate",
       "unicode-bidi",
+      "user-modify",
+      "user-select",
       "vector-effect",
       "vertical-align",
+      "view-timeline",
+      "view-timeline-axis",
+      "view-timeline-inset",
+      "view-timeline-name",
+      "view-transition-name",
       "visibility",
       "voice-balance",
       "voice-duration",
@@ -7342,6 +7545,7 @@ var require_less = __commonJS({
       "voice-stress",
       "voice-volume",
       "white-space",
+      "white-space-collapse",
       "widows",
       "width",
       "will-change",
@@ -7351,7 +7555,8 @@ var require_less = __commonJS({
       "writing-mode",
       "x",
       "y",
-      "z-index"
+      "z-index",
+      "zoom"
     ].sort().reverse();
     var PSEUDO_SELECTORS = PSEUDO_CLASSES.concat(PSEUDO_ELEMENTS).sort().reverse();
     function less(hljs) {
@@ -7592,6 +7797,7 @@ var require_lua = __commonJS({
       ];
       return {
         name: "Lua",
+        aliases: ["pluto"],
         keywords: {
           $pattern: hljs.UNDERSCORE_IDENT_RE,
           literal: "true false nil",
@@ -7662,7 +7868,11 @@ var require_makefile = __commonJS({
         begin: /\$\([\w-]+\s/,
         end: /\)/,
         keywords: { built_in: "subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value" },
-        contains: [VARIABLE]
+        contains: [
+          VARIABLE,
+          QUOTE_STRING
+          // Added QUOTE_STRING as they can be a part of functions
+        ]
       };
       const ASSIGNMENT = { begin: "^" + hljs.UNDERSCORE_IDENT_RE + "\\s*(?=[:+?]?=)" };
       const META = {
@@ -8461,6 +8671,10 @@ var require_php = __commonJS({
         /(\\?[A-Z][a-z0-9_\x7f-\xff]+|\\?[A-Z]+(?=[A-Z][a-z0-9_\x7f-\xff])){1,}/,
         NOT_PERL_ETC
       );
+      const UPCASE_NAME_RE = regex.concat(
+        /[A-Z]+/,
+        NOT_PERL_ETC
+      );
       const VARIABLE = {
         scope: "variable",
         match: "\\$+" + IDENT_RE
@@ -8496,11 +8710,11 @@ var require_php = __commonJS({
         begin: /<<<[ \t]*(?:(\w+)|"(\w+)")\n/,
         end: /[ \t]*(\w+)\b/,
         contains: hljs.QUOTE_STRING_MODE.contains.concat(SUBST),
-        "on:begin": (m2, resp) => {
-          resp.data._beginMatch = m2[1] || m2[2];
+        "on:begin": (m3, resp) => {
+          resp.data._beginMatch = m3[1] || m3[2];
         },
-        "on:end": (m2, resp) => {
-          if (resp.data._beginMatch !== m2[1]) resp.ignoreMatch();
+        "on:end": (m3, resp) => {
+          if (resp.data._beginMatch !== m3[1]) resp.ignoreMatch();
         }
       };
       const NOWDOC = hljs.END_SAME_AS_BEGIN({
@@ -8867,7 +9081,13 @@ var require_php = __commonJS({
         CONSTRUCTOR_CALL
       ];
       const ATTRIBUTES = {
-        begin: regex.concat(/#\[\s*/, PASCAL_CASE_CLASS_NAME_RE),
+        begin: regex.concat(
+          /#\[\s*\\?/,
+          regex.either(
+            PASCAL_CASE_CLASS_NAME_RE,
+            UPCASE_NAME_RE
+          )
+        ),
         beginScope: "meta",
         end: /]/,
         endScope: "meta",
@@ -8897,7 +9117,10 @@ var require_php = __commonJS({
           ...ATTRIBUTE_CONTAINS,
           {
             scope: "meta",
-            match: PASCAL_CASE_CLASS_NAME_RE
+            variants: [
+              { match: PASCAL_CASE_CLASS_NAME_RE },
+              { match: UPCASE_NAME_RE }
+            ]
           }
         ]
       };
@@ -8977,6 +9200,7 @@ var require_php = __commonJS({
                 keywords: KEYWORDS,
                 contains: [
                   "self",
+                  ATTRIBUTES,
                   VARIABLE,
                   LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
                   hljs.C_BLOCK_COMMENT_MODE,
@@ -9970,16 +10194,26 @@ var require_rust = __commonJS({
             illegal: null
           }),
           {
-            className: "string",
+            className: "symbol",
+            // negative lookahead to avoid matching `'`
+            begin: /'[a-zA-Z_][a-zA-Z0-9_]*(?!')/
+          },
+          {
+            scope: "string",
             variants: [
               { begin: /b?r(#*)"(.|\n)*?"\1(?!#)/ },
-              { begin: /b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/ }
+              {
+                begin: /b?'/,
+                end: /'/,
+                contains: [
+                  {
+                    scope: "char.escape",
+                    match: /\\('|\w|x\w{2}|u\w{4}|U\w{8})/
+                  }
+                ]
+              }
             ]
           },
-          {
-            className: "symbol",
-            begin: /'[a-zA-Z_][a-zA-Z0-9_]*/
-          },
           {
             className: "number",
             variants: [
@@ -10386,7 +10620,9 @@ var require_scss = __commonJS({
       "align-self",
       "alignment-baseline",
       "all",
+      "anchor-name",
       "animation",
+      "animation-composition",
       "animation-delay",
       "animation-direction",
       "animation-duration",
@@ -10394,8 +10630,14 @@ var require_scss = __commonJS({
       "animation-iteration-count",
       "animation-name",
       "animation-play-state",
+      "animation-range",
+      "animation-range-end",
+      "animation-range-start",
+      "animation-timeline",
       "animation-timing-function",
       "appearance",
+      "aspect-ratio",
+      "backdrop-filter",
       "backface-visibility",
       "background",
       "background-attachment",
@@ -10405,6 +10647,8 @@ var require_scss = __commonJS({
       "background-image",
       "background-origin",
       "background-position",
+      "background-position-x",
+      "background-position-y",
       "background-repeat",
       "background-size",
       "baseline-shift",
@@ -10430,6 +10674,8 @@ var require_scss = __commonJS({
       "border-bottom-width",
       "border-collapse",
       "border-color",
+      "border-end-end-radius",
+      "border-end-start-radius",
       "border-image",
       "border-image-outset",
       "border-image-repeat",
@@ -10454,8 +10700,6 @@ var require_scss = __commonJS({
       "border-left-width",
       "border-radius",
       "border-right",
-      "border-end-end-radius",
-      "border-end-start-radius",
       "border-right-color",
       "border-right-style",
       "border-right-width",
@@ -10471,14 +10715,20 @@ var require_scss = __commonJS({
       "border-top-width",
       "border-width",
       "bottom",
+      "box-align",
       "box-decoration-break",
+      "box-direction",
+      "box-flex",
+      "box-flex-group",
+      "box-lines",
+      "box-ordinal-group",
+      "box-orient",
+      "box-pack",
       "box-shadow",
       "box-sizing",
       "break-after",
       "break-before",
       "break-inside",
-      "cx",
-      "cy",
       "caption-side",
       "caret-color",
       "clear",
@@ -10502,19 +10752,31 @@ var require_scss = __commonJS({
       "column-width",
       "columns",
       "contain",
+      "contain-intrinsic-block-size",
+      "contain-intrinsic-height",
+      "contain-intrinsic-inline-size",
+      "contain-intrinsic-size",
+      "contain-intrinsic-width",
+      "container",
+      "container-name",
+      "container-type",
       "content",
       "content-visibility",
       "counter-increment",
       "counter-reset",
+      "counter-set",
       "cue",
       "cue-after",
       "cue-before",
       "cursor",
+      "cx",
+      "cy",
       "direction",
       "display",
       "dominant-baseline",
       "empty-cells",
       "enable-background",
+      "field-sizing",
       "fill",
       "fill-opacity",
       "fill-rule",
@@ -10527,29 +10789,39 @@ var require_scss = __commonJS({
       "flex-shrink",
       "flex-wrap",
       "float",
-      "flow",
       "flood-color",
       "flood-opacity",
+      "flow",
       "font",
       "font-display",
       "font-family",
       "font-feature-settings",
       "font-kerning",
       "font-language-override",
+      "font-optical-sizing",
+      "font-palette",
       "font-size",
       "font-size-adjust",
+      "font-smooth",
       "font-smoothing",
       "font-stretch",
       "font-style",
       "font-synthesis",
+      "font-synthesis-position",
+      "font-synthesis-small-caps",
+      "font-synthesis-style",
+      "font-synthesis-weight",
       "font-variant",
+      "font-variant-alternates",
       "font-variant-caps",
       "font-variant-east-asian",
+      "font-variant-emoji",
       "font-variant-ligatures",
       "font-variant-numeric",
       "font-variant-position",
       "font-variation-settings",
       "font-weight",
+      "forced-color-adjust",
       "gap",
       "glyph-orientation-horizontal",
       "glyph-orientation-vertical",
@@ -10571,14 +10843,19 @@ var require_scss = __commonJS({
       "grid-template-rows",
       "hanging-punctuation",
       "height",
+      "hyphenate-character",
+      "hyphenate-limit-chars",
       "hyphens",
       "icon",
       "image-orientation",
       "image-rendering",
       "image-resolution",
       "ime-mode",
+      "initial-letter",
+      "initial-letter-align",
       "inline-size",
       "inset",
+      "inset-area",
       "inset-block",
       "inset-block-end",
       "inset-block-start",
@@ -10586,24 +10863,20 @@ var require_scss = __commonJS({
       "inset-inline-end",
       "inset-inline-start",
       "isolation",
-      "kerning",
       "justify-content",
       "justify-items",
       "justify-self",
+      "kerning",
       "left",
       "letter-spacing",
       "lighting-color",
       "line-break",
       "line-height",
+      "line-height-step",
       "list-style",
       "list-style-image",
       "list-style-position",
       "list-style-type",
-      "marker",
-      "marker-end",
-      "marker-mid",
-      "marker-start",
-      "mask",
       "margin",
       "margin-block",
       "margin-block-end",
@@ -10615,6 +10888,11 @@ var require_scss = __commonJS({
       "margin-left",
       "margin-right",
       "margin-top",
+      "margin-trim",
+      "marker",
+      "marker-end",
+      "marker-mid",
+      "marker-start",
       "marks",
       "mask",
       "mask-border",
@@ -10633,6 +10911,10 @@ var require_scss = __commonJS({
       "mask-repeat",
       "mask-size",
       "mask-type",
+      "masonry-auto-flow",
+      "math-depth",
+      "math-shift",
+      "math-style",
       "max-block-size",
       "max-height",
       "max-inline-size",
@@ -10651,6 +10933,12 @@ var require_scss = __commonJS({
       "normal",
       "object-fit",
       "object-position",
+      "offset",
+      "offset-anchor",
+      "offset-distance",
+      "offset-path",
+      "offset-position",
+      "offset-rotate",
       "opacity",
       "order",
       "orphans",
@@ -10660,9 +10948,19 @@ var require_scss = __commonJS({
       "outline-style",
       "outline-width",
       "overflow",
+      "overflow-anchor",
+      "overflow-block",
+      "overflow-clip-margin",
+      "overflow-inline",
       "overflow-wrap",
       "overflow-x",
       "overflow-y",
+      "overlay",
+      "overscroll-behavior",
+      "overscroll-behavior-block",
+      "overscroll-behavior-inline",
+      "overscroll-behavior-x",
+      "overscroll-behavior-y",
       "padding",
       "padding-block",
       "padding-block-end",
@@ -10674,16 +10972,24 @@ var require_scss = __commonJS({
       "padding-left",
       "padding-right",
       "padding-top",
+      "page",
       "page-break-after",
       "page-break-before",
       "page-break-inside",
+      "paint-order",
       "pause",
       "pause-after",
       "pause-before",
       "perspective",
       "perspective-origin",
+      "place-content",
+      "place-items",
+      "place-self",
       "pointer-events",
       "position",
+      "position-anchor",
+      "position-visibility",
+      "print-color-adjust",
       "quotes",
       "r",
       "resize",
@@ -10693,7 +10999,10 @@ var require_scss = __commonJS({
       "right",
       "rotate",
       "row-gap",
+      "ruby-align",
+      "ruby-position",
       "scale",
+      "scroll-behavior",
       "scroll-margin",
       "scroll-margin-block",
       "scroll-margin-block-end",
@@ -10719,6 +11028,9 @@ var require_scss = __commonJS({
       "scroll-snap-align",
       "scroll-snap-stop",
       "scroll-snap-type",
+      "scroll-timeline",
+      "scroll-timeline-axis",
+      "scroll-timeline-name",
       "scrollbar-color",
       "scrollbar-gutter",
       "scrollbar-width",
@@ -10726,6 +11038,10 @@ var require_scss = __commonJS({
       "shape-margin",
       "shape-outside",
       "shape-rendering",
+      "speak",
+      "speak-as",
+      "src",
+      // @font-face
       "stop-color",
       "stop-opacity",
       "stroke",
@@ -10736,20 +11052,17 @@ var require_scss = __commonJS({
       "stroke-miterlimit",
       "stroke-opacity",
       "stroke-width",
-      "speak",
-      "speak-as",
-      "src",
-      // @font-face
       "tab-size",
       "table-layout",
-      "text-anchor",
       "text-align",
       "text-align-all",
       "text-align-last",
+      "text-anchor",
       "text-combine-upright",
       "text-decoration",
       "text-decoration-color",
       "text-decoration-line",
+      "text-decoration-skip",
       "text-decoration-skip-ink",
       "text-decoration-style",
       "text-decoration-thickness",
@@ -10763,23 +11076,37 @@ var require_scss = __commonJS({
       "text-overflow",
       "text-rendering",
       "text-shadow",
+      "text-size-adjust",
       "text-transform",
       "text-underline-offset",
       "text-underline-position",
+      "text-wrap",
+      "text-wrap-mode",
+      "text-wrap-style",
+      "timeline-scope",
       "top",
+      "touch-action",
       "transform",
       "transform-box",
       "transform-origin",
       "transform-style",
       "transition",
+      "transition-behavior",
       "transition-delay",
       "transition-duration",
       "transition-property",
       "transition-timing-function",
       "translate",
       "unicode-bidi",
+      "user-modify",
+      "user-select",
       "vector-effect",
       "vertical-align",
+      "view-timeline",
+      "view-timeline-axis",
+      "view-timeline-inset",
+      "view-timeline-name",
+      "view-transition-name",
       "visibility",
       "voice-balance",
       "voice-duration",
@@ -10790,6 +11117,7 @@ var require_scss = __commonJS({
       "voice-stress",
       "voice-volume",
       "white-space",
+      "white-space-collapse",
       "widows",
       "width",
       "will-change",
@@ -10799,7 +11127,8 @@ var require_scss = __commonJS({
       "writing-mode",
       "x",
       "y",
-      "z-index"
+      "z-index",
+      "zoom"
     ].sort().reverse();
     function scss(hljs) {
       const modes = MODES(hljs);
@@ -10957,19 +11286,19 @@ var require_sql = __commonJS({
       const regex = hljs.regex;
       const COMMENT_MODE = hljs.COMMENT("--", "$");
       const STRING = {
-        className: "string",
+        scope: "string",
         variants: [
           {
             begin: /'/,
             end: /'/,
-            contains: [{ begin: /''/ }]
+            contains: [{ match: /''/ }]
           }
         ]
       };
       const QUOTED_IDENTIFIER = {
         begin: /"/,
         end: /"/,
-        contains: [{ begin: /""/ }]
+        contains: [{ match: /""/ }]
       };
       const LITERALS = [
         "true",
@@ -11522,19 +11851,33 @@ var require_sql = __commonJS({
         return !RESERVED_FUNCTIONS.includes(keyword);
       });
       const VARIABLE = {
-        className: "variable",
-        begin: /@[a-z0-9][a-z0-9_]*/
+        scope: "variable",
+        match: /@[a-z0-9][a-z0-9_]*/
       };
       const OPERATOR = {
-        className: "operator",
-        begin: /[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
+        scope: "operator",
+        match: /[-+*/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?/,
         relevance: 0
       };
       const FUNCTION_CALL = {
-        begin: regex.concat(/\b/, regex.either(...FUNCTIONS), /\s*\(/),
+        match: regex.concat(/\b/, regex.either(...FUNCTIONS), /\s*\(/),
         relevance: 0,
         keywords: { built_in: FUNCTIONS }
       };
+      function kws_to_regex(list2) {
+        return regex.concat(
+          /\b/,
+          regex.either(...list2.map((kw) => {
+            return kw.replace(/\s+/, "\\s+");
+          })),
+          /\b/
+        );
+      }
+      const MULTI_WORD_KEYWORDS = {
+        scope: "keyword",
+        match: kws_to_regex(COMBOS),
+        relevance: 0
+      };
       function reduceRelevancy(list2, {
         exceptions,
         when
@@ -11558,26 +11901,17 @@ var require_sql = __commonJS({
         illegal: /[{}]|<\//,
         keywords: {
           $pattern: /\b[\w\.]+/,
-          keyword: reduceRelevancy(KEYWORDS, { when: (x3) => x3.length < 3 }),
+          keyword: reduceRelevancy(KEYWORDS, { when: (x2) => x2.length < 3 }),
           literal: LITERALS,
           type: TYPES,
           built_in: POSSIBLE_WITHOUT_PARENS
         },
         contains: [
           {
-            begin: regex.either(...COMBOS),
-            relevance: 0,
-            keywords: {
-              $pattern: /[\w\.]+/,
-              keyword: KEYWORDS.concat(COMBOS),
-              literal: LITERALS,
-              type: TYPES
-            }
-          },
-          {
-            className: "type",
-            begin: regex.either(...MULTI_WORD_TYPES)
+            scope: "type",
+            match: kws_to_regex(MULTI_WORD_TYPES)
           },
+          MULTI_WORD_KEYWORDS,
           FUNCTION_CALL,
           VARIABLE,
           STRING,
@@ -11606,7 +11940,7 @@ var require_swift = __commonJS({
       return concat("(?=", re, ")");
     }
     function concat(...args) {
-      const joined = args.map((x3) => source(x3)).join("");
+      const joined = args.map((x2) => source(x2)).join("");
       return joined;
     }
     function stripOptionsFromArgs(args) {
@@ -11620,7 +11954,7 @@ var require_swift = __commonJS({
     }
     function either(...args) {
       const opts = stripOptionsFromArgs(args);
-      const joined = "(" + (opts.capture ? "" : "?:") + args.map((x3) => source(x3)).join("|") + ")";
+      const joined = "(" + (opts.capture ? "" : "?:") + args.map((x2) => source(x2)).join("|") + ")";
       return joined;
     }
     var keywordWrapper = (keyword) => concat(
@@ -12361,6 +12695,31 @@ var require_swift = __commonJS({
         ],
         end: /}/
       };
+      const CLASS_FUNC_DECLARATION = {
+        match: [
+          /class\b/,
+          /\s+/,
+          /func\b/,
+          /\s+/,
+          /\b[A-Za-z_][A-Za-z0-9_]*\b/
+        ],
+        scope: {
+          1: "keyword",
+          3: "keyword",
+          5: "title.function"
+        }
+      };
+      const CLASS_VAR_DECLARATION = {
+        match: [
+          /class\b/,
+          /\s+/,
+          /var\b/
+        ],
+        scope: {
+          1: "keyword",
+          3: "keyword"
+        }
+      };
       const TYPE_DECLARATION = {
         begin: [
           /(struct|protocol|class|extension|enum|actor)/,
@@ -12421,6 +12780,8 @@ var require_swift = __commonJS({
           ...COMMENTS,
           FUNCTION_OR_MACRO,
           INIT_SUBSCRIPT,
+          CLASS_FUNC_DECLARATION,
+          CLASS_VAR_DECLARATION,
           TYPE_DECLARATION,
           OPERATOR_DECLARATION,
           PRECEDENCEGROUP,
@@ -12457,15 +12818,15 @@ var require_yaml = __commonJS({
       const KEY = {
         className: "attr",
         variants: [
-          // added brackets support 
-          { begin: /\w[\w :()\./-]*:(?=[ \t]|$)/ },
+          // added brackets support and special char support
+          { begin: /[\w*@][\w*@ :()\./-]*:(?=[ \t]|$)/ },
           {
-            // double quoted keys - with brackets
-            begin: /"\w[\w :()\./-]*":(?=[ \t]|$)/
+            // double quoted keys - with brackets and special char support
+            begin: /"[\w*@][\w*@ :()\./-]*":(?=[ \t]|$)/
           },
           {
-            // single quoted keys - with brackets
-            begin: /'\w[\w :()\./-]*':(?=[ \t]|$)/
+            // single quoted keys - with brackets and special char support
+            begin: /'[\w*@][\w*@ :()\./-]*':(?=[ \t]|$)/
           }
         ]
       };
@@ -12484,14 +12845,23 @@ var require_yaml = __commonJS({
           }
         ]
       };
+      const SINGLE_QUOTE_STRING = {
+        className: "string",
+        relevance: 0,
+        begin: /'/,
+        end: /'/,
+        contains: [
+          {
+            match: /''/,
+            scope: "char.escape",
+            relevance: 0
+          }
+        ]
+      };
       const STRING = {
         className: "string",
         relevance: 0,
         variants: [
-          {
-            begin: /'/,
-            end: /'/
-          },
           {
             begin: /"/,
             end: /"/
@@ -12506,7 +12876,13 @@ var require_yaml = __commonJS({
       const CONTAINER_STRING = hljs.inherit(STRING, { variants: [
         {
           begin: /'/,
-          end: /'/
+          end: /'/,
+          contains: [
+            {
+              begin: /''/,
+              relevance: 0
+            }
+          ]
         },
         {
           begin: /"/,
@@ -12621,6 +12997,7 @@ var require_yaml = __commonJS({
         },
         OBJECT,
         ARRAY,
+        SINGLE_QUOTE_STRING,
         STRING
       ];
       const VALUE_MODES = [...MODES];
@@ -12685,7 +13062,9 @@ var require_typescript = __commonJS({
       "import",
       "from",
       "export",
-      "extends"
+      "extends",
+      // It's reached stage 3, which is "recommended for implementation":
+      "using"
     ];
     var LITERALS = [
       "true",
@@ -12832,14 +13211,14 @@ var require_typescript = __commonJS({
               response.ignoreMatch();
             }
           }
-          let m2;
+          let m3;
           const afterMatch = match.input.substring(afterMatchIndex);
-          if (m2 = afterMatch.match(/^\s*=/)) {
+          if (m3 = afterMatch.match(/^\s*=/)) {
             response.ignoreMatch();
             return;
           }
-          if (m2 = afterMatch.match(/^\s+extends\s+/)) {
-            if (m2.index === 0) {
+          if (m3 = afterMatch.match(/^\s+extends\s+/)) {
+            if (m3.index === 0) {
               response.ignoreMatch();
               return;
             }
@@ -13015,7 +13394,7 @@ var require_typescript = __commonJS({
         className: "params",
         // convert this to negative lookbehind in v12
         begin: /(\s*)\(/,
-        // to match the parms with 
+        // to match the parms with
         end: /\)/,
         excludeBegin: true,
         excludeEnd: true,
@@ -13128,7 +13507,7 @@ var require_typescript = __commonJS({
             ...BUILT_IN_GLOBALS,
             "super",
             "import"
-          ].map((x3) => `${x3}\\s*\\(`)),
+          ].map((x2) => `${x2}\\s*\\(`)),
           IDENT_RE$1,
           regex.lookahead(/\s*\(/)
         ),
@@ -13211,8 +13590,8 @@ var require_typescript = __commonJS({
           NUMBER,
           CLASS_REFERENCE,
           {
-            className: "attr",
-            begin: IDENT_RE$1 + regex.lookahead(":"),
+            scope: "attr",
+            match: IDENT_RE$1 + regex.lookahead(":"),
             relevance: 0
           },
           FUNCTION_VARIABLE,
@@ -13340,6 +13719,7 @@ var require_typescript = __commonJS({
       };
     }
     function typescript(hljs) {
+      const regex = hljs.regex;
       const tsLanguage = javascript(hljs);
       const IDENT_RE$1 = IDENT_RE;
       const TYPES2 = [
@@ -13407,7 +13787,7 @@ var require_typescript = __commonJS({
         begin: "@" + IDENT_RE$1
       };
       const swapMode = (mode, label, replacement) => {
-        const indx = mode.contains.findIndex((m2) => m2.label === label);
+        const indx = mode.contains.findIndex((m3) => m3.label === label);
         if (indx === -1) {
           throw new Error("can not find mode to replace");
         }
@@ -13415,21 +13795,30 @@ var require_typescript = __commonJS({
       };
       Object.assign(tsLanguage.keywords, KEYWORDS$1);
       tsLanguage.exports.PARAMS_CONTAINS.push(DECORATOR);
-      const ATTRIBUTE_HIGHLIGHT = tsLanguage.contains.find((c3) => c3.className === "attr");
+      const ATTRIBUTE_HIGHLIGHT = tsLanguage.contains.find((c3) => c3.scope === "attr");
+      const OPTIONAL_KEY_OR_ARGUMENT = Object.assign(
+        {},
+        ATTRIBUTE_HIGHLIGHT,
+        { match: regex.concat(IDENT_RE$1, regex.lookahead(/\s*\?:/)) }
+      );
       tsLanguage.exports.PARAMS_CONTAINS.push([
         tsLanguage.exports.CLASS_REFERENCE,
         // class reference for highlighting the params types
-        ATTRIBUTE_HIGHLIGHT
+        ATTRIBUTE_HIGHLIGHT,
         // highlight the params key
+        OPTIONAL_KEY_OR_ARGUMENT
+        // Added for optional property assignment highlighting
       ]);
       tsLanguage.contains = tsLanguage.contains.concat([
         DECORATOR,
         NAMESPACE,
-        INTERFACE
+        INTERFACE,
+        OPTIONAL_KEY_OR_ARGUMENT
+        // Added for optional property assignment highlighting
       ]);
       swapMode(tsLanguage, "shebang", hljs.SHEBANG());
       swapMode(tsLanguage, "use_strict", USE_STRICT);
-      const functionDeclaration = tsLanguage.contains.find((m2) => m2.label === "func.def");
+      const functionDeclaration = tsLanguage.contains.find((m3) => m3.label === "func.def");
       functionDeclaration.relevance = 0;
       Object.assign(tsLanguage, {
         name: "TypeScript",
@@ -13852,48 +14241,52 @@ function closestIdx(num, arr, lo, hi) {
     return lo;
   return hi;
 }
-function nonNullIdx(data, _i0, _i1, dir) {
-  for (let i3 = dir == 1 ? _i0 : _i1; i3 >= _i0 && i3 <= _i1; i3 += dir) {
-    if (data[i3] != null)
-      return i3;
-  }
-  return -1;
-}
-function getMinMax(data, _i0, _i1, sorted) {
-  let _min = inf;
-  let _max = -inf;
-  if (sorted == 1) {
-    _min = data[_i0];
-    _max = data[_i1];
-  } else if (sorted == -1) {
-    _min = data[_i1];
-    _max = data[_i0];
-  } else {
+function makeIndexOfs(predicate) {
+  let indexOfs = (data, _i0, _i1) => {
+    let i0 = -1;
+    let i1 = -1;
     for (let i3 = _i0; i3 <= _i1; i3++) {
-      let v3 = data[i3];
-      if (v3 != null) {
-        if (v3 < _min)
-          _min = v3;
-        if (v3 > _max)
-          _max = v3;
+      if (predicate(data[i3])) {
+        i0 = i3;
+        break;
       }
     }
-  }
-  return [_min, _max];
+    for (let i3 = _i1; i3 >= _i0; i3--) {
+      if (predicate(data[i3])) {
+        i1 = i3;
+        break;
+      }
+    }
+    return [i0, i1];
+  };
+  return indexOfs;
 }
-function getMinMaxLog(data, _i0, _i1) {
-  let _min = inf;
-  let _max = -inf;
-  for (let i3 = _i0; i3 <= _i1; i3++) {
-    let v3 = data[i3];
-    if (v3 != null && v3 > 0) {
-      if (v3 < _min)
-        _min = v3;
-      if (v3 > _max)
-        _max = v3;
-    }
-  }
-  return [_min, _max];
+function getMinMax(data, _i0, _i1, sorted = 0, log = false) {
+  let getEdgeIdxs = log ? positiveIdxs : nonNullIdxs;
+  let predicate = log ? isPositive : notNullish;
+  [_i0, _i1] = getEdgeIdxs(data, _i0, _i1);
+  let _min = data[_i0];
+  let _max = data[_i0];
+  if (_i0 > -1) {
+    if (sorted == 1) {
+      _min = data[_i0];
+      _max = data[_i1];
+    } else if (sorted == -1) {
+      _min = data[_i1];
+      _max = data[_i0];
+    } else {
+      for (let i3 = _i0; i3 <= _i1; i3++) {
+        let v3 = data[i3];
+        if (predicate(v3)) {
+          if (v3 < _min)
+            _min = v3;
+          else if (v3 > _max)
+            _max = v3;
+        }
+      }
+    }
+  }
+  return [_min ?? inf, _max ?? -inf];
 }
 function rangeLog(min2, max2, base, fullMags) {
   let minSign = sign(min2);
@@ -13999,14 +14392,17 @@ function _rangeNum(_min, _max, cfg) {
     maxLim = 100;
   return [minLim, maxLim];
 }
-function numIntDigits(x3) {
-  return (log10((x3 ^ x3 >> 31) - (x3 >> 31)) | 0) + 1;
+function numIntDigits(x2) {
+  return (log10((x2 ^ x2 >> 31) - (x2 >> 31)) | 0) + 1;
 }
 function clamp(num, _min, _max) {
   return min(max(num, _min), _max);
 }
+function isFn(v3) {
+  return typeof v3 == "function";
+}
 function fnOrSelf(v3) {
-  return typeof v3 == "function" ? v3 : () => v3;
+  return isFn(v3) ? v3 : () => v3;
 }
 function incrRound(num, incr) {
   return fixFloat(roundDec(fixFloat(num / incr)) * incr);
@@ -14223,9 +14619,9 @@ function zeroPad3(int) {
 function fmtDate(tpl, names) {
   names = names || engNames;
   let parts = [];
-  let R = /\{([a-z]+)\}|[^{]+/gi, m2;
-  while (m2 = R.exec(tpl))
-    parts.push(m2[0][0] == "{" ? subs[m2[1]] : m2[0]);
+  let R2 = /\{([a-z]+)\}|[^{]+/gi, m3;
+  while (m3 = R2.exec(tpl))
+    parts.push(m3[0][0] == "{" ? subs[m3[1]] : m3[0]);
   return (d3) => {
     let out = "";
     for (let i3 = 0; i3 < parts.length; i3++)
@@ -14246,7 +14642,7 @@ function tzDate(date, tz) {
   return date2;
 }
 function genTimeStuffs(ms) {
-  let s3 = ms * 1e3, m2 = s3 * 60, h3 = m2 * 60, d3 = h3 * 24, mo = d3 * 30, y3 = d3 * 365;
+  let s3 = ms * 1e3, m3 = s3 * 60, h3 = m3 * 60, d3 = h3 * 24, mo = d3 * 30, y3 = d3 * 365;
   let subSecIncrs = ms == 1 ? genIncrs(10, 0, 3, allMults).filter(onlyWhole) : genIncrs(10, -3, 0, allMults);
   let timeIncrs = subSecIncrs.concat([
     // minute divisors (# of secs)
@@ -14256,11 +14652,11 @@ function genTimeStuffs(ms) {
     s3 * 15,
     s3 * 30,
     // hour divisors (# of mins)
-    m2,
-    m2 * 5,
-    m2 * 10,
-    m2 * 15,
-    m2 * 30,
+    m3,
+    m3 * 5,
+    m3 * 10,
+    m3 * 15,
+    m3 * 30,
     // day divisors (# of hrs)
     h3,
     h3 * 2,
@@ -14298,13 +14694,13 @@ function genTimeStuffs(ms) {
   ]);
   const _timeAxisStamps = [
     //   tick incr    default          year                    month   day                   hour    min       sec   mode
-    [y3, yyyy, _3, _3, _3, _3, _3, _3, 1],
-    [d3 * 28, "{MMM}", NLyyyy, _3, _3, _3, _3, _3, 1],
-    [d3, md, NLyyyy, _3, _3, _3, _3, _3, 1],
-    [h3, "{h}" + aa, NLmdyy, _3, NLmd, _3, _3, _3, 1],
-    [m2, hmmaa, NLmdyy, _3, NLmd, _3, _3, _3, 1],
-    [s3, ss, NLmdyy + " " + hmmaa, _3, NLmd + " " + hmmaa, _3, NLhmmaa, _3, 1],
-    [ms, ss + ".{fff}", NLmdyy + " " + hmmaa, _3, NLmd + " " + hmmaa, _3, NLhmmaa, _3, 1]
+    [y3, yyyy, _2, _2, _2, _2, _2, _2, 1],
+    [d3 * 28, "{MMM}", NLyyyy, _2, _2, _2, _2, _2, 1],
+    [d3, md, NLyyyy, _2, _2, _2, _2, _2, 1],
+    [h3, "{h}" + aa, NLmdyy, _2, NLmd, _2, _2, _2, 1],
+    [m3, hmmaa, NLmdyy, _2, NLmd, _2, _2, _2, 1],
+    [s3, ss, NLmdyy + " " + hmmaa, _2, NLmd + " " + hmmaa, _2, NLhmmaa, _2, 1],
+    [ms, ss + ".{fff}", NLmdyy + " " + hmmaa, _2, NLmd + " " + hmmaa, _2, NLhmmaa, _2, 1]
   ];
   function timeAxisSplits(tzDate2) {
     return (self, axisIdx, scaleMin, scaleMax, foundIncr, foundSpace) => {
@@ -14335,7 +14731,7 @@ function genTimeStuffs(ms) {
         let split = minMinTs + tzOffset + incrRoundUp(minDateTs - minMinTs, incr0);
         splits.push(split);
         let date0 = tzDate2(split);
-        let prevHour = date0.getHours() + date0.getMinutes() / m2 + date0.getSeconds() / h3;
+        let prevHour = date0.getHours() + date0.getMinutes() / m3 + date0.getSeconds() / h3;
         let incrHours = foundIncr / h3;
         let minSpace = self.axes[axisIdx]._space;
         let pctSpace = foundSpace / minSpace;
@@ -14406,8 +14802,8 @@ function timeAxisVal(tzDate2, dateTpl) {
   let stamp = fmtDate(dateTpl);
   return (self, splits, axisIdx, foundSpace, foundIncr) => splits.map((split) => stamp(tzDate2(split)));
 }
-function mkDate(y3, m2, d3) {
-  return new Date(y3, m2, d3);
+function mkDate(y3, m3, d3) {
+  return new Date(y3, m3, d3);
 }
 function timeSeriesStamp(stampCfg, fmtDate2) {
   return fmtDate2(stampCfg);
@@ -14564,9 +14960,9 @@ function _sync(key, opts) {
       unsub(plot) {
         s3.plots = s3.plots.filter((c3) => c3 != plot);
       },
-      pub(type, self, x3, y3, w3, h3, i3) {
+      pub(type, self, x2, y3, w3, h3, i3) {
         for (let j3 = 0; j3 < s3.plots.length; j3++)
-          s3.plots[j3] != self && s3.plots[j3].pub(type, self, x3, y3, w3, h3, i3);
+          s3.plots[j3] != self && s3.plots[j3].pub(type, self, x2, y3, w3, h3, i3);
       }
     };
     if (key != null)
@@ -14580,14 +14976,14 @@ function orient(u3, seriesIdx, cb) {
   const data = mode == 2 ? u3._data[seriesIdx] : u3._data;
   const scales = u3.scales;
   const bbox = u3.bbox;
-  let dx = data[0], dy = mode == 2 ? data[1] : data[seriesIdx], sx = mode == 2 ? scales[series.facets[0].scale] : scales[u3.series[0].scale], sy = mode == 2 ? scales[series.facets[1].scale] : scales[series.scale], l3 = bbox.left, t5 = bbox.top, w3 = bbox.width, h3 = bbox.height, H = u3.valToPosH, V2 = u3.valToPosV;
+  let dx = data[0], dy = mode == 2 ? data[1] : data[seriesIdx], sx = mode == 2 ? scales[series.facets[0].scale] : scales[u3.series[0].scale], sy = mode == 2 ? scales[series.facets[1].scale] : scales[series.scale], l3 = bbox.left, t5 = bbox.top, w3 = bbox.width, h3 = bbox.height, H2 = u3.valToPosH, V2 = u3.valToPosV;
   return sx.ori == 0 ? cb(
     series,
     dx,
     dy,
     sx,
     sy,
-    H,
+    H2,
     V2,
     l3,
     t5,
@@ -14605,7 +15001,7 @@ function orient(u3, seriesIdx, cb) {
     sx,
     sy,
     V2,
-    H,
+    H2,
     t5,
     l3,
     h3,
@@ -14737,27 +15133,27 @@ function pxRoundGen(pxAlign) {
 }
 function rect(ori) {
   let moveTo = ori == 0 ? moveToH : moveToV;
-  let arcTo = ori == 0 ? (p3, x1, y1, x22, y22, r3) => {
-    p3.arcTo(x1, y1, x22, y22, r3);
-  } : (p3, y1, x1, y22, x22, r3) => {
-    p3.arcTo(x1, y1, x22, y22, r3);
+  let arcTo = ori == 0 ? (p3, x1, y1, x2, y22, r3) => {
+    p3.arcTo(x1, y1, x2, y22, r3);
+  } : (p3, y1, x1, y22, x2, r3) => {
+    p3.arcTo(x1, y1, x2, y22, r3);
   };
-  let rect2 = ori == 0 ? (p3, x3, y3, w3, h3) => {
-    p3.rect(x3, y3, w3, h3);
-  } : (p3, y3, x3, h3, w3) => {
-    p3.rect(x3, y3, w3, h3);
+  let rect2 = ori == 0 ? (p3, x2, y3, w3, h3) => {
+    p3.rect(x2, y3, w3, h3);
+  } : (p3, y3, x2, h3, w3) => {
+    p3.rect(x2, y3, w3, h3);
   };
-  return (p3, x3, y3, w3, h3, endRad = 0, baseRad = 0) => {
+  return (p3, x2, y3, w3, h3, endRad = 0, baseRad = 0) => {
     if (endRad == 0 && baseRad == 0)
-      rect2(p3, x3, y3, w3, h3);
+      rect2(p3, x2, y3, w3, h3);
     else {
       endRad = min(endRad, w3 / 2, h3 / 2);
       baseRad = min(baseRad, w3 / 2, h3 / 2);
-      moveTo(p3, x3 + endRad, y3);
-      arcTo(p3, x3 + w3, y3, x3 + w3, y3 + h3, endRad);
-      arcTo(p3, x3 + w3, y3 + h3, x3, y3 + h3, baseRad);
-      arcTo(p3, x3, y3 + h3, x3, y3, baseRad);
-      arcTo(p3, x3, y3, x3 + w3, y3, endRad);
+      moveTo(p3, x2 + endRad, y3);
+      arcTo(p3, x2 + w3, y3, x2 + w3, y3 + h3, endRad);
+      arcTo(p3, x2 + w3, y3 + h3, x2, y3 + h3, baseRad);
+      arcTo(p3, x2, y3 + h3, x2, y3, baseRad);
+      arcTo(p3, x2, y3, x2 + w3, y3, endRad);
       p3.closePath();
     }
   };
@@ -14789,10 +15185,10 @@ function points(opts) {
       );
       const drawPoint = (pi) => {
         if (dataY[pi] != null) {
-          let x3 = pxRound(valToPosX(dataX[pi], scaleX, xDim, xOff));
+          let x2 = pxRound(valToPosX(dataX[pi], scaleX, xDim, xOff));
           let y3 = pxRound(valToPosY(dataY[pi], scaleY, yDim, yOff));
-          moveTo(fill, x3 + rad, y3);
-          arc(fill, x3, y3, rad, 0, PI * 2);
+          moveTo(fill, x2 + rad, y3);
+          arc(fill, x2, y3, rad, 0, PI * 2);
         }
       };
       if (filtIdxs)
@@ -14825,6 +15221,7 @@ function linear(opts) {
   const alignGaps = ifNull(opts?.alignGaps, 0);
   return (u3, seriesIdx, idx0, idx1) => {
     return orient(u3, seriesIdx, (series, dataX, dataY, scaleX, scaleY, valToPosX, valToPosY, xOff, yOff, xDim, yDim) => {
+      [idx0, idx1] = nonNullIdxs(dataY, idx0, idx1);
       let pxRound = series.pxRound;
       let pixelForX = (val) => pxRound(valToPosX(val, scaleX, xDim, xOff));
       let pixelForY = (val) => pxRound(valToPosY(val, scaleY, yDim, yOff));
@@ -14839,56 +15236,74 @@ function linear(opts) {
       const dir = scaleX.dir * (scaleX.ori == 0 ? 1 : -1);
       const _paths = { stroke: new Path2D(), fill: null, clip: null, band: null, gaps: null, flags: BAND_CLIP_FILL };
       const stroke = _paths.stroke;
-      let minY = inf, maxY = -inf, inY, outY, drawnAtX;
-      let accX = pixelForX(dataX[dir == 1 ? idx0 : idx1]);
-      let lftIdx = nonNullIdx(dataY, idx0, idx1, 1 * dir);
-      let rgtIdx = nonNullIdx(dataY, idx0, idx1, -1 * dir);
-      let lftX = pixelForX(dataX[lftIdx]);
-      let rgtX = pixelForX(dataX[rgtIdx]);
       let hasGap = false;
-      for (let i3 = dir == 1 ? idx0 : idx1; i3 >= idx0 && i3 <= idx1; i3 += dir) {
-        let x3 = pixelForX(dataX[i3]);
-        let yVal = dataY[i3];
-        if (x3 == accX) {
-          if (yVal != null) {
-            outY = pixelForY(yVal);
-            if (minY == inf) {
-              lineTo(stroke, x3, outY);
-              inY = outY;
+      const decimate = idx1 - idx0 >= xDim * 4;
+      if (decimate) {
+        let xForPixel = (pos) => u3.posToVal(pos, scaleX.key, true);
+        let minY = null, maxY = null, inY, outY, drawnAtX;
+        let accX = pixelForX(dataX[dir == 1 ? idx0 : idx1]);
+        let idx0px = pixelForX(dataX[idx0]);
+        let idx1px = pixelForX(dataX[idx1]);
+        let nextAccXVal = xForPixel(dir == 1 ? idx0px + 1 : idx1px - 1);
+        for (let i3 = dir == 1 ? idx0 : idx1; i3 >= idx0 && i3 <= idx1; i3 += dir) {
+          let xVal = dataX[i3];
+          let reuseAccX = dir == 1 ? xVal < nextAccXVal : xVal > nextAccXVal;
+          let x2 = reuseAccX ? accX : pixelForX(xVal);
+          let yVal = dataY[i3];
+          if (x2 == accX) {
+            if (yVal != null) {
+              outY = yVal;
+              if (minY == null) {
+                lineTo(stroke, x2, pixelForY(outY));
+                inY = minY = maxY = outY;
+              } else {
+                if (outY < minY)
+                  minY = outY;
+                else if (outY > maxY)
+                  maxY = outY;
+              }
+            } else {
+              if (yVal === null)
+                hasGap = true;
             }
-            minY = min(outY, minY);
-            maxY = max(outY, maxY);
-          } else {
-            if (yVal === null)
-              hasGap = true;
-          }
-        } else {
-          if (minY != inf) {
-            drawAcc(stroke, accX, minY, maxY, inY, outY);
-            drawnAtX = accX;
-          }
-          if (yVal != null) {
-            outY = pixelForY(yVal);
-            lineTo(stroke, x3, outY);
-            minY = maxY = inY = outY;
           } else {
-            minY = inf;
-            maxY = -inf;
-            if (yVal === null)
-              hasGap = true;
+            if (minY != null)
+              drawAcc(stroke, accX, pixelForY(minY), pixelForY(maxY), pixelForY(inY), pixelForY(outY));
+            if (yVal != null) {
+              outY = yVal;
+              lineTo(stroke, x2, pixelForY(outY));
+              minY = maxY = inY = outY;
+            } else {
+              minY = maxY = null;
+              if (yVal === null)
+                hasGap = true;
+            }
+            accX = x2;
+            nextAccXVal = xForPixel(accX + dir);
           }
-          accX = x3;
+        }
+        if (minY != null && minY != maxY && drawnAtX != accX)
+          drawAcc(stroke, accX, pixelForY(minY), pixelForY(maxY), pixelForY(inY), pixelForY(outY));
+      } else {
+        for (let i3 = dir == 1 ? idx0 : idx1; i3 >= idx0 && i3 <= idx1; i3 += dir) {
+          let yVal = dataY[i3];
+          if (yVal === null)
+            hasGap = true;
+          else if (yVal != null)
+            lineTo(stroke, pixelForX(dataX[i3]), pixelForY(yVal));
         }
       }
-      if (minY != inf && minY != maxY && drawnAtX != accX)
-        drawAcc(stroke, accX, minY, maxY, inY, outY);
       let [bandFillDir, bandClipDir] = bandFillClipDirs(u3, seriesIdx);
       if (series.fill != null || bandFillDir != 0) {
         let fill = _paths.fill = new Path2D(stroke);
         let fillToVal = series.fillTo(u3, seriesIdx, series.min, series.max, bandFillDir);
         let fillToY = pixelForY(fillToVal);
-        lineTo(fill, rgtX, fillToY);
-        lineTo(fill, lftX, fillToY);
+        let frX = pixelForX(dataX[idx0]);
+        let toX = pixelForX(dataX[idx1]);
+        if (dir == -1)
+          [toX, frX] = [frX, toX];
+        lineTo(fill, toX, fillToY);
+        lineTo(fill, frX, fillToY);
       }
       if (!series.spanGaps) {
         let gaps2 = [];
@@ -14913,6 +15328,7 @@ function stepped(opts) {
   const extend = ifNull(opts.extend, false);
   return (u3, seriesIdx, idx0, idx1) => {
     return orient(u3, seriesIdx, (series, dataX, dataY, scaleX, scaleY, valToPosX, valToPosY, xOff, yOff, xDim, yDim) => {
+      [idx0, idx1] = nonNullIdxs(dataY, idx0, idx1);
       let pxRound = series.pxRound;
       let { left, width } = u3.bbox;
       let pixelForX = (val) => pxRound(valToPosX(val, scaleX, xDim, xOff));
@@ -14921,8 +15337,6 @@ function stepped(opts) {
       const _paths = { stroke: new Path2D(), fill: null, clip: null, band: null, gaps: null, flags: BAND_CLIP_FILL };
       const stroke = _paths.stroke;
       const dir = scaleX.dir * (scaleX.ori == 0 ? 1 : -1);
-      idx0 = nonNullIdx(dataY, idx0, idx1, 1);
-      idx1 = nonNullIdx(dataY, idx0, idx1, -1);
       let prevYPos = pixelForY(dataY[dir == 1 ? idx0 : idx1]);
       let firstXPos = pixelForX(dataX[dir == 1 ? idx0 : idx1]);
       let prevXPos = firstXPos;
@@ -15013,7 +15427,7 @@ function bars(opts) {
   const _maxWidth = ifNull(size[1], inf);
   const _minWidth = ifNull(size[2], 1);
   const disp = ifNull(opts.disp, EMPTY_OBJ);
-  const _each = ifNull(opts.each, (_4) => {
+  const _each = ifNull(opts.each, (_3) => {
   });
   const { fill: dispFills, stroke: dispStrokes } = disp;
   return (u3, seriesIdx, idx0, idx1) => {
@@ -15158,6 +15572,7 @@ function splineInterp(interp, opts) {
   const alignGaps = ifNull(opts?.alignGaps, 0);
   return (u3, seriesIdx, idx0, idx1) => {
     return orient(u3, seriesIdx, (series, dataX, dataY, scaleX, scaleY, valToPosX, valToPosY, xOff, yOff, xDim, yDim) => {
+      [idx0, idx1] = nonNullIdxs(dataY, idx0, idx1);
       let pxRound = series.pxRound;
       let pixelForX = (val) => pxRound(valToPosX(val, scaleX, xDim, xOff));
       let pixelForY = (val) => pxRound(valToPosY(val, scaleY, yDim, yOff));
@@ -15172,8 +15587,6 @@ function splineInterp(interp, opts) {
         bezierCurveTo = bezierCurveToV;
       }
       const dir = scaleX.dir * (scaleX.ori == 0 ? 1 : -1);
-      idx0 = nonNullIdx(dataY, idx0, idx1, 1);
-      idx1 = nonNullIdx(dataY, idx0, idx1, -1);
       let firstXPos = pixelForX(dataX[dir == 1 ? idx0 : idx1]);
       let prevXPos = firstXPos;
       let xCoords = [];
@@ -15296,7 +15709,7 @@ function findIncr(minVal, maxVal, incrs, dim, minSpace) {
 }
 function pxRatioFont(font2) {
   let fontSize, fontSizeCss;
-  font2 = font2.replace(/(\d+)px/, (m2, p1) => (fontSize = round((fontSizeCss = +p1) * pxRatio)) + "px");
+  font2 = font2.replace(/(\d+)px/, (m3, p1) => (fontSize = round((fontSizeCss = +p1) * pxRatio)) + "px");
   return [font2, fontSize, fontSizeCss];
 }
 function syncFontSize(axis) {
@@ -15313,16 +15726,12 @@ function uPlot(opts, data, then) {
     mode: ifNull(opts.mode, 1)
   };
   const mode = self.mode;
-  function getValPct(val, scale) {
-    let _val = scale.distr == 3 ? log10(val > 0 ? val : scale.clamp(self, val, scale.min, scale.max, scale.key)) : scale.distr == 4 ? asinh(val, scale.asinh) : scale.distr == 100 ? scale.fwd(val) : val;
-    return (_val - scale._min) / (scale._max - scale._min);
-  }
   function getHPos(val, scale, dim, off2) {
-    let pct = getValPct(val, scale);
+    let pct = scale.valToPct(val);
     return off2 + dim * (scale.dir == -1 ? 1 - pct : pct);
   }
   function getVPos(val, scale, dim, off2) {
-    let pct = getValPct(val, scale);
+    let pct = scale.valToPct(val);
     return off2 + dim * (scale.dir == -1 ? pct : 1 - pct);
   }
   function getPos(val, scale, dim, off2) {
@@ -15374,13 +15783,24 @@ function uPlot(opts, data, then) {
     series: drawSeries
   };
   const drawOrder = (opts.drawOrder || ["axes", "series"]).map((key2) => drawOrderMap[key2]);
+  function initValToPct(sc) {
+    const getVal = sc.distr == 3 ? (val) => log10(val > 0 ? val : sc.clamp(self, val, sc.min, sc.max, sc.key)) : sc.distr == 4 ? (val) => asinh(val, sc.asinh) : sc.distr == 100 ? (val) => sc.fwd(val) : (val) => val;
+    return (val) => {
+      let _val = getVal(val);
+      let { _min, _max } = sc;
+      let delta = _max - _min;
+      return (_val - _min) / delta;
+    };
+  }
   function initScale(scaleKey) {
     let sc = scales[scaleKey];
     if (sc == null) {
       let scaleOpts = (opts.scales || EMPTY_OBJ)[scaleKey] || EMPTY_OBJ;
       if (scaleOpts.from != null) {
         initScale(scaleOpts.from);
-        scales[scaleKey] = assign({}, scales[scaleOpts.from], scaleOpts, { key: scaleKey });
+        let sc2 = assign({}, scales[scaleOpts.from], scaleOpts, { key: scaleKey });
+        sc2.valToPct = initValToPct(sc2);
+        scales[scaleKey] = sc2;
       } else {
         sc = scales[scaleKey] = assign({}, scaleKey == xScaleKey ? xScaleOpts : yScaleOpts, scaleOpts);
         sc.key = scaleKey;
@@ -15412,6 +15832,7 @@ function uPlot(opts, data, then) {
         sc.auto = fnOrSelf(rangeIsArr ? false : sc.auto);
         sc.clamp = fnOrSelf(sc.clamp || clampScale);
         sc._min = sc._max = null;
+        sc.valToPct = initValToPct(sc);
       }
     }
   }
@@ -15454,7 +15875,9 @@ function uPlot(opts, data, then) {
   const _timeSeriesVal = timeSeriesVal(_tzDate, timeSeriesStamp(_timeSeriesStamp, _fmtDate));
   const activeIdxs = [];
   const legend = self.legend = assign({}, legendOpts, opts.legend);
+  const cursor = self.cursor = assign({}, cursorOpts, { drag: { y: mode == 2 } }, opts.cursor);
   const showLegend = legend.show;
+  const showCursor = cursor.show;
   const markers = legend.markers;
   {
     legend.idxs = activeIdxs;
@@ -15514,7 +15937,10 @@ function uPlot(opts, data, then) {
       }
     }
     let text = placeDiv(LEGEND_LABEL, label);
-    text.textContent = s3.label;
+    if (s3.label instanceof HTMLElement)
+      text.appendChild(s3.label);
+    else
+      text.textContent = s3.label;
     if (i3 > 0) {
       if (!markers.show)
         text.style.color = s3.width > 0 ? markers.stroke(self, i3) : markers.fill(self, i3);
@@ -15696,7 +16122,6 @@ function uPlot(opts, data, then) {
       }
     });
   }
-  const cursor = self.cursor = assign({}, cursorOpts, { drag: { y: mode == 2 } }, opts.cursor);
   if (cursor.dataIdx == null) {
     let hov = cursor.hover;
     let skip = hov.skip = new Set(hov.skip ?? []);
@@ -15774,7 +16199,7 @@ function uPlot(opts, data, then) {
   let cursorPtsTop = [];
   function initCursorPt(s3, si) {
     let pt = points2.show(self, si);
-    if (pt) {
+    if (pt instanceof HTMLElement) {
       addClass(pt, CURSOR_PT);
       addClass(pt, s3.class);
       elTrans(pt, -10, -10, plotWidCss, plotHgtCss);
@@ -15821,7 +16246,7 @@ function uPlot(opts, data, then) {
       legendCells.splice(i3, 0, rowCells[1]);
       legend.values.push(null);
     }
-    if (cursor.show) {
+    if (showCursor) {
       activeIdxs.splice(i3, 0, null);
       let pt = null;
       if (cursorOnePt) {
@@ -15851,7 +16276,7 @@ function uPlot(opts, data, then) {
       offMouse(null, tr.firstChild);
       tr.remove();
     }
-    if (cursor.show) {
+    if (showCursor) {
       activeIdxs.splice(i3, 1);
       cursorPts.splice(i3, 1)[0].remove();
       cursorPtsLft.splice(i3, 1);
@@ -16029,7 +16454,7 @@ function uPlot(opts, data, then) {
     if (data2.length > 0 && wsc.auto(self, viaAutoScaleX) && (psc == null || psc.min == null)) {
       let _i0 = ifNull(i0, 0);
       let _i1 = ifNull(i1, data2.length - 1);
-      let minMax = facet2.min == null ? wsc.distr == 3 ? getMinMaxLog(data2, _i0, _i1) : getMinMax(data2, _i0, _i1, sorted) : [facet2.min, facet2.max];
+      let minMax = facet2.min == null ? getMinMax(data2, _i0, _i1, sorted, wsc.distr == 3) : [facet2.min, facet2.max];
       wsc.min = min(wsc.min, facet2.min = minMax[0]);
       wsc.max = max(wsc.max, facet2.max = minMax[1]);
     }
@@ -16169,7 +16594,7 @@ function uPlot(opts, data, then) {
         shouldConvergeSize = true;
         fire("setScale", k3);
       }
-      if (cursor.show && cursor.left >= 0)
+      if (showCursor && cursor.left >= 0)
         shouldSetCursor = shouldSetLegend = true;
     }
     for (let k3 in pendScales)
@@ -16186,22 +16611,27 @@ function uPlot(opts, data, then) {
   }
   function drawSeries() {
     if (dataLen > 0) {
+      let shouldAlpha = series.some((s3) => s3._focus) && ctxAlpha != focus.alpha;
+      if (shouldAlpha)
+        ctx.globalAlpha = ctxAlpha = focus.alpha;
       series.forEach((s3, i3) => {
         if (i3 > 0 && s3.show) {
           cacheStrokeFill(i3, false);
           cacheStrokeFill(i3, true);
           if (s3._paths == null) {
+            let _ctxAlpha = ctxAlpha;
             if (ctxAlpha != s3.alpha)
               ctx.globalAlpha = ctxAlpha = s3.alpha;
             let _idxs = mode == 2 ? [0, data[i3][0].length - 1] : getOuterIdxs(data[i3]);
             s3._paths = s3.paths(self, i3, _idxs[0], _idxs[1]);
-            if (ctxAlpha != 1)
-              ctx.globalAlpha = ctxAlpha = 1;
+            if (ctxAlpha != _ctxAlpha)
+              ctx.globalAlpha = ctxAlpha = _ctxAlpha;
           }
         }
       });
       series.forEach((s3, i3) => {
         if (i3 > 0 && s3.show) {
+          let _ctxAlpha = ctxAlpha;
           if (ctxAlpha != s3.alpha)
             ctx.globalAlpha = ctxAlpha = s3.alpha;
           s3._paths != null && drawPath(i3, false);
@@ -16214,11 +16644,13 @@ function uPlot(opts, data, then) {
               drawPath(i3, true);
             }
           }
-          if (ctxAlpha != 1)
-            ctx.globalAlpha = ctxAlpha = 1;
+          if (ctxAlpha != _ctxAlpha)
+            ctx.globalAlpha = ctxAlpha = _ctxAlpha;
           fire("drawSeries", i3);
         }
       });
+      if (shouldAlpha)
+        ctx.globalAlpha = ctxAlpha = 1;
     }
   }
   function cacheStrokeFill(si, _points) {
@@ -16425,47 +16857,49 @@ function uPlot(opts, data, then) {
         continue;
       let side = axis.side;
       let ori = side % 2;
-      let x3, y3;
+      let x2, y3;
       let fillStyle = axis.stroke(self, i3);
       let shiftDir = side == 0 || side == 3 ? -1 : 1;
-      if (axis.label) {
+      let [_incr, _space] = axis._found;
+      if (axis.label != null) {
         let shiftAmt2 = axis.labelGap * shiftDir;
         let baseLpos = round((axis._lpos + shiftAmt2) * pxRatio);
         setFontStyle(axis.labelFont[0], fillStyle, "center", side == 2 ? TOP : BOTTOM);
         ctx.save();
         if (ori == 1) {
-          x3 = y3 = 0;
+          x2 = y3 = 0;
           ctx.translate(
             baseLpos,
             round(plotTop + plotHgt / 2)
           );
           ctx.rotate((side == 3 ? -PI : PI) / 2);
         } else {
-          x3 = round(plotLft + plotWid / 2);
+          x2 = round(plotLft + plotWid / 2);
           y3 = baseLpos;
         }
-        ctx.fillText(axis.label, x3, y3);
+        let _label = isFn(axis.label) ? axis.label(self, i3, _incr, _space) : axis.label;
+        ctx.fillText(_label, x2, y3);
         ctx.restore();
       }
-      let [_incr, _space] = axis._found;
       if (_space == 0)
         continue;
       let scale = scales[axis.scale];
       let plotDim = ori == 0 ? plotWid : plotHgt;
       let plotOff = ori == 0 ? plotLft : plotTop;
-      let axisGap = round(axis.gap * pxRatio);
       let _splits = axis._splits;
       let splits = scale.distr == 2 ? _splits.map((i4) => data0[i4]) : _splits;
       let incr = scale.distr == 2 ? data0[_splits[1]] - data0[_splits[0]] : _incr;
       let ticks2 = axis.ticks;
       let border2 = axis.border;
-      let tickSize = ticks2.show ? round(ticks2.size * pxRatio) : 0;
+      let _tickSize = ticks2.show ? ticks2.size : 0;
+      let tickSize = round(_tickSize * pxRatio);
+      let axisGap = round((axis.alignTo == 2 ? axis._size - _tickSize - axis.gap : axis.gap) * pxRatio);
       let angle = axis._rotate * -PI / 180;
       let basePos = pxRound(axis._pos * pxRatio);
       let shiftAmt = (tickSize + axisGap) * shiftDir;
       let finalPos = basePos + shiftAmt;
       y3 = ori == 0 ? finalPos : 0;
-      x3 = ori == 1 ? finalPos : 0;
+      x2 = ori == 1 ? finalPos : 0;
       let font2 = axis.font[0];
       let textAlign = axis.align == 1 ? LEFT : axis.align == 2 ? RIGHT : angle > 0 ? LEFT : angle < 0 ? RIGHT : ori == 0 ? "center" : side == 3 ? RIGHT : LEFT;
       let textBaseline = angle || ori == 1 ? "middle" : side == 2 ? TOP : BOTTOM;
@@ -16477,7 +16911,7 @@ function uPlot(opts, data, then) {
         let val = _values[i4];
         if (val != null) {
           if (ori == 0)
-            x3 = canOffs[i4];
+            x2 = canOffs[i4];
           else
             y3 = canOffs[i4];
           val = "" + val;
@@ -16486,12 +16920,12 @@ function uPlot(opts, data, then) {
             let text = _parts[j3];
             if (angle) {
               ctx.save();
-              ctx.translate(x3, y3 + j3 * lineHeight);
+              ctx.translate(x2, y3 + j3 * lineHeight);
               ctx.rotate(angle);
               ctx.fillText(text, 0, 0);
               ctx.restore();
             } else
-              ctx.fillText(text, x3, y3 + j3 * lineHeight);
+              ctx.fillText(text, x2, y3 + j3 * lineHeight);
           }
         }
       }
@@ -16626,7 +17060,7 @@ function uPlot(opts, data, then) {
         resetYSeries(false);
         let pctWid = plotWidCss / _plotWidCss;
         let pctHgt = plotHgtCss / _plotHgtCss;
-        if (cursor.show && !shouldSetCursor && cursor.left >= 0) {
+        if (showCursor && !shouldSetCursor && cursor.left >= 0) {
           cursor.left *= pctWid;
           cursor.top *= pctHgt;
           vCursor && elTrans(vCursor, round(cursor.left), 0, plotWidCss, plotHgtCss);
@@ -16666,7 +17100,7 @@ function uPlot(opts, data, then) {
       setSelect(select);
       shouldSetSelect = false;
     }
-    if (cursor.show && shouldSetCursor) {
+    if (showCursor && shouldSetCursor) {
       updateCursor(null, true, false);
       shouldSetCursor = false;
     }
@@ -16734,7 +17168,7 @@ function uPlot(opts, data, then) {
   const drag = cursor.drag;
   let dragX = drag.x;
   let dragY = drag.y;
-  if (cursor.show) {
+  if (showCursor) {
     if (cursor.x)
       xCursor = placeDiv(CURSOR_X, over);
     if (cursor.y)
@@ -16769,15 +17203,16 @@ function uPlot(opts, data, then) {
     }
   }
   self.setSelect = setSelect;
-  function toggleDOM(i3, onOff) {
+  function toggleDOM(i3) {
     let s3 = series[i3];
-    let label = showLegend ? legendRows[i3] : null;
     if (s3.show)
-      label && remClass(label, OFF);
+      showLegend && remClass(legendRows[i3], OFF);
     else {
-      label && addClass(label, OFF);
-      let pt = cursorOnePt ? cursorPts[0] : cursorPts[i3];
-      elTrans(pt, -10, -10, plotWidCss, plotHgtCss);
+      showLegend && addClass(legendRows[i3], OFF);
+      if (showCursor) {
+        let pt = cursorOnePt ? cursorPts[0] : cursorPts[i3];
+        pt != null && elTrans(pt, -10, -10, plotWidCss, plotHgtCss);
+      }
     }
   }
   function _setScale(key2, min2, max2) {
@@ -16790,7 +17225,7 @@ function uPlot(opts, data, then) {
       series.forEach((s3, si) => {
         if (si > 0 && (i3 == si || i3 == null)) {
           s3.show = opts2.show;
-          toggleDOM(si, opts2.show);
+          toggleDOM(si);
           if (mode == 2) {
             _setScale(s3.facets[0].scale, null, null);
             _setScale(s3.facets[1].scale, null, null);
@@ -16824,7 +17259,7 @@ function uPlot(opts, data, then) {
   self.delBand = delBand;
   function setAlpha(i3, value) {
     series[i3].alpha = value;
-    if (cursor.show && cursorPts[i3])
+    if (showCursor && cursorPts[i3] != null)
       cursorPts[i3].style.opacity = value;
     if (showLegend && legendRows[i3])
       legendRows[i3].style.opacity = value;
@@ -16957,7 +17392,7 @@ function uPlot(opts, data, then) {
     [mouseLeft1, mouseTop1] = cursor.move(self, mouseLeft1, mouseTop1);
     cursor.left = mouseLeft1;
     cursor.top = mouseTop1;
-    if (cursor.show) {
+    if (showCursor) {
       vCursor && elTrans(vCursor, round(mouseLeft1), 0, plotWidCss, plotHgtCss);
       hCursor && elTrans(hCursor, 0, round(mouseTop1), plotWidCss, plotHgtCss);
     }
@@ -17002,8 +17437,8 @@ function uPlot(opts, data, then) {
         let yVal2 = idx2 == null ? null : mode == 1 ? data[i3][idx2] : data[i3][1][idx2];
         shouldSetLegend = shouldSetLegend || yVal2 != yVal1 || idx2 != idx1;
         activeIdxs[i3] = idx2;
-        let xPos2 = idx2 == idx ? xPos : valToPosX(mode == 1 ? data[0][idx2] : data[i3][0][idx2], scaleX, xDim, 0);
         if (i3 > 0 && s3.show) {
+          let xPos2 = idx2 == null ? -10 : idx2 == idx ? xPos : valToPosX(mode == 1 ? data[0][idx2] : data[i3][0][idx2], scaleX, xDim, 0);
           let yPos = yVal2 == null ? -10 : valToPosY(yVal2, mode == 1 ? scales[s3.scale] : scales[s3.facets[1].scale], yDim, 0);
           if (cursorFocus && yVal2 != null) {
             let mouseYPos = scaleX.ori == 1 ? mouseLeft1 : mouseTop1;
@@ -17079,11 +17514,13 @@ function uPlot(opts, data, then) {
         let focusChanged = focusedSeries == null ? closestDist <= p3 : closestDist > p3 || closestSeries != focusedSeries;
         if (shouldSetLegend || focusChanged) {
           let pt = cursorPts[0];
-          cursorPtsLft[0] = _ptLft;
-          cursorPtsTop[0] = _ptTop;
-          elSize(pt, _ptWid, _ptHgt, _centered);
-          elColor(pt, _ptFill, _ptStroke);
-          elTrans(pt, ceil(_ptLft), ceil(_ptTop), plotWidCss, plotHgtCss);
+          if (pt != null) {
+            cursorPtsLft[0] = _ptLft;
+            cursorPtsTop[0] = _ptTop;
+            elSize(pt, _ptWid, _ptHgt, _centered);
+            elColor(pt, _ptFill, _ptStroke);
+            elTrans(pt, ceil(_ptLft), ceil(_ptTop), plotWidCss, plotHgtCss);
+          }
         }
       }
     }
@@ -17279,7 +17716,7 @@ function uPlot(opts, data, then) {
         _t = __l;
       }
     }
-    if (snap) {
+    if (snap && (src == null || src.cursor.event.type == mousemove)) {
       if (_l <= 1 || _l >= plotWidCss - 1)
         _l = incrRound(_l, plotWidCss);
       if (_t <= 1 || _t >= plotHgtCss - 1)
@@ -17320,7 +17757,6 @@ function uPlot(opts, data, then) {
     downSelectTop = top;
     downSelectWidth = width;
     downSelectHeight = height;
-    hideSelect();
   }
   function mouseUp(e3, src, _l, _t, _w, _h, _i) {
     dragging = drag._x = drag._y = false;
@@ -17356,7 +17792,7 @@ function uPlot(opts, data, then) {
       hideSelect();
     } else if (cursor.lock) {
       cursor._lock = !cursor._lock;
-      updateCursor(null, true, false);
+      updateCursor(src, true, e3 != null);
     }
     if (e3 != null) {
       offMouse(mouseup, doc);
@@ -17393,6 +17829,7 @@ function uPlot(opts, data, then) {
     }
     mouseLeft1 = -10;
     mouseTop1 = -10;
+    activeIdxs.fill(null);
     updateCursor(null, true, true);
     if (_dragging)
       dragging = _dragging;
@@ -17421,7 +17858,7 @@ function uPlot(opts, data, then) {
     idx = seriesIdxMatcher2(self, src, idx);
     idx != -1 && setSeries(idx, opts2, true, false);
   };
-  if (cursor.show) {
+  if (showCursor) {
     onMouse(mousedown, over, mouseDown);
     onMouse(mousemove, over, mouseMove);
     onMouse(mouseenter, over, (e3) => {
@@ -17466,14 +17903,14 @@ function uPlot(opts, data, then) {
   cursor.sync = syncOpts;
   const syncKey = syncOpts.key;
   const sync = _sync(syncKey);
-  function pubSync(type, src, x3, y3, w3, h3, i3) {
-    if (syncOpts.filters.pub(type, src, x3, y3, w3, h3, i3))
-      sync.pub(type, src, x3, y3, w3, h3, i3);
+  function pubSync(type, src, x2, y3, w3, h3, i3) {
+    if (syncOpts.filters.pub(type, src, x2, y3, w3, h3, i3))
+      sync.pub(type, src, x2, y3, w3, h3, i3);
   }
   sync.sub(self);
-  function pub(type, src, x3, y3, w3, h3, i3) {
-    if (syncOpts.filters.sub(type, src, x3, y3, w3, h3, i3))
-      events[type](null, src, x3, y3, w3, h3, i3);
+  function pub(type, src, x2, y3, w3, h3, i3) {
+    if (syncOpts.filters.sub(type, src, x2, y3, w3, h3, i3))
+      events[type](null, src, x2, y3, w3, h3, i3);
   }
   self.pub = pub;
   function destroy() {
@@ -17509,7 +17946,7 @@ function uPlot(opts, data, then) {
     _init();
   return self;
 }
-var FEAT_TIME, pre, UPLOT, ORI_HZ, ORI_VT, TITLE, WRAP, UNDER, OVER, AXIS, OFF, SELECT, CURSOR_X, CURSOR_Y, CURSOR_PT, LEGEND, LEGEND_LIVE, LEGEND_INLINE, LEGEND_SERIES, LEGEND_MARKER, LEGEND_LABEL, LEGEND_VALUE, WIDTH, HEIGHT, TOP, BOTTOM, LEFT, RIGHT, hexBlack, transparent, mousemove, mousedown, mouseup, mouseenter, mouseleave, dblclick, resize, scroll, change, dppxchange, LEGEND_DISP, domEnv, doc, win, nav, pxRatio, query, xformCache, colorCache, sizeCache, evOpts, evOpts2, rangePad, autoRangePart, _eqRangePart, _eqRange, numFormatter, fmtNum2, M2, PI, abs, floor, round, ceil, min, max, pow, sign, log10, log2, sinh, asinh, inf, noop, retArg0, retArg1, retNull, retTrue, retEq, regex6, fixFloat, fixedDec, EMPTY_OBJ, EMPTY_ARR, nullNullTuple, isArr, isInt, isUndef, TypedArray, __proto__, NULL_REMOVE, NULL_RETAIN, NULL_EXPAND, microTask, months, days, days3, months3, engNames, subs, localTz, onlyWhole, allMults, decIncrs, oneIncrs, wholeIncrs, numIncrs, NL, yyyy, NLyyyy, md, NLmd, NLmdyy, aa, hmm, hmmaa, NLhmmaa, ss, _3, timeIncrsMs, _timeAxisStampsMs, timeAxisSplitsMs, timeIncrsS, _timeAxisStampsS, timeAxisSplitsS, _timeSeriesStamp, legendOpts, moveTuple, cursorOpts, axisLines, grid, ticks, border, font, labelFont, lineGap, xAxisOpts, numSeriesLabel, timeSeriesLabel, xSeriesOpts, RE_ALL, RE_12357, RE_125, RE_1, _filt, yAxisOpts, facet, gaps, xySeriesOpts, ySeriesOpts, xScaleOpts, yScaleOpts, syncs, BAND_CLIP_FILL, BAND_CLIP_STROKE, moveToH, moveToV, lineToH, lineToV, rectH, rectV, arcH, arcV, bezierCurveToH, bezierCurveToV, drawAccH, drawAccV, cursorPlots, linearPath, pointsPath, snapTimeX, snapLogX, snapAsinhX;
+var FEAT_TIME, pre, UPLOT, ORI_HZ, ORI_VT, TITLE, WRAP, UNDER, OVER, AXIS, OFF, SELECT, CURSOR_X, CURSOR_Y, CURSOR_PT, LEGEND, LEGEND_LIVE, LEGEND_INLINE, LEGEND_SERIES, LEGEND_MARKER, LEGEND_LABEL, LEGEND_VALUE, WIDTH, HEIGHT, TOP, BOTTOM, LEFT, RIGHT, hexBlack, transparent, mousemove, mousedown, mouseup, mouseenter, mouseleave, dblclick, resize, scroll, change, dppxchange, LEGEND_DISP, domEnv, doc, win, nav, pxRatio, query, xformCache, colorCache, sizeCache, evOpts, evOpts2, notNullish, isPositive, nonNullIdxs, positiveIdxs, rangePad, autoRangePart, _eqRangePart, _eqRange, numFormatter, fmtNum2, M, PI, abs, floor, round, ceil, min, max, pow, sign, log10, log2, sinh, asinh, inf, noop, retArg0, retArg1, retNull, retTrue, retEq, regex6, fixFloat, fixedDec, EMPTY_OBJ, EMPTY_ARR, nullNullTuple, isArr, isInt, isUndef, TypedArray, __proto__, NULL_REMOVE, NULL_RETAIN, NULL_EXPAND, microTask, months, days, days3, months3, engNames, subs, localTz, onlyWhole, allMults, decIncrs, oneIncrs, wholeIncrs, numIncrs, NL, yyyy, NLyyyy, md, NLmd, NLmdyy, aa, hmm, hmmaa, NLhmmaa, ss, _2, timeIncrsMs, _timeAxisStampsMs, timeAxisSplitsMs, timeIncrsS, _timeAxisStampsS, timeAxisSplitsS, _timeSeriesStamp, legendOpts, moveTuple, cursorOpts, axisLines, grid, ticks, border, font, labelFont, lineGap, xAxisOpts, numSeriesLabel, timeSeriesLabel, xSeriesOpts, RE_ALL, RE_12357, RE_125, RE_1, _filt, yAxisOpts, facet, gaps, xySeriesOpts, ySeriesOpts, xScaleOpts, yScaleOpts, syncs, BAND_CLIP_FILL, BAND_CLIP_STROKE, moveToH, moveToV, lineToH, lineToV, rectH, rectV, arcH, arcV, bezierCurveToH, bezierCurveToV, drawAccH, drawAccV, cursorPlots, linearPath, pointsPath, snapTimeX, snapLogX, snapAsinhX;
 var init_uPlot_esm = __esm({
   "node_modules/uplot/dist/uPlot.esm.js"() {
     "use strict";
@@ -17564,6 +18001,10 @@ var init_uPlot_esm = __esm({
     evOpts = { passive: true };
     evOpts2 = { ...evOpts, capture: true };
     domEnv && setPxRatio();
+    notNullish = (v3) => v3 != null;
+    isPositive = (v3) => v3 != null && v3 > 0;
+    nonNullIdxs = makeIndexOfs(notNullish);
+    positiveIdxs = makeIndexOfs(isPositive);
     rangePad = 0.1;
     autoRangePart = {
       mode: 3,
@@ -17580,27 +18021,27 @@ var init_uPlot_esm = __esm({
     };
     numFormatter = new Intl.NumberFormat(domEnv ? nav.language : "en-US");
     fmtNum2 = (val) => numFormatter.format(val);
-    M2 = Math;
-    PI = M2.PI;
-    abs = M2.abs;
-    floor = M2.floor;
-    round = M2.round;
-    ceil = M2.ceil;
-    min = M2.min;
-    max = M2.max;
-    pow = M2.pow;
-    sign = M2.sign;
-    log10 = M2.log10;
-    log2 = M2.log2;
-    sinh = (v3, linthresh = 1) => M2.sinh(v3) * linthresh;
-    asinh = (v3, linthresh = 1) => M2.asinh(v3 / linthresh);
+    M = Math;
+    PI = M.PI;
+    abs = M.abs;
+    floor = M.floor;
+    round = M.round;
+    ceil = M.ceil;
+    min = M.min;
+    max = M.max;
+    pow = M.pow;
+    sign = M.sign;
+    log10 = M.log10;
+    log2 = M.log2;
+    sinh = (v3, linthresh = 1) => M.sinh(v3) * linthresh;
+    asinh = (v3, linthresh = 1) => M.asinh(v3 / linthresh);
     inf = Infinity;
     noop = () => {
     };
     retArg0 = (_0) => _0;
     retArg1 = (_0, _1) => _1;
-    retNull = (_4) => null;
-    retTrue = (_4) => true;
+    retNull = (_3) => null;
+    retTrue = (_3) => true;
     retEq = (a3, b2) => a3 == b2;
     regex6 = /\.\d*?(?=9{6,}|0{6,})/gm;
     fixFloat = (val) => {
@@ -17726,7 +18167,7 @@ var init_uPlot_esm = __esm({
     hmmaa = hmm + aa;
     NLhmmaa = NL + hmmaa;
     ss = ":{ss}";
-    _3 = null;
+    _2 = null;
     [timeIncrsMs, _timeAxisStampsMs, timeAxisSplitsMs] = genTimeStuffs(1);
     [timeIncrsS, _timeAxisStampsS, timeAxisSplitsS] = genTimeStuffs(1e-3);
     genIncrs(2, -53, 53, [1]);
@@ -17826,6 +18267,7 @@ var init_uPlot_esm = __esm({
       stroke: hexBlack,
       space: 50,
       gap: 5,
+      alignTo: 1,
       size: 50,
       labelGap: 0,
       labelSize: 30,
@@ -17867,6 +18309,7 @@ var init_uPlot_esm = __esm({
       stroke: hexBlack,
       space: 30,
       gap: 5,
+      alignTo: 1,
       size: 50,
       labelGap: 0,
       labelSize: 30,
@@ -17948,25 +18391,25 @@ var init_uPlot_esm = __esm({
     syncs = {};
     BAND_CLIP_FILL = 1 << 0;
     BAND_CLIP_STROKE = 1 << 1;
-    moveToH = (p3, x3, y3) => {
-      p3.moveTo(x3, y3);
+    moveToH = (p3, x2, y3) => {
+      p3.moveTo(x2, y3);
     };
-    moveToV = (p3, y3, x3) => {
-      p3.moveTo(x3, y3);
+    moveToV = (p3, y3, x2) => {
+      p3.moveTo(x2, y3);
     };
-    lineToH = (p3, x3, y3) => {
-      p3.lineTo(x3, y3);
+    lineToH = (p3, x2, y3) => {
+      p3.lineTo(x2, y3);
     };
-    lineToV = (p3, y3, x3) => {
-      p3.lineTo(x3, y3);
+    lineToV = (p3, y3, x2) => {
+      p3.lineTo(x2, y3);
     };
     rectH = rect(0);
     rectV = rect(1);
-    arcH = (p3, x3, y3, r3, startAngle, endAngle) => {
-      p3.arc(x3, y3, r3, startAngle, endAngle);
+    arcH = (p3, x2, y3, r3, startAngle, endAngle) => {
+      p3.arc(x2, y3, r3, startAngle, endAngle);
     };
-    arcV = (p3, y3, x3, r3, startAngle, endAngle) => {
-      p3.arc(x3, y3, r3, startAngle, endAngle);
+    arcV = (p3, y3, x2, r3, startAngle, endAngle) => {
+      p3.arc(x2, y3, r3, startAngle, endAngle);
     };
     bezierCurveToH = (p3, bp1x, bp1y, bp2x, bp2y, p2x, p2y) => {
       p3.bezierCurveTo(bp1x, bp1y, bp2x, bp2y, p2x, p2y);
@@ -18048,166 +18491,173 @@ var l;
 var u;
 var t2;
 var i;
-var o;
 var r;
-var f;
+var o;
 var e;
+var f;
 var c;
 var s;
 var a;
-var h = {};
-var p = [];
-var v = /acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i;
-var y = Array.isArray;
-function d(n3, l3) {
+var h;
+var p;
+var v;
+var y;
+var d = {};
+var w = [];
+var _ = /acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i;
+var g = Array.isArray;
+function m(n3, l3) {
   for (var u3 in l3) n3[u3] = l3[u3];
   return n3;
 }
-function w(n3) {
-  var l3 = n3.parentNode;
-  l3 && l3.removeChild(n3);
+function b(n3) {
+  n3 && n3.parentNode && n3.parentNode.removeChild(n3);
 }
-function _(l3, u3, t5) {
-  var i3, o3, r3, f3 = {};
-  for (r3 in u3) "key" == r3 ? i3 = u3[r3] : "ref" == r3 ? o3 = u3[r3] : f3[r3] = u3[r3];
-  if (arguments.length > 2 && (f3.children = arguments.length > 3 ? n2.call(arguments, 2) : t5), "function" == typeof l3 && null != l3.defaultProps) for (r3 in l3.defaultProps) void 0 === f3[r3] && (f3[r3] = l3.defaultProps[r3]);
-  return g(l3, f3, i3, o3, null);
+function k(l3, u3, t5) {
+  var i3, r3, o3, e3 = {};
+  for (o3 in u3) "key" == o3 ? i3 = u3[o3] : "ref" == o3 ? r3 = u3[o3] : e3[o3] = u3[o3];
+  if (arguments.length > 2 && (e3.children = arguments.length > 3 ? n2.call(arguments, 2) : t5), "function" == typeof l3 && null != l3.defaultProps) for (o3 in l3.defaultProps) void 0 === e3[o3] && (e3[o3] = l3.defaultProps[o3]);
+  return x(l3, e3, i3, r3, null);
 }
-function g(n3, t5, i3, o3, r3) {
-  var f3 = { type: n3, props: t5, key: i3, ref: o3, __k: null, __: null, __b: 0, __e: null, __d: void 0, __c: null, constructor: void 0, __v: null == r3 ? ++u : r3, __i: -1, __u: 0 };
-  return null == r3 && null != l.vnode && l.vnode(f3), f3;
+function x(n3, t5, i3, r3, o3) {
+  var e3 = { type: n3, props: t5, key: i3, ref: r3, __k: null, __: null, __b: 0, __e: null, __c: null, constructor: void 0, __v: null == o3 ? ++u : o3, __i: -1, __u: 0 };
+  return null == o3 && null != l.vnode && l.vnode(e3), e3;
 }
-function k(n3) {
+function S(n3) {
   return n3.children;
 }
-function b(n3, l3) {
+function C(n3, l3) {
   this.props = n3, this.context = l3;
 }
-function x(n3, l3) {
-  if (null == l3) return n3.__ ? x(n3.__, n3.__i + 1) : null;
+function $(n3, l3) {
+  if (null == l3) return n3.__ ? $(n3.__, n3.__i + 1) : null;
   for (var u3; l3 < n3.__k.length; l3++) if (null != (u3 = n3.__k[l3]) && null != u3.__e) return u3.__e;
-  return "function" == typeof n3.type ? x(n3) : null;
+  return "function" == typeof n3.type ? $(n3) : null;
 }
-function C(n3) {
-  var l3, u3;
-  if (null != (n3 = n3.__) && null != n3.__c) {
-    for (n3.__e = n3.__c.base = null, l3 = 0; l3 < n3.__k.length; l3++) if (null != (u3 = n3.__k[l3]) && null != u3.__e) {
-      n3.__e = n3.__c.base = u3.__e;
-      break;
-    }
-    return C(n3);
+function I(n3) {
+  if (n3.__P && n3.__d) {
+    var u3 = n3.__v, t5 = u3.__e, i3 = [], r3 = [], o3 = m({}, u3);
+    o3.__v = u3.__v + 1, l.vnode && l.vnode(o3), q(n3.__P, o3, u3, n3.__n, n3.__P.namespaceURI, 32 & u3.__u ? [t5] : null, i3, null == t5 ? $(u3) : t5, !!(32 & u3.__u), r3), o3.__v = u3.__v, o3.__.__k[o3.__i] = o3, D(i3, o3, r3), u3.__e = u3.__ = null, o3.__e != t5 && P(o3);
   }
 }
-function M(n3) {
-  (!n3.__d && (n3.__d = true) && i.push(n3) && !P.__r++ || o !== l.debounceRendering) && ((o = l.debounceRendering) || r)(P);
+function P(n3) {
+  if (null != (n3 = n3.__) && null != n3.__c) return n3.__e = n3.__c.base = null, n3.__k.some(function(l3) {
+    if (null != l3 && null != l3.__e) return n3.__e = n3.__c.base = l3.__e;
+  }), P(n3);
 }
-function P() {
-  var n3, u3, t5, o3, r3, e3, c3, s3;
-  for (i.sort(f); n3 = i.shift(); ) n3.__d && (u3 = i.length, o3 = void 0, e3 = (r3 = (t5 = n3).__v).__e, c3 = [], s3 = [], t5.__P && ((o3 = d({}, r3)).__v = r3.__v + 1, l.vnode && l.vnode(o3), O(t5.__P, o3, r3, t5.__n, t5.__P.namespaceURI, 32 & r3.__u ? [e3] : null, c3, null == e3 ? x(r3) : e3, !!(32 & r3.__u), s3), o3.__v = r3.__v, o3.__.__k[o3.__i] = o3, j(c3, o3, s3), o3.__e != e3 && C(o3)), i.length > u3 && i.sort(f));
-  P.__r = 0;
+function A(n3) {
+  (!n3.__d && (n3.__d = true) && i.push(n3) && !H.__r++ || r != l.debounceRendering) && ((r = l.debounceRendering) || o)(H);
+}
+function H() {
+  try {
+    for (var n3, l3 = 1; i.length; ) i.length > l3 && i.sort(e), n3 = i.shift(), l3 = i.length, I(n3);
+  } finally {
+    i.length = H.__r = 0;
+  }
 }
-function S(n3, l3, u3, t5, i3, o3, r3, f3, e3, c3, s3) {
-  var a3, v3, y3, d3, w3, _4 = t5 && t5.__k || p, g2 = l3.length;
-  for (u3.__d = e3, $(u3, l3, _4), e3 = u3.__d, a3 = 0; a3 < g2; a3++) null != (y3 = u3.__k[a3]) && "boolean" != typeof y3 && "function" != typeof y3 && (v3 = -1 === y3.__i ? h : _4[y3.__i] || h, y3.__i = a3, O(n3, y3, v3, i3, o3, r3, f3, e3, c3, s3), d3 = y3.__e, y3.ref && v3.ref != y3.ref && (v3.ref && N(v3.ref, null, y3), s3.push(y3.ref, y3.__c || d3, y3)), null == w3 && null != d3 && (w3 = d3), 65536 & y3.__u || v3.__k === y3.__k ? (e3 && !e3.isConnected && (e3 = x(v3)), e3 = I(y3, e3, n3)) : "function" == typeof y3.type && void 0 !== y3.__d ? e3 = y3.__d : d3 && (e3 = d3.nextSibling), y3.__d = void 0, y3.__u &= -196609);
-  u3.__d = e3, u3.__e = w3;
+function L(n3, l3, u3, t5, i3, r3, o3, e3, f3, c3, s3) {
+  var a3, h3, p3, v3, y3, _3, g2, m3 = t5 && t5.__k || w, b2 = l3.length;
+  for (f3 = T(u3, l3, m3, f3, b2), a3 = 0; a3 < b2; a3++) null != (p3 = u3.__k[a3]) && (h3 = -1 != p3.__i && m3[p3.__i] || d, p3.__i = a3, _3 = q(n3, p3, h3, i3, r3, o3, e3, f3, c3, s3), v3 = p3.__e, p3.ref && h3.ref != p3.ref && (h3.ref && J(h3.ref, null, p3), s3.push(p3.ref, p3.__c || v3, p3)), null == y3 && null != v3 && (y3 = v3), (g2 = !!(4 & p3.__u)) || h3.__k === p3.__k ? (f3 = j(p3, f3, n3, g2), g2 && h3.__e && (h3.__e = null)) : "function" == typeof p3.type && void 0 !== _3 ? f3 = _3 : v3 && (f3 = v3.nextSibling), p3.__u &= -7);
+  return u3.__e = y3, f3;
 }
-function $(n3, l3, u3) {
-  var t5, i3, o3, r3, f3, e3 = l3.length, c3 = u3.length, s3 = c3, a3 = 0;
-  for (n3.__k = [], t5 = 0; t5 < e3; t5++) r3 = t5 + a3, null != (i3 = n3.__k[t5] = null == (i3 = l3[t5]) || "boolean" == typeof i3 || "function" == typeof i3 ? null : "string" == typeof i3 || "number" == typeof i3 || "bigint" == typeof i3 || i3.constructor == String ? g(null, i3, null, null, null) : y(i3) ? g(k, { children: i3 }, null, null, null) : void 0 === i3.constructor && i3.__b > 0 ? g(i3.type, i3.props, i3.key, i3.ref ? i3.ref : null, i3.__v) : i3) ? (i3.__ = n3, i3.__b = n3.__b + 1, f3 = L(i3, u3, r3, s3), i3.__i = f3, o3 = null, -1 !== f3 && (s3--, (o3 = u3[f3]) && (o3.__u |= 131072)), null == o3 || null === o3.__v ? (-1 == f3 && a3--, "function" != typeof i3.type && (i3.__u |= 65536)) : f3 !== r3 && (f3 === r3 + 1 ? a3++ : f3 > r3 ? s3 > e3 - r3 ? a3 += f3 - r3 : a3-- : f3 < r3 ? f3 == r3 - 1 && (a3 = f3 - r3) : a3 = 0, f3 !== t5 + a3 && (i3.__u |= 65536))) : (o3 = u3[r3]) && null == o3.key && o3.__e && 0 == (131072 & o3.__u) && (o3.__e == n3.__d && (n3.__d = x(o3)), V(o3, o3, false), u3[r3] = null, s3--);
-  if (s3) for (t5 = 0; t5 < c3; t5++) null != (o3 = u3[t5]) && 0 == (131072 & o3.__u) && (o3.__e == n3.__d && (n3.__d = x(o3)), V(o3, o3));
+function T(n3, l3, u3, t5, i3) {
+  var r3, o3, e3, f3, c3, s3 = u3.length, a3 = s3, h3 = 0;
+  for (n3.__k = new Array(i3), r3 = 0; r3 < i3; r3++) null != (o3 = l3[r3]) && "boolean" != typeof o3 && "function" != typeof o3 ? ("string" == typeof o3 || "number" == typeof o3 || "bigint" == typeof o3 || o3.constructor == String ? o3 = n3.__k[r3] = x(null, o3, null, null, null) : g(o3) ? o3 = n3.__k[r3] = x(S, { children: o3 }, null, null, null) : void 0 === o3.constructor && o3.__b > 0 ? o3 = n3.__k[r3] = x(o3.type, o3.props, o3.key, o3.ref ? o3.ref : null, o3.__v) : n3.__k[r3] = o3, f3 = r3 + h3, o3.__ = n3, o3.__b = n3.__b + 1, e3 = null, -1 != (c3 = o3.__i = O(o3, u3, f3, a3)) && (a3--, (e3 = u3[c3]) && (e3.__u |= 2)), null == e3 || null == e3.__v ? (-1 == c3 && (i3 > s3 ? h3-- : i3 < s3 && h3++), "function" != typeof o3.type && (o3.__u |= 4)) : c3 != f3 && (c3 == f3 - 1 ? h3-- : c3 == f3 + 1 ? h3++ : (c3 > f3 ? h3-- : h3++, o3.__u |= 4))) : n3.__k[r3] = null;
+  if (a3) for (r3 = 0; r3 < s3; r3++) null != (e3 = u3[r3]) && 0 == (2 & e3.__u) && (e3.__e == t5 && (t5 = $(e3)), K(e3, e3));
+  return t5;
 }
-function I(n3, l3, u3) {
-  var t5, i3;
+function j(n3, l3, u3, t5) {
+  var i3, r3;
   if ("function" == typeof n3.type) {
-    for (t5 = n3.__k, i3 = 0; t5 && i3 < t5.length; i3++) t5[i3] && (t5[i3].__ = n3, l3 = I(t5[i3], l3, u3));
+    for (i3 = n3.__k, r3 = 0; i3 && r3 < i3.length; r3++) i3[r3] && (i3[r3].__ = n3, l3 = j(i3[r3], l3, u3, t5));
     return l3;
   }
-  n3.__e != l3 && (u3.insertBefore(n3.__e, l3 || null), l3 = n3.__e);
+  n3.__e != l3 && (t5 && (l3 && n3.type && !l3.parentNode && (l3 = $(n3)), u3.insertBefore(n3.__e, l3 || null)), l3 = n3.__e);
   do {
     l3 = l3 && l3.nextSibling;
-  } while (null != l3 && 8 === l3.nodeType);
+  } while (null != l3 && 8 == l3.nodeType);
   return l3;
 }
-function L(n3, l3, u3, t5) {
-  var i3 = n3.key, o3 = n3.type, r3 = u3 - 1, f3 = u3 + 1, e3 = l3[u3];
-  if (null === e3 || e3 && i3 == e3.key && o3 === e3.type && 0 == (131072 & e3.__u)) return u3;
-  if (t5 > (null != e3 && 0 == (131072 & e3.__u) ? 1 : 0)) for (; r3 >= 0 || f3 < l3.length; ) {
-    if (r3 >= 0) {
-      if ((e3 = l3[r3]) && 0 == (131072 & e3.__u) && i3 == e3.key && o3 === e3.type) return r3;
-      r3--;
-    }
-    if (f3 < l3.length) {
-      if ((e3 = l3[f3]) && 0 == (131072 & e3.__u) && i3 == e3.key && o3 === e3.type) return f3;
-      f3++;
-    }
+function O(n3, l3, u3, t5) {
+  var i3, r3, o3, e3 = n3.key, f3 = n3.type, c3 = l3[u3], s3 = null != c3 && 0 == (2 & c3.__u);
+  if (null === c3 && null == e3 || s3 && e3 == c3.key && f3 == c3.type) return u3;
+  if (t5 > (s3 ? 1 : 0)) {
+    for (i3 = u3 - 1, r3 = u3 + 1; i3 >= 0 || r3 < l3.length; ) if (null != (c3 = l3[o3 = i3 >= 0 ? i3-- : r3++]) && 0 == (2 & c3.__u) && e3 == c3.key && f3 == c3.type) return o3;
   }
   return -1;
 }
-function T(n3, l3, u3) {
-  "-" === l3[0] ? n3.setProperty(l3, null == u3 ? "" : u3) : n3[l3] = null == u3 ? "" : "number" != typeof u3 || v.test(l3) ? u3 : u3 + "px";
+function z(n3, l3, u3) {
+  "-" == l3[0] ? n3.setProperty(l3, null == u3 ? "" : u3) : n3[l3] = null == u3 ? "" : "number" != typeof u3 || _.test(l3) ? u3 : u3 + "px";
 }
-function A(n3, l3, u3, t5, i3) {
-  var o3;
-  n: if ("style" === l3) if ("string" == typeof u3) n3.style.cssText = u3;
+function N(n3, l3, u3, t5, i3) {
+  var r3, o3;
+  n: if ("style" == l3) if ("string" == typeof u3) n3.style.cssText = u3;
   else {
-    if ("string" == typeof t5 && (n3.style.cssText = t5 = ""), t5) for (l3 in t5) u3 && l3 in u3 || T(n3.style, l3, "");
-    if (u3) for (l3 in u3) t5 && u3[l3] === t5[l3] || T(n3.style, l3, u3[l3]);
+    if ("string" == typeof t5 && (n3.style.cssText = t5 = ""), t5) for (l3 in t5) u3 && l3 in u3 || z(n3.style, l3, "");
+    if (u3) for (l3 in u3) t5 && u3[l3] == t5[l3] || z(n3.style, l3, u3[l3]);
   }
-  else if ("o" === l3[0] && "n" === l3[1]) o3 = l3 !== (l3 = l3.replace(/(PointerCapture)$|Capture$/i, "$1")), l3 = l3.toLowerCase() in n3 || "onFocusOut" === l3 || "onFocusIn" === l3 ? l3.toLowerCase().slice(2) : l3.slice(2), n3.l || (n3.l = {}), n3.l[l3 + o3] = u3, u3 ? t5 ? u3.u = t5.u : (u3.u = e, n3.addEventListener(l3, o3 ? s : c, o3)) : n3.removeEventListener(l3, o3 ? s : c, o3);
+  else if ("o" == l3[0] && "n" == l3[1]) r3 = l3 != (l3 = l3.replace(a, "$1")), o3 = l3.toLowerCase(), l3 = o3 in n3 || "onFocusOut" == l3 || "onFocusIn" == l3 ? o3.slice(2) : l3.slice(2), n3.l || (n3.l = {}), n3.l[l3 + r3] = u3, u3 ? t5 ? u3[s] = t5[s] : (u3[s] = h, n3.addEventListener(l3, r3 ? v : p, r3)) : n3.removeEventListener(l3, r3 ? v : p, r3);
   else {
     if ("http://www.w3.org/2000/svg" == i3) l3 = l3.replace(/xlink(H|:h)/, "h").replace(/sName$/, "s");
-    else if ("width" != l3 && "height" != l3 && "href" != l3 && "list" != l3 && "form" != l3 && "tabIndex" != l3 && "download" != l3 && "rowSpan" != l3 && "colSpan" != l3 && "role" != l3 && l3 in n3) try {
+    else if ("width" != l3 && "height" != l3 && "href" != l3 && "list" != l3 && "form" != l3 && "tabIndex" != l3 && "download" != l3 && "rowSpan" != l3 && "colSpan" != l3 && "role" != l3 && "popover" != l3 && l3 in n3) try {
       n3[l3] = null == u3 ? "" : u3;
       break n;
     } catch (n4) {
     }
-    "function" == typeof u3 || (null == u3 || false === u3 && "-" !== l3[4] ? n3.removeAttribute(l3) : n3.setAttribute(l3, u3));
+    "function" == typeof u3 || (null == u3 || false === u3 && "-" != l3[4] ? n3.removeAttribute(l3) : n3.setAttribute(l3, "popover" == l3 && 1 == u3 ? "" : u3));
   }
 }
-function F(n3) {
+function V(n3) {
   return function(u3) {
     if (this.l) {
       var t5 = this.l[u3.type + n3];
-      if (null == u3.t) u3.t = e++;
-      else if (u3.t < t5.u) return;
+      if (null == u3[c]) u3[c] = h++;
+      else if (u3[c] < t5[s]) return;
       return t5(l.event ? l.event(u3) : u3);
     }
   };
 }
-function O(n3, u3, t5, i3, o3, r3, f3, e3, c3, s3) {
-  var a3, h3, p3, v3, w3, _4, g2, m2, x3, C3, M3, P2, $2, I2, H, L2 = u3.type;
+function q(n3, u3, t5, i3, r3, o3, e3, f3, c3, s3) {
+  var a3, h3, p3, v3, y3, d3, _3, k3, x2, M2, $2, I2, P2, A3, H2, T3 = u3.type;
   if (void 0 !== u3.constructor) return null;
-  128 & t5.__u && (c3 = !!(32 & t5.__u), r3 = [e3 = u3.__e = t5.__e]), (a3 = l.__b) && a3(u3);
-  n: if ("function" == typeof L2) try {
-    if (m2 = u3.props, x3 = (a3 = L2.contextType) && i3[a3.__c], C3 = a3 ? x3 ? x3.props.value : a3.__ : i3, t5.__c ? g2 = (h3 = u3.__c = t5.__c).__ = h3.__E : ("prototype" in L2 && L2.prototype.render ? u3.__c = h3 = new L2(m2, C3) : (u3.__c = h3 = new b(m2, C3), h3.constructor = L2, h3.render = q), x3 && x3.sub(h3), h3.props = m2, h3.state || (h3.state = {}), h3.context = C3, h3.__n = i3, p3 = h3.__d = true, h3.__h = [], h3._sb = []), null == h3.__s && (h3.__s = h3.state), null != L2.getDerivedStateFromProps && (h3.__s == h3.state && (h3.__s = d({}, h3.__s)), d(h3.__s, L2.getDerivedStateFromProps(m2, h3.__s))), v3 = h3.props, w3 = h3.state, h3.__v = u3, p3) null == L2.getDerivedStateFromProps && null != h3.componentWillMount && h3.componentWillMount(), null != h3.componentDidMount && h3.__h.push(h3.componentDidMount);
+  128 & t5.__u && (c3 = !!(32 & t5.__u), o3 = [f3 = u3.__e = t5.__e]), (a3 = l.__b) && a3(u3);
+  n: if ("function" == typeof T3) try {
+    if (k3 = u3.props, x2 = T3.prototype && T3.prototype.render, M2 = (a3 = T3.contextType) && i3[a3.__c], $2 = a3 ? M2 ? M2.props.value : a3.__ : i3, t5.__c ? _3 = (h3 = u3.__c = t5.__c).__ = h3.__E : (x2 ? u3.__c = h3 = new T3(k3, $2) : (u3.__c = h3 = new C(k3, $2), h3.constructor = T3, h3.render = Q), M2 && M2.sub(h3), h3.state || (h3.state = {}), h3.__n = i3, p3 = h3.__d = true, h3.__h = [], h3._sb = []), x2 && null == h3.__s && (h3.__s = h3.state), x2 && null != T3.getDerivedStateFromProps && (h3.__s == h3.state && (h3.__s = m({}, h3.__s)), m(h3.__s, T3.getDerivedStateFromProps(k3, h3.__s))), v3 = h3.props, y3 = h3.state, h3.__v = u3, p3) x2 && null == T3.getDerivedStateFromProps && null != h3.componentWillMount && h3.componentWillMount(), x2 && null != h3.componentDidMount && h3.__h.push(h3.componentDidMount);
     else {
-      if (null == L2.getDerivedStateFromProps && m2 !== v3 && null != h3.componentWillReceiveProps && h3.componentWillReceiveProps(m2, C3), !h3.__e && (null != h3.shouldComponentUpdate && false === h3.shouldComponentUpdate(m2, h3.__s, C3) || u3.__v === t5.__v)) {
-        for (u3.__v !== t5.__v && (h3.props = m2, h3.state = h3.__s, h3.__d = false), u3.__e = t5.__e, u3.__k = t5.__k, u3.__k.forEach(function(n4) {
+      if (x2 && null == T3.getDerivedStateFromProps && k3 !== v3 && null != h3.componentWillReceiveProps && h3.componentWillReceiveProps(k3, $2), u3.__v == t5.__v || !h3.__e && null != h3.shouldComponentUpdate && false === h3.shouldComponentUpdate(k3, h3.__s, $2)) {
+        u3.__v != t5.__v && (h3.props = k3, h3.state = h3.__s, h3.__d = false), u3.__e = t5.__e, u3.__k = t5.__k, u3.__k.some(function(n4) {
           n4 && (n4.__ = u3);
-        }), M3 = 0; M3 < h3._sb.length; M3++) h3.__h.push(h3._sb[M3]);
-        h3._sb = [], h3.__h.length && f3.push(h3);
+        }), w.push.apply(h3.__h, h3._sb), h3._sb = [], h3.__h.length && e3.push(h3);
         break n;
       }
-      null != h3.componentWillUpdate && h3.componentWillUpdate(m2, h3.__s, C3), null != h3.componentDidUpdate && h3.__h.push(function() {
-        h3.componentDidUpdate(v3, w3, _4);
+      null != h3.componentWillUpdate && h3.componentWillUpdate(k3, h3.__s, $2), x2 && null != h3.componentDidUpdate && h3.__h.push(function() {
+        h3.componentDidUpdate(v3, y3, d3);
       });
     }
-    if (h3.context = C3, h3.props = m2, h3.__P = n3, h3.__e = false, P2 = l.__r, $2 = 0, "prototype" in L2 && L2.prototype.render) {
-      for (h3.state = h3.__s, h3.__d = false, P2 && P2(u3), a3 = h3.render(h3.props, h3.state, h3.context), I2 = 0; I2 < h3._sb.length; I2++) h3.__h.push(h3._sb[I2]);
-      h3._sb = [];
-    } else do {
-      h3.__d = false, P2 && P2(u3), a3 = h3.render(h3.props, h3.state, h3.context), h3.state = h3.__s;
-    } while (h3.__d && ++$2 < 25);
-    h3.state = h3.__s, null != h3.getChildContext && (i3 = d(d({}, i3), h3.getChildContext())), p3 || null == h3.getSnapshotBeforeUpdate || (_4 = h3.getSnapshotBeforeUpdate(v3, w3)), S(n3, y(H = null != a3 && a3.type === k && null == a3.key ? a3.props.children : a3) ? H : [H], u3, t5, i3, o3, r3, f3, e3, c3, s3), h3.base = u3.__e, u3.__u &= -161, h3.__h.length && f3.push(h3), g2 && (h3.__E = h3.__ = null);
+    if (h3.context = $2, h3.props = k3, h3.__P = n3, h3.__e = false, I2 = l.__r, P2 = 0, x2) h3.state = h3.__s, h3.__d = false, I2 && I2(u3), a3 = h3.render(h3.props, h3.state, h3.context), w.push.apply(h3.__h, h3._sb), h3._sb = [];
+    else do {
+      h3.__d = false, I2 && I2(u3), a3 = h3.render(h3.props, h3.state, h3.context), h3.state = h3.__s;
+    } while (h3.__d && ++P2 < 25);
+    h3.state = h3.__s, null != h3.getChildContext && (i3 = m(m({}, i3), h3.getChildContext())), x2 && !p3 && null != h3.getSnapshotBeforeUpdate && (d3 = h3.getSnapshotBeforeUpdate(v3, y3)), A3 = null != a3 && a3.type === S && null == a3.key ? E(a3.props.children) : a3, f3 = L(n3, g(A3) ? A3 : [A3], u3, t5, i3, r3, o3, e3, f3, c3, s3), h3.base = u3.__e, u3.__u &= -161, h3.__h.length && e3.push(h3), _3 && (h3.__E = h3.__ = null);
   } catch (n4) {
-    u3.__v = null, c3 || null != r3 ? (u3.__e = e3, u3.__u |= c3 ? 160 : 32, r3[r3.indexOf(e3)] = null) : (u3.__e = t5.__e, u3.__k = t5.__k), l.__e(n4, u3, t5);
+    if (u3.__v = null, c3 || null != o3) if (n4.then) {
+      for (u3.__u |= c3 ? 160 : 128; f3 && 8 == f3.nodeType && f3.nextSibling; ) f3 = f3.nextSibling;
+      o3[o3.indexOf(f3)] = null, u3.__e = f3;
+    } else {
+      for (H2 = o3.length; H2--; ) b(o3[H2]);
+      B(u3);
+    }
+    else u3.__e = t5.__e, u3.__k = t5.__k, n4.then || B(u3);
+    l.__e(n4, u3, t5);
   }
-  else null == r3 && u3.__v === t5.__v ? (u3.__k = t5.__k, u3.__e = t5.__e) : u3.__e = z(t5.__e, u3, t5, i3, o3, r3, f3, c3, s3);
-  (a3 = l.diffed) && a3(u3);
+  else null == o3 && u3.__v == t5.__v ? (u3.__k = t5.__k, u3.__e = t5.__e) : f3 = u3.__e = G(t5.__e, u3, t5, i3, r3, o3, e3, c3, s3);
+  return (a3 = l.diffed) && a3(u3), 128 & u3.__u ? void 0 : f3;
+}
+function B(n3) {
+  n3 && (n3.__c && (n3.__c.__e = true), n3.__k && n3.__k.some(B));
 }
-function j(n3, u3, t5) {
-  u3.__d = void 0;
-  for (var i3 = 0; i3 < t5.length; i3++) N(t5[i3], t5[++i3], t5[++i3]);
+function D(n3, u3, t5) {
+  for (var i3 = 0; i3 < t5.length; i3++) J(t5[i3], t5[++i3], t5[++i3]);
   l.__c && l.__c(u3, n3), n3.some(function(u4) {
     try {
       n3 = u4.__h, u4.__h = [], n3.some(function(n4) {
@@ -18218,44 +18668,45 @@ function j(n3, u3, t5) {
     }
   });
 }
-function z(l3, u3, t5, i3, o3, r3, f3, e3, c3) {
-  var s3, a3, p3, v3, d3, _4, g2, m2 = t5.props, k3 = u3.props, b2 = u3.type;
-  if ("svg" === b2 ? o3 = "http://www.w3.org/2000/svg" : "math" === b2 ? o3 = "http://www.w3.org/1998/Math/MathML" : o3 || (o3 = "http://www.w3.org/1999/xhtml"), null != r3) {
-    for (s3 = 0; s3 < r3.length; s3++) if ((d3 = r3[s3]) && "setAttribute" in d3 == !!b2 && (b2 ? d3.localName === b2 : 3 === d3.nodeType)) {
-      l3 = d3, r3[s3] = null;
+function E(n3) {
+  return "object" != typeof n3 || null == n3 || n3.__b > 0 ? n3 : g(n3) ? n3.map(E) : m({}, n3);
+}
+function G(u3, t5, i3, r3, o3, e3, f3, c3, s3) {
+  var a3, h3, p3, v3, y3, w3, _3, m3 = i3.props || d, k3 = t5.props, x2 = t5.type;
+  if ("svg" == x2 ? o3 = "http://www.w3.org/2000/svg" : "math" == x2 ? o3 = "http://www.w3.org/1998/Math/MathML" : o3 || (o3 = "http://www.w3.org/1999/xhtml"), null != e3) {
+    for (a3 = 0; a3 < e3.length; a3++) if ((y3 = e3[a3]) && "setAttribute" in y3 == !!x2 && (x2 ? y3.localName == x2 : 3 == y3.nodeType)) {
+      u3 = y3, e3[a3] = null;
       break;
     }
   }
-  if (null == l3) {
-    if (null === b2) return document.createTextNode(k3);
-    l3 = document.createElementNS(o3, b2, k3.is && k3), r3 = null, e3 = false;
+  if (null == u3) {
+    if (null == x2) return document.createTextNode(k3);
+    u3 = document.createElementNS(o3, x2, k3.is && k3), c3 && (l.__m && l.__m(t5, e3), c3 = false), e3 = null;
   }
-  if (null === b2) m2 === k3 || e3 && l3.data === k3 || (l3.data = k3);
+  if (null == x2) m3 === k3 || c3 && u3.data == k3 || (u3.data = k3);
   else {
-    if (r3 = r3 && n2.call(l3.childNodes), m2 = t5.props || h, !e3 && null != r3) for (m2 = {}, s3 = 0; s3 < l3.attributes.length; s3++) m2[(d3 = l3.attributes[s3]).name] = d3.value;
-    for (s3 in m2) if (d3 = m2[s3], "children" == s3) ;
-    else if ("dangerouslySetInnerHTML" == s3) p3 = d3;
-    else if ("key" !== s3 && !(s3 in k3)) {
-      if ("value" == s3 && "defaultValue" in k3 || "checked" == s3 && "defaultChecked" in k3) continue;
-      A(l3, s3, null, d3, o3);
-    }
-    for (s3 in k3) d3 = k3[s3], "children" == s3 ? v3 = d3 : "dangerouslySetInnerHTML" == s3 ? a3 = d3 : "value" == s3 ? _4 = d3 : "checked" == s3 ? g2 = d3 : "key" === s3 || e3 && "function" != typeof d3 || m2[s3] === d3 || A(l3, s3, d3, m2[s3], o3);
-    if (a3) e3 || p3 && (a3.__html === p3.__html || a3.__html === l3.innerHTML) || (l3.innerHTML = a3.__html), u3.__k = [];
-    else if (p3 && (l3.innerHTML = ""), S(l3, y(v3) ? v3 : [v3], u3, t5, i3, "foreignObject" === b2 ? "http://www.w3.org/1999/xhtml" : o3, r3, f3, r3 ? r3[0] : t5.__k && x(t5, 0), e3, c3), null != r3) for (s3 = r3.length; s3--; ) null != r3[s3] && w(r3[s3]);
-    e3 || (s3 = "value", void 0 !== _4 && (_4 !== l3[s3] || "progress" === b2 && !_4 || "option" === b2 && _4 !== m2[s3]) && A(l3, s3, _4, m2[s3], o3), s3 = "checked", void 0 !== g2 && g2 !== l3[s3] && A(l3, s3, g2, m2[s3], o3));
-  }
-  return l3;
+    if (e3 = e3 && n2.call(u3.childNodes), !c3 && null != e3) for (m3 = {}, a3 = 0; a3 < u3.attributes.length; a3++) m3[(y3 = u3.attributes[a3]).name] = y3.value;
+    for (a3 in m3) y3 = m3[a3], "dangerouslySetInnerHTML" == a3 ? p3 = y3 : "children" == a3 || a3 in k3 || "value" == a3 && "defaultValue" in k3 || "checked" == a3 && "defaultChecked" in k3 || N(u3, a3, null, y3, o3);
+    for (a3 in k3) y3 = k3[a3], "children" == a3 ? v3 = y3 : "dangerouslySetInnerHTML" == a3 ? h3 = y3 : "value" == a3 ? w3 = y3 : "checked" == a3 ? _3 = y3 : c3 && "function" != typeof y3 || m3[a3] === y3 || N(u3, a3, y3, m3[a3], o3);
+    if (h3) c3 || p3 && (h3.__html == p3.__html || h3.__html == u3.innerHTML) || (u3.innerHTML = h3.__html), t5.__k = [];
+    else if (p3 && (u3.innerHTML = ""), L("template" == t5.type ? u3.content : u3, g(v3) ? v3 : [v3], t5, i3, r3, "foreignObject" == x2 ? "http://www.w3.org/1999/xhtml" : o3, e3, f3, e3 ? e3[0] : i3.__k && $(i3, 0), c3, s3), null != e3) for (a3 = e3.length; a3--; ) b(e3[a3]);
+    c3 || (a3 = "value", "progress" == x2 && null == w3 ? u3.removeAttribute("value") : null != w3 && (w3 !== u3[a3] || "progress" == x2 && !w3 || "option" == x2 && w3 != m3[a3]) && N(u3, a3, w3, m3[a3], o3), a3 = "checked", null != _3 && _3 != u3[a3] && N(u3, a3, _3, m3[a3], o3));
+  }
+  return u3;
 }
-function N(n3, u3, t5) {
+function J(n3, u3, t5) {
   try {
-    "function" == typeof n3 ? n3(u3) : n3.current = u3;
+    if ("function" == typeof n3) {
+      var i3 = "function" == typeof n3.__u;
+      i3 && n3.__u(), i3 && null == u3 || (n3.__u = n3(u3));
+    } else n3.current = u3;
   } catch (n4) {
     l.__e(n4, t5);
   }
 }
-function V(n3, u3, t5) {
-  var i3, o3;
-  if (l.unmount && l.unmount(n3), (i3 = n3.ref) && (i3.current && i3.current !== n3.__e || N(i3, null, u3)), null != (i3 = n3.__c)) {
+function K(n3, u3, t5) {
+  var i3, r3;
+  if (l.unmount && l.unmount(n3), (i3 = n3.ref) && (i3.current && i3.current != n3.__e || J(i3, null, u3)), null != (i3 = n3.__c)) {
     if (i3.componentWillUnmount) try {
       i3.componentWillUnmount();
     } catch (n4) {
@@ -18263,33 +18714,33 @@ function V(n3, u3, t5) {
     }
     i3.base = i3.__P = null;
   }
-  if (i3 = n3.__k) for (o3 = 0; o3 < i3.length; o3++) i3[o3] && V(i3[o3], u3, t5 || "function" != typeof n3.type);
-  t5 || null == n3.__e || w(n3.__e), n3.__c = n3.__ = n3.__e = n3.__d = void 0;
+  if (i3 = n3.__k) for (r3 = 0; r3 < i3.length; r3++) i3[r3] && K(i3[r3], u3, t5 || "function" != typeof n3.type);
+  t5 || b(n3.__e), n3.__c = n3.__ = n3.__e = void 0;
 }
-function q(n3, l3, u3) {
+function Q(n3, l3, u3) {
   return this.constructor(n3, u3);
 }
-function B(u3, t5, i3) {
-  var o3, r3, f3, e3;
-  l.__ && l.__(u3, t5), r3 = (o3 = "function" == typeof i3) ? null : i3 && i3.__k || t5.__k, f3 = [], e3 = [], O(t5, u3 = (!o3 && i3 || t5).__k = _(k, null, [u3]), r3 || h, h, t5.namespaceURI, !o3 && i3 ? [i3] : r3 ? null : t5.firstChild ? n2.call(t5.childNodes) : null, f3, !o3 && i3 ? i3 : r3 ? r3.__e : t5.firstChild, o3, e3), j(f3, u3, e3);
+function R(u3, t5, i3) {
+  var r3, o3, e3, f3;
+  t5 == document && (t5 = document.documentElement), l.__ && l.__(u3, t5), o3 = (r3 = "function" == typeof i3) ? null : i3 && i3.__k || t5.__k, e3 = [], f3 = [], q(t5, u3 = (!r3 && i3 || t5).__k = k(S, null, [u3]), o3 || d, d, t5.namespaceURI, !r3 && i3 ? [i3] : o3 ? null : t5.firstChild ? n2.call(t5.childNodes) : null, e3, !r3 && i3 ? i3 : o3 ? o3.__e : t5.firstChild, r3, f3), D(e3, u3, f3);
 }
-n2 = p.slice, l = { __e: function(n3, l3, u3, t5) {
-  for (var i3, o3, r3; l3 = l3.__; ) if ((i3 = l3.__c) && !i3.__) try {
-    if ((o3 = i3.constructor) && null != o3.getDerivedStateFromError && (i3.setState(o3.getDerivedStateFromError(n3)), r3 = i3.__d), null != i3.componentDidCatch && (i3.componentDidCatch(n3, t5 || {}), r3 = i3.__d), r3) return i3.__E = i3;
+n2 = w.slice, l = { __e: function(n3, l3, u3, t5) {
+  for (var i3, r3, o3; l3 = l3.__; ) if ((i3 = l3.__c) && !i3.__) try {
+    if ((r3 = i3.constructor) && null != r3.getDerivedStateFromError && (i3.setState(r3.getDerivedStateFromError(n3)), o3 = i3.__d), null != i3.componentDidCatch && (i3.componentDidCatch(n3, t5 || {}), o3 = i3.__d), o3) return i3.__E = i3;
   } catch (l4) {
     n3 = l4;
   }
   throw n3;
 } }, u = 0, t2 = function(n3) {
-  return null != n3 && null == n3.constructor;
-}, b.prototype.setState = function(n3, l3) {
+  return null != n3 && void 0 === n3.constructor;
+}, C.prototype.setState = function(n3, l3) {
   var u3;
-  u3 = null != this.__s && this.__s !== this.state ? this.__s : this.__s = d({}, this.state), "function" == typeof n3 && (n3 = n3(d({}, u3), this.props)), n3 && d(u3, n3), null != n3 && this.__v && (l3 && this._sb.push(l3), M(this));
-}, b.prototype.forceUpdate = function(n3) {
-  this.__v && (this.__e = true, n3 && this.__h.push(n3), M(this));
-}, b.prototype.render = k, i = [], r = "function" == typeof Promise ? Promise.prototype.then.bind(Promise.resolve()) : setTimeout, f = function(n3, l3) {
+  u3 = null != this.__s && this.__s != this.state ? this.__s : this.__s = m({}, this.state), "function" == typeof n3 && (n3 = n3(m({}, u3), this.props)), n3 && m(u3, n3), null != n3 && this.__v && (l3 && this._sb.push(l3), A(this));
+}, C.prototype.forceUpdate = function(n3) {
+  this.__v && (this.__e = true, n3 && this.__h.push(n3), A(this));
+}, C.prototype.render = S, i = [], o = "function" == typeof Promise ? Promise.prototype.then.bind(Promise.resolve()) : setTimeout, e = function(n3, l3) {
   return n3.__v.__b - l3.__v.__b;
-}, P.__r = 0, e = 0, c = F(false), s = F(true), a = 0;
+}, H.__r = 0, f = Math.random().toString(8), c = "__d" + f, s = "__a" + f, a = /(PointerCapture)$|Capture$/i, h = 0, p = V(false), v = V(true), y = 0;
 
 // node_modules/preact/hooks/dist/hooks.module.js
 var t3;
@@ -18298,45 +18749,44 @@ var u2;
 var i2;
 var o2 = 0;
 var f2 = [];
-var c2 = [];
-var e2 = l;
-var a2 = e2.__b;
-var v2 = e2.__r;
-var l2 = e2.diffed;
-var m = e2.__c;
-var s2 = e2.unmount;
-var d2 = e2.__;
-function h2(n3, t5) {
-  e2.__h && e2.__h(r2, n3, o2 || t5), o2 = 0;
+var c2 = l;
+var e2 = c2.__b;
+var a2 = c2.__r;
+var v2 = c2.diffed;
+var l2 = c2.__c;
+var m2 = c2.unmount;
+var s2 = c2.__;
+function p2(n3, t5) {
+  c2.__h && c2.__h(r2, n3, o2 || t5), o2 = 0;
   var u3 = r2.__H || (r2.__H = { __: [], __h: [] });
-  return n3 >= u3.__.length && u3.__.push({ __V: c2 }), u3.__[n3];
+  return n3 >= u3.__.length && u3.__.push({}), u3.__[n3];
 }
-function p2(n3) {
-  return o2 = 1, y2(D, n3);
+function d2(n3) {
+  return o2 = 1, h2(D2, n3);
 }
-function y2(n3, u3, i3) {
-  var o3 = h2(t3++, 2);
-  if (o3.t = n3, !o3.__c && (o3.__ = [i3 ? i3(u3) : D(void 0, u3), function(n4) {
+function h2(n3, u3, i3) {
+  var o3 = p2(t3++, 2);
+  if (o3.t = n3, !o3.__c && (o3.__ = [i3 ? i3(u3) : D2(void 0, u3), function(n4) {
     var t5 = o3.__N ? o3.__N[0] : o3.__[0], r3 = o3.t(t5, n4);
     t5 !== r3 && (o3.__N = [r3, o3.__[1]], o3.__c.setState({}));
-  }], o3.__c = r2, !r2.u)) {
+  }], o3.__c = r2, !r2.__f)) {
     var f3 = function(n4, t5, r3) {
       if (!o3.__c.__H) return true;
       var u4 = o3.__c.__H.__.filter(function(n5) {
-        return !!n5.__c;
+        return n5.__c;
       });
       if (u4.every(function(n5) {
         return !n5.__N;
       })) return !c3 || c3.call(this, n4, t5, r3);
-      var i4 = false;
-      return u4.forEach(function(n5) {
+      var i4 = o3.__c.props !== n4;
+      return u4.some(function(n5) {
         if (n5.__N) {
           var t6 = n5.__[0];
           n5.__ = n5.__N, n5.__N = void 0, t6 !== n5.__[0] && (i4 = true);
         }
-      }), !(!i4 && o3.__c.props === n4) && (!c3 || c3.call(this, n4, t5, r3));
+      }), c3 && c3.call(this, n4, t5, r3) || i4;
     };
-    r2.u = true;
+    r2.__f = true;
     var c3 = r2.shouldComponentUpdate, e3 = r2.componentWillUpdate;
     r2.componentWillUpdate = function(n4, t5, r3) {
       if (this.__e) {
@@ -18348,75 +18798,78 @@ function y2(n3, u3, i3) {
   }
   return o3.__N || o3.__;
 }
-function _2(n3, u3) {
-  var i3 = h2(t3++, 3);
-  !e2.__s && C2(i3.__H, u3) && (i3.__ = n3, i3.i = u3, r2.__H.__h.push(i3));
+function y2(n3, u3) {
+  var i3 = p2(t3++, 3);
+  !c2.__s && C2(i3.__H, u3) && (i3.__ = n3, i3.u = u3, r2.__H.__h.push(i3));
 }
-function F2(n3) {
-  return o2 = 5, q2(function() {
+function A2(n3) {
+  return o2 = 5, T2(function() {
     return { current: n3 };
   }, []);
 }
-function q2(n3, r3) {
-  var u3 = h2(t3++, 7);
-  return C2(u3.__H, r3) ? (u3.__V = n3(), u3.i = r3, u3.__h = n3, u3.__V) : u3.__;
+function T2(n3, r3) {
+  var u3 = p2(t3++, 7);
+  return C2(u3.__H, r3) && (u3.__ = n3(), u3.__H = r3, u3.__h = n3), u3.__;
 }
-function x2(n3, t5) {
-  return o2 = 8, q2(function() {
+function q2(n3, t5) {
+  return o2 = 8, T2(function() {
     return n3;
   }, t5);
 }
 function j2() {
-  for (var n3; n3 = f2.shift(); ) if (n3.__P && n3.__H) try {
-    n3.__H.__h.forEach(z2), n3.__H.__h.forEach(B2), n3.__H.__h = [];
-  } catch (t5) {
-    n3.__H.__h = [], e2.__e(t5, n3.__v);
+  for (var n3; n3 = f2.shift(); ) {
+    var t5 = n3.__H;
+    if (n3.__P && t5) try {
+      t5.__h.some(z2), t5.__h.some(B2), t5.__h = [];
+    } catch (r3) {
+      t5.__h = [], c2.__e(r3, n3.__v);
+    }
   }
 }
-e2.__b = function(n3) {
-  r2 = null, a2 && a2(n3);
-}, e2.__ = function(n3, t5) {
-  n3 && t5.__k && t5.__k.__m && (n3.__m = t5.__k.__m), d2 && d2(n3, t5);
-}, e2.__r = function(n3) {
-  v2 && v2(n3), t3 = 0;
+c2.__b = function(n3) {
+  r2 = null, e2 && e2(n3);
+}, c2.__ = function(n3, t5) {
+  n3 && t5.__k && t5.__k.__m && (n3.__m = t5.__k.__m), s2 && s2(n3, t5);
+}, c2.__r = function(n3) {
+  a2 && a2(n3), t3 = 0;
   var i3 = (r2 = n3.__c).__H;
-  i3 && (u2 === r2 ? (i3.__h = [], r2.__h = [], i3.__.forEach(function(n4) {
-    n4.__N && (n4.__ = n4.__N), n4.__V = c2, n4.__N = n4.i = void 0;
-  })) : (i3.__h.forEach(z2), i3.__h.forEach(B2), i3.__h = [], t3 = 0)), u2 = r2;
-}, e2.diffed = function(n3) {
-  l2 && l2(n3);
+  i3 && (u2 === r2 ? (i3.__h = [], r2.__h = [], i3.__.some(function(n4) {
+    n4.__N && (n4.__ = n4.__N), n4.u = n4.__N = void 0;
+  })) : (i3.__h.some(z2), i3.__h.some(B2), i3.__h = [], t3 = 0)), u2 = r2;
+}, c2.diffed = function(n3) {
+  v2 && v2(n3);
   var t5 = n3.__c;
-  t5 && t5.__H && (t5.__H.__h.length && (1 !== f2.push(t5) && i2 === e2.requestAnimationFrame || ((i2 = e2.requestAnimationFrame) || w2)(j2)), t5.__H.__.forEach(function(n4) {
-    n4.i && (n4.__H = n4.i), n4.__V !== c2 && (n4.__ = n4.__V), n4.i = void 0, n4.__V = c2;
+  t5 && t5.__H && (t5.__H.__h.length && (1 !== f2.push(t5) && i2 === c2.requestAnimationFrame || ((i2 = c2.requestAnimationFrame) || w2)(j2)), t5.__H.__.some(function(n4) {
+    n4.u && (n4.__H = n4.u), n4.u = void 0;
   })), u2 = r2 = null;
-}, e2.__c = function(n3, t5) {
+}, c2.__c = function(n3, t5) {
   t5.some(function(n4) {
     try {
-      n4.__h.forEach(z2), n4.__h = n4.__h.filter(function(n5) {
+      n4.__h.some(z2), n4.__h = n4.__h.filter(function(n5) {
         return !n5.__ || B2(n5);
       });
     } catch (r3) {
       t5.some(function(n5) {
         n5.__h && (n5.__h = []);
-      }), t5 = [], e2.__e(r3, n4.__v);
+      }), t5 = [], c2.__e(r3, n4.__v);
     }
-  }), m && m(n3, t5);
-}, e2.unmount = function(n3) {
-  s2 && s2(n3);
+  }), l2 && l2(n3, t5);
+}, c2.unmount = function(n3) {
+  m2 && m2(n3);
   var t5, r3 = n3.__c;
-  r3 && r3.__H && (r3.__H.__.forEach(function(n4) {
+  r3 && r3.__H && (r3.__H.__.some(function(n4) {
     try {
       z2(n4);
     } catch (n5) {
       t5 = n5;
     }
-  }), r3.__H = void 0, t5 && e2.__e(t5, r3.__v));
+  }), r3.__H = void 0, t5 && c2.__e(t5, r3.__v));
 };
 var k2 = "function" == typeof requestAnimationFrame;
 function w2(n3) {
   var t5, r3 = function() {
     clearTimeout(u3), k2 && cancelAnimationFrame(t5), setTimeout(n3);
-  }, u3 = setTimeout(r3, 100);
+  }, u3 = setTimeout(r3, 35);
   k2 && (t5 = requestAnimationFrame(r3));
 }
 function z2(n3) {
@@ -18432,7 +18885,7 @@ function C2(n3, t5) {
     return t6 !== n3[r3];
   });
 }
-function D(n3, t5) {
+function D2(n3, t5) {
   return "function" == typeof t5 ? t5(n3) : t5;
 }
 
@@ -18468,7 +18921,7 @@ async function api(path, opts = {}) {
 }
 
 // dashboard/src/lib/bus.ts
-var html = htm_module_default.bind(_);
+var html = htm_module_default.bind(k);
 var appBus = new EventTarget();
 var toastBus = new EventTarget();
 function showToast(text, kind = "info", ttl = 3e3) {
@@ -18488,14 +18941,14 @@ window.addEventListener("unhandledrejection", (ev) => {
   reportAppError(ev.reason, "promise");
 });
 function ToastStack() {
-  const [toasts, setToasts] = p2([]);
-  _2(() => {
+  const [toasts, setToasts] = d2([]);
+  y2(() => {
     const onToast = (ev) => {
       const detail = ev.detail;
       const id = `${Date.now()}-${Math.random()}`;
       const t5 = { id, ...detail };
       setToasts((prev) => [...prev, t5]);
-      setTimeout(() => setToasts((prev) => prev.filter((x3) => x3.id !== id)), t5.ttl);
+      setTimeout(() => setToasts((prev) => prev.filter((x2) => x2.id !== id)), t5.ttl);
     };
     toastBus.addEventListener("toast", onToast);
     return () => toastBus.removeEventListener("toast", onToast);
@@ -18509,7 +18962,7 @@ function ToastStack() {
 }
 
 // dashboard/src/lib/error-boundary.ts
-var html2 = htm_module_default.bind(_);
+var html2 = htm_module_default.bind(k);
 var REPO_URL = "https://github.com/esengine/reasonix";
 function buildIssueBody({ error, source, info }) {
   const ua = typeof navigator === "object" ? navigator.userAgent : "(unknown)";
@@ -18536,9 +18989,9 @@ function buildIssueBody({ error, source, info }) {
   ].filter((l3) => l3 !== null).join("\n");
 }
 function ErrorOverlay() {
-  const [err, setErr] = p2(null);
-  const [copied, setCopied] = p2(false);
-  _2(() => {
+  const [err, setErr] = d2(null);
+  const [copied, setCopied] = d2(false);
+  y2(() => {
     const onError = (ev) => {
       setErr(ev.detail);
       setCopied(false);
@@ -18546,7 +18999,7 @@ function ErrorOverlay() {
     appBus.addEventListener("error", onError);
     return () => appBus.removeEventListener("error", onError);
   }, []);
-  _2(() => {
+  y2(() => {
     if (!err) return;
     const onKey = (e3) => {
       if (e3.key === "Escape") setErr(null);
@@ -18601,7 +19054,7 @@ function ErrorOverlay() {
     </div>
   `;
 }
-var ErrorBoundary = class extends b {
+var ErrorBoundary = class extends C {
   constructor(props) {
     super(props);
     this.state = { caught: false, lastErr: null, attempts: 0 };
@@ -18721,8 +19174,8 @@ function onLangChange(cb) {
   };
 }
 function useLang() {
-  const [lang, setLangState] = p2(currentLang);
-  _2(() => onLangChange(() => setLangState(currentLang)), []);
+  const [lang, setLangState] = d2(currentLang);
+  y2(() => onLangChange(() => setLangState(currentLang)), []);
   return lang;
 }
 function get(translations, path) {
@@ -21913,7 +22366,7 @@ var parser = _Parser.parse;
 var lexer = _Lexer.lex;
 
 // dashboard/src/lib/html.ts
-var html4 = htm_module_default.bind(_);
+var html4 = htm_module_default.bind(k);
 
 // node_modules/highlight.js/es/common.js
 var import_common = __toESM(require_common(), 1);
@@ -22228,8 +22681,8 @@ function ShellModal({ modal, onResolve }) {
 }
 function ChoiceModal({ modal, onResolve }) {
   useLang();
-  const [custom, setCustom] = p2("");
-  const [showCustom, setShowCustom] = p2(false);
+  const [custom, setCustom] = d2("");
+  const [showCustom, setShowCustom] = d2(false);
   return html4`
     <${ModalCard} accent="#f0abfc" icon="🔀" title=${t4("modal.choiceTitle")} subtitle=${modal.question}>
       ${modal.options.map(
@@ -22278,8 +22731,8 @@ function ChoiceModal({ modal, onResolve }) {
 }
 function PlanModal({ modal, onResolve }) {
   useLang();
-  const [feedback, setFeedback] = p2("");
-  const [stage, setStage] = p2(null);
+  const [feedback, setFeedback] = d2("");
+  const [stage, setStage] = d2(null);
   const send = () => onResolve("plan", stage, feedback);
   return html4`
     <${ModalCard} accent="#67e8f9" icon="◆" title=${t4("modal.planTitle")} subtitle=${t4("modal.planSubtitle")}>
@@ -22309,17 +22762,17 @@ function PlanModal({ modal, onResolve }) {
   `;
 }
 function lineDiff(aLines, bLines) {
-  const m2 = aLines.length;
+  const m3 = aLines.length;
   const n3 = bLines.length;
-  const dp = Array.from({ length: m2 + 1 }, () => new Array(n3 + 1).fill(0));
-  for (let i4 = 1; i4 <= m2; i4++) {
+  const dp = Array.from({ length: m3 + 1 }, () => new Array(n3 + 1).fill(0));
+  for (let i4 = 1; i4 <= m3; i4++) {
     for (let j4 = 1; j4 <= n3; j4++) {
       if (aLines[i4 - 1] === bLines[j4 - 1]) dp[i4][j4] = dp[i4 - 1][j4 - 1] + 1;
       else dp[i4][j4] = Math.max(dp[i4 - 1][j4], dp[i4][j4 - 1]);
     }
   }
   const out = [];
-  let i3 = m2;
+  let i3 = m3;
   let j3 = n3;
   while (i3 > 0 || j3 > 0) {
     if (i3 > 0 && j3 > 0 && aLines[i3 - 1] === bLines[j3 - 1]) {
@@ -22442,8 +22895,8 @@ function WorkspaceModal({ modal, onResolve }) {
 }
 function CheckpointModal({ modal, onResolve }) {
   useLang();
-  const [reviseText, setReviseText] = p2("");
-  const [staged, setStaged] = p2(false);
+  const [reviseText, setReviseText] = d2("");
+  const [staged, setStaged] = d2(false);
   const label = modal.title ? `${modal.stepId} \xB7 ${modal.title}` : modal.stepId;
   const counter = (modal.total ?? 0) > 0 ? ` (${modal.completed}/${modal.total})` : "";
   return html4`
@@ -22514,6 +22967,16 @@ function fmtUsd(n3) {
   if (n3 === 0) return "$0";
   return `$${n3.toFixed(n3 < 0.01 ? 6 : 4)}`;
 }
+var USD_TO_CNY = 7.2;
+function fmtCost(usd, currency, fractionDigits) {
+  if (usd === null || usd === void 0) return "\u2014";
+  const cur = currency ?? "CNY";
+  const amount = cur === "CNY" ? usd * USD_TO_CNY : usd;
+  if (amount === 0) return cur === "CNY" ? "\xA50" : "$0";
+  const sym = cur === "CNY" ? "\xA5" : cur === "USD" ? "$" : `${cur} `;
+  const digits = fractionDigits ?? (Math.abs(amount) < 0.01 ? 6 : 4);
+  return `${sym}${amount.toFixed(digits)}`;
+}
 function fmtPct(n3) {
   if (n3 === null || n3 === void 0) return "\u2014";
   return `${(n3 * 100).toFixed(1)}%`;
@@ -22557,57 +23020,57 @@ function fmtRelativeTime(iso) {
 // dashboard/src/panels/chat.ts
 function ChatPanel() {
   useLang();
-  const [messages, setMessages] = p2([]);
-  const [streaming, setStreaming] = p2(null);
-  const [activeTool, setActiveTool] = p2(null);
-  const [busy, setBusy] = p2(false);
-  const [input, setInput] = p2("");
-  const [error, setError] = p2(null);
-  const [bootError, setBootError] = p2(null);
-  const [statusLine, setStatusLine] = p2(null);
-  const [modal, setModal] = p2(null);
-  const [editMode, setEditModeLocal] = p2(null);
-  const [preset, setPresetLocal] = p2(null);
-  const [effort, setEffortLocal] = p2(null);
-  const [stats, setStats] = p2(null);
-  const [overviewModel, setOverviewModel] = p2(null);
-  const [budgetUsd, setBudgetUsd] = p2(null);
-  const [activePlan, setActivePlan] = p2(null);
-  const [semanticIndex, setSemanticIndex] = p2(null);
-  const [slashCommands, setSlashCommands] = p2([]);
-  const [popoverKind, setPopoverKind] = p2(null);
-  const [popoverItems, setPopoverItems] = p2([]);
-  const [popoverSel, setPopoverSel] = p2(0);
-  const [semanticBannerDismissed, setSemanticBannerDismissed] = p2(() => {
+  const [messages, setMessages] = d2([]);
+  const [streaming, setStreaming] = d2(null);
+  const [activeTool, setActiveTool] = d2(null);
+  const [busy, setBusy] = d2(false);
+  const [input, setInput] = d2("");
+  const [error, setError] = d2(null);
+  const [bootError, setBootError] = d2(null);
+  const [statusLine, setStatusLine] = d2(null);
+  const [modal, setModal] = d2(null);
+  const [editMode, setEditModeLocal] = d2(null);
+  const [preset, setPresetLocal] = d2(null);
+  const [effort, setEffortLocal] = d2(null);
+  const [stats, setStats] = d2(null);
+  const [overviewModel, setOverviewModel] = d2(null);
+  const [budgetUsd, setBudgetUsd] = d2(null);
+  const [activePlan, setActivePlan] = d2(null);
+  const [semanticIndex, setSemanticIndex] = d2(null);
+  const [slashCommands, setSlashCommands] = d2([]);
+  const [popoverKind, setPopoverKind] = d2(null);
+  const [popoverItems, setPopoverItems] = d2([]);
+  const [popoverSel, setPopoverSel] = d2(0);
+  const [semanticBannerDismissed, setSemanticBannerDismissed] = d2(() => {
     try {
       return localStorage.getItem("rx.semanticBannerDismissed") === "1";
     } catch {
       return false;
     }
   });
-  _2(() => {
+  y2(() => {
     try {
       localStorage.setItem("rx.semanticBannerDismissed", semanticBannerDismissed ? "1" : "0");
     } catch {
     }
   }, [semanticBannerDismissed]);
-  const [turnStartedAt, setTurnStartedAt] = p2(null);
-  const [nowTick, setNowTick] = p2(0);
-  _2(() => {
+  const [turnStartedAt, setTurnStartedAt] = d2(null);
+  const [nowTick, setNowTick] = d2(0);
+  y2(() => {
     if (!busy) return;
     const id = setInterval(() => setNowTick((n3) => n3 + 1), 500);
     return () => clearInterval(id);
   }, [busy]);
-  _2(() => {
+  y2(() => {
     if (busy) {
       if (!turnStartedAt) setTurnStartedAt(Date.now());
     } else {
       setTurnStartedAt(null);
     }
   }, [busy, turnStartedAt]);
-  const shouldAutoScroll = F2(true);
-  const feedRef = F2(null);
-  _2(() => {
+  const shouldAutoScroll = A2(true);
+  const feedRef = A2(null);
+  y2(() => {
     let cancelled = false;
     (async () => {
       try {
@@ -22619,8 +23082,8 @@ function ChatPanel() {
         if (!cancelled) setBootError(err.message);
       }
       try {
-        const m2 = await api("/modal");
-        if (!cancelled && m2.modal) setModal(m2.modal);
+        const m3 = await api("/modal");
+        if (!cancelled && m3.modal) setModal(m3.modal);
       } catch {
       }
       try {
@@ -22633,7 +23096,7 @@ function ChatPanel() {
       cancelled = true;
     };
   }, []);
-  _2(() => {
+  y2(() => {
     const es = new EventSource(`/api/events?token=${TOKEN}`);
     es.onmessage = (ev) => {
       let dash;
@@ -22717,7 +23180,7 @@ function ChatPanel() {
     };
     return () => es.close();
   }, []);
-  const send = x2(async () => {
+  const send = q2(async () => {
     const text = input.trim();
     if (!text || busy) return;
     setError(null);
@@ -22735,14 +23198,14 @@ function ChatPanel() {
       setError(err.message);
     }
   }, [input, busy]);
-  const abort = x2(async () => {
+  const abort = q2(async () => {
     try {
       await api("/abort", { method: "POST" });
     } catch (err) {
       setError(err.message);
     }
   }, []);
-  const newConversation = x2(async () => {
+  const newConversation = q2(async () => {
     if (busy) {
       if (!confirm(t4("chat.newConfirmBusy"))) return;
     } else if (messages.length > 0 && !confirm(t4("chat.newConfirm"))) {
@@ -22765,7 +23228,7 @@ function ChatPanel() {
       setError(t4("chat.newFailed", { error: err.message }));
     }
   }, [busy, messages.length]);
-  const clearScrollback = x2(async () => {
+  const clearScrollback = q2(async () => {
     try {
       await api("/submit", { method: "POST", body: { prompt: "/clear" } });
       setMessages([]);
@@ -22783,7 +23246,7 @@ function ChatPanel() {
       setError(t4("chat.clearFailed", { error: err.message }));
     }
   }, []);
-  const updatePopover = x2(
+  const updatePopover = q2(
     async (text) => {
       const slashMatch = /^\/([A-Za-z0-9_-]*)$/.exec(text);
       if (slashMatch) {
@@ -22822,21 +23285,21 @@ function ChatPanel() {
     },
     [slashCommands]
   );
-  const applyPopover = x2(() => {
+  const applyPopover = q2(() => {
     const item = popoverItems[popoverSel];
     if (!item) return false;
     if (popoverKind === "slash") {
       setInput(item.insert);
     } else if (popoverKind === "mention") {
-      const m2 = /(?:^|\s)@([^\s@]*)$/.exec(input);
-      if (!m2) return false;
-      const start = input.length - m2[0].length + (m2[0].startsWith(" ") ? 1 : 0);
+      const m3 = /(?:^|\s)@([^\s@]*)$/.exec(input);
+      if (!m3) return false;
+      const start = input.length - m3[0].length + (m3[0].startsWith(" ") ? 1 : 0);
       setInput(`${input.slice(0, start)}${item.insert}`);
     }
     setPopoverKind(null);
     return true;
   }, [popoverItems, popoverSel, popoverKind, input]);
-  const onInput = x2(
+  const onInput = q2(
     (e3) => {
       const v3 = e3.target.value;
       setInput(v3);
@@ -22844,7 +23307,7 @@ function ChatPanel() {
     },
     [updatePopover]
   );
-  const onKeyDown = x2(
+  const onKeyDown = q2(
     (e3) => {
       if (popoverKind && popoverItems.length > 0) {
         if (e3.key === "ArrowDown") {
@@ -22880,8 +23343,8 @@ function ChatPanel() {
   if (bootError) {
     return html4`<div class="notice err">${t4("common.loadingFailed", { name: "chat", error: bootError })}</div>`;
   }
-  const autoScrollInFlight = F2(false);
-  _2(() => {
+  const autoScrollInFlight = A2(false);
+  y2(() => {
     const el = feedRef.current;
     if (!el) return;
     const onScroll = () => {
@@ -22892,7 +23355,7 @@ function ChatPanel() {
     el.addEventListener("scroll", onScroll, { passive: true });
     return () => el.removeEventListener("scroll", onScroll);
   }, []);
-  _2(() => {
+  y2(() => {
     if (!shouldAutoScroll.current) return;
     const el = feedRef.current;
     if (!el) return;
@@ -22911,7 +23374,7 @@ function ChatPanel() {
       reasoning: streaming.reasoning
     }
   ] : messages;
-  const resolveModal = x2(async (kind, choice, text) => {
+  const resolveModal = q2(async (kind, choice, text) => {
     try {
       await api("/modal/resolve", {
         method: "POST",
@@ -22921,7 +23384,7 @@ function ChatPanel() {
       setError(`modal resolve failed: ${err.message}`);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     let cancelled = false;
     const tick = async () => {
       try {
@@ -22946,7 +23409,7 @@ function ChatPanel() {
       clearInterval(t5);
     };
   }, []);
-  const setEditMode = x2(async (next) => {
+  const setEditMode = q2(async (next) => {
     setEditModeLocal(next);
     try {
       await api("/edit-mode", { method: "POST", body: { mode: next } });
@@ -22959,7 +23422,7 @@ function ChatPanel() {
       }
     }
   }, []);
-  const setSetting = x2(async (key, value) => {
+  const setSetting = q2(async (key, value) => {
     if (key === "preset") setPresetLocal(value);
     if (key === "reasoningEffort") setEffortLocal(value);
     try {
@@ -23016,13 +23479,13 @@ function ChatPanel() {
           ${editMode ? html4`
               <div class="mode-picker" title=${t4("chat.editGateTitle")}>
                 ${["review", "auto", "yolo"].map(
-    (m2) => html4`
+    (m3) => html4`
                   <button
-                    key=${m2}
-                    class="mode-btn ${editMode === m2 ? "active" : ""} ${m2 === "yolo" ? "yolo" : ""}"
-                    onClick=${() => setEditMode(m2)}
-                    title=${m2 === "review" ? t4("chat.editReviewTitle") : m2 === "auto" ? t4("chat.editAutoTitle") : t4("chat.editYoloTitle")}
-                  >${m2}</button>
+                    key=${m3}
+                    class="mode-btn ${editMode === m3 ? "active" : ""} ${m3 === "yolo" ? "yolo" : ""}"
+                    onClick=${() => setEditMode(m3)}
+                    title=${m3 === "review" ? t4("chat.editReviewTitle") : m3 === "auto" ? t4("chat.editAutoTitle") : t4("chat.editYoloTitle")}
+                  >${m3}</button>
                 `
   )}
               </div>
@@ -23059,11 +23522,11 @@ function ChatPanel() {
             ${allMessages.length === 0 ? html4`<div class="chat-empty">
                     ${t4("chat.noConversation")}
                   </div>` : allMessages.map(
-    (m2) => html4`
+    (m3) => html4`
                       <${ChatMessage}
-                        key=${m2.id}
-                        msg=${m2}
-                        streaming=${streaming && streaming.id === m2.id}
+                        key=${m3.id}
+                        msg=${m3}
+                        streaming=${streaming && streaming.id === m3.id}
                       />
                     `
   )}
@@ -23137,6 +23600,7 @@ function SideRail({ stats, budgetUsd, activePlan }) {
   const showBudget = stats != null && typeof budgetUsd === "number" && budgetUsd > 0;
   const budgetPct = showBudget ? Math.min(120, stats.totalCostUsd / budgetUsd * 100) : 0;
   const budgetTone = budgetPct >= 100 ? "err" : budgetPct >= 80 ? "warn" : "";
+  const walletCurrency = stats?.balance?.[0]?.currency;
   return html4`
     <aside class="chat-rail">
       ${activePlan ? html4`<${ActivePlanCard} plan=${activePlan} />` : null}
@@ -23145,7 +23609,7 @@ function SideRail({ stats, budgetUsd, activePlan }) {
               <div class="rh">${t4("chat.railSession")}</div>
               <div class="rail-kv"><span class="k">${t4("chat.railTurns")}</span><span class="v">${stats.turns.toLocaleString()}</span></div>
               <div class="rail-kv"><span class="k">${t4("chat.railPromptTok")}</span><span class="v">${stats.lastPromptTokens.toLocaleString()}</span></div>
-              <div class="rail-kv"><span class="k">${t4("chat.railCost")}</span><span class="v">${fmtUsd(stats.totalCostUsd)}</span></div>
+              <div class="rail-kv"><span class="k">${t4("chat.railCost")}</span><span class="v">${fmtCost(stats.totalCostUsd, walletCurrency)}</span></div>
               <div class="progress-row" style="margin-top:8px">
                 <span class="lbl">${t4("chat.railCacheHit")}</span>
                 <div class=${`progress ${cacheTone}`}><div class="progress-fill" style=${`width:${cachePct}%`}></div></div>
@@ -23159,7 +23623,7 @@ function SideRail({ stats, budgetUsd, activePlan }) {
               <div class="progress-row">
                 <span class="lbl">${t4("chat.railSpend")}</span>
                 <div class=${`progress ${budgetTone}`}><div class="progress-fill" style=${`width:${Math.min(100, budgetPct)}%`}></div></div>
-                <span class="v" style=${budgetTone === "err" ? "color:var(--c-err)" : budgetTone === "warn" ? "color:var(--c-warn)" : ""}>${fmtUsd(stats.totalCostUsd)} / ${fmtUsd(budgetUsd)}</span>
+                <span class="v" style=${budgetTone === "err" ? "color:var(--c-err)" : budgetTone === "warn" ? "color:var(--c-warn)" : ""}>${fmtCost(stats.totalCostUsd, walletCurrency)} / ${fmtCost(budgetUsd, walletCurrency)}</span>
               </div>
             </div>
           ` : null}
@@ -23283,11 +23747,11 @@ function ChatStatusBar({ stats, model }) {
       </span>
       <span class="status-item">
         <span class="status-label">${t4("chat.statusTurn")}</span>
-        <code>${fmtUsd(stats.lastTurnCostUsd)}</code>
+        <code>${fmtCost(stats.lastTurnCostUsd, balance?.currency)}</code>
       </span>
       <span class="status-item">
         <span class="status-label">${t4("chat.statusSession")}</span>
-        <code>${fmtUsd(stats.totalCostUsd)}</code>
+        <code>${fmtCost(stats.totalCostUsd, balance?.currency)}</code>
         <span class="muted" style="font-size: 10px;">
           ${t4("chat.statusTurns", { count: stats.turns, s: stats.turns === 1 ? "" : "s" })}
         </span>
@@ -23324,13 +23788,13 @@ function buildMatrix(data) {
 }
 function HooksPanel() {
   useLang();
-  const [data, setData] = p2(null);
-  const [error, setError] = p2(null);
-  const [drafts, setDrafts] = p2({});
-  const [busy, setBusy] = p2(false);
-  const [info, setInfo] = p2(null);
-  const [eventFilter, setEventFilter] = p2("all");
-  const load = x2(async () => {
+  const [data, setData] = d2(null);
+  const [error, setError] = d2(null);
+  const [drafts, setDrafts] = d2({});
+  const [busy, setBusy] = d2(false);
+  const [info, setInfo] = d2(null);
+  const [eventFilter, setEventFilter] = d2("all");
+  const load = q2(async () => {
     try {
       const r3 = await api("/hooks");
       setData(r3);
@@ -23342,10 +23806,10 @@ function HooksPanel() {
       setError(err.message);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     load();
   }, [load]);
-  const saveScope = x2(
+  const saveScope = q2(
     async (scope) => {
       setBusy(true);
       setError(null);
@@ -23522,21 +23986,21 @@ function specCommand(spec) {
 }
 function McpPanel() {
   useLang();
-  const [data, setData] = p2(null);
-  const [specs, setSpecs] = p2(null);
-  const [error, setError] = p2(null);
-  const [info, setInfo] = p2(null);
-  const [newSpec, setNewSpec] = p2("");
-  const [busy, setBusy] = p2(false);
-  const [open, setOpen] = p2(null);
-  const [openUnbridged, setOpenUnbridged] = p2(null);
-  const [filter, setFilter] = p2("all");
-  const [registry, setRegistry] = p2(null);
-  const [registryQuery, setRegistryQuery] = p2("");
-  const [registryLoading, setRegistryLoading] = p2(false);
-  const [openRegistry, setOpenRegistry] = p2(null);
-  const [displayLimit, setDisplayLimit] = p2(50);
-  const loadRegistry = x2(async (q3, pages, limit) => {
+  const [data, setData] = d2(null);
+  const [specs, setSpecs] = d2(null);
+  const [error, setError] = d2(null);
+  const [info, setInfo] = d2(null);
+  const [newSpec, setNewSpec] = d2("");
+  const [busy, setBusy] = d2(false);
+  const [open, setOpen] = d2(null);
+  const [openUnbridged, setOpenUnbridged] = d2(null);
+  const [filter, setFilter] = d2("all");
+  const [registry, setRegistry] = d2(null);
+  const [registryQuery, setRegistryQuery] = d2("");
+  const [registryLoading, setRegistryLoading] = d2(false);
+  const [openRegistry, setOpenRegistry] = d2(null);
+  const [displayLimit, setDisplayLimit] = d2(50);
+  const loadRegistry = q2(async (q3, pages, limit) => {
     setRegistryLoading(true);
     try {
       const params = new URLSearchParams();
@@ -23552,18 +24016,18 @@ function McpPanel() {
       setRegistryLoading(false);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     if (filter !== "marketplace") return;
     if (registry) return;
     void loadRegistry("", 1, displayLimit);
   }, [filter, registry, loadRegistry, displayLimit]);
-  _2(() => {
+  y2(() => {
     if (filter !== "marketplace") return;
     setDisplayLimit(50);
     const handle = setTimeout(() => void loadRegistry(registryQuery, 1, 50), 300);
     return () => clearTimeout(handle);
   }, [registryQuery, filter, loadRegistry]);
-  const installFromRegistry = x2(async (entry) => {
+  const installFromRegistry = q2(async (entry) => {
     setBusy(true);
     try {
       const r3 = await api("/mcp/registry/install", { method: "POST", body: { name: entry.name } });
@@ -23582,7 +24046,7 @@ function McpPanel() {
       setBusy(false);
     }
   }, []);
-  const load = x2(async () => {
+  const load = q2(async () => {
     try {
       setData(await api("/mcp"));
       setSpecs((await api("/mcp/specs")).specs);
@@ -23590,10 +24054,10 @@ function McpPanel() {
       setError(err.message);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     load();
   }, [load]);
-  const addSpec = x2(async () => {
+  const addSpec = q2(async () => {
     if (!newSpec.trim()) return;
     setBusy(true);
     try {
@@ -23611,7 +24075,7 @@ function McpPanel() {
       setBusy(false);
     }
   }, [newSpec, load]);
-  const removeSpec = x2(
+  const removeSpec = q2(
     async (spec) => {
       if (!confirm(t4("mcp.removeConfirm", { spec }))) return;
       setBusy(true);
@@ -23972,23 +24436,23 @@ function renderRegistryDetail({
 // dashboard/src/panels/memory.ts
 function MemoryPanel() {
   useLang();
-  const [tree, setTree] = p2(null);
-  const [error, setError] = p2(null);
-  const [open, setOpen] = p2(null);
-  const [body, setBody] = p2("");
-  const [busy, setBusy] = p2(false);
-  const [info, setInfo] = p2(null);
-  const load = x2(async () => {
+  const [tree, setTree] = d2(null);
+  const [error, setError] = d2(null);
+  const [open, setOpen] = d2(null);
+  const [body, setBody] = d2("");
+  const [busy, setBusy] = d2(false);
+  const [info, setInfo] = d2(null);
+  const load = q2(async () => {
     try {
       setTree(await api("/memory"));
     } catch (err) {
       setError(err.message);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     load();
   }, [load]);
-  const openFile = x2(async (scope, name) => {
+  const openFile = q2(async (scope, name) => {
     setOpen({ scope, name });
     setBusy(true);
     try {
@@ -24001,7 +24465,7 @@ function MemoryPanel() {
       setBusy(false);
     }
   }, []);
-  const save = x2(async () => {
+  const save = q2(async () => {
     if (!open) return;
     setBusy(true);
     setError(null);
@@ -24102,10 +24566,10 @@ function MemoryPanel() {
 
 // dashboard/src/lib/use-poll.ts
 function usePoll(path, intervalMs = 2e3) {
-  const [data, setData] = p2(null);
-  const [error, setError] = p2(null);
-  const [loading, setLoading] = p2(true);
-  const refresh = x2(async () => {
+  const [data, setData] = d2(null);
+  const [error, setError] = d2(null);
+  const [loading, setLoading] = d2(true);
+  const refresh = q2(async () => {
     try {
       const next = await api(path);
       setData(next);
@@ -24116,7 +24580,7 @@ function usePoll(path, intervalMs = 2e3) {
       setLoading(false);
     }
   }, [path]);
-  _2(() => {
+  y2(() => {
     let cancelled = false;
     let timer = null;
     const tick = async () => {
@@ -24204,6 +24668,7 @@ function currentSessionBlock(c3) {
     `;
   }
   const s3 = c3.currentSession;
+  const currency = c3.balance?.currency;
   return html4`
     <div class="cock-list cock-w-2">
       <div class="ch"><span class="ttl">${t4("overview.currentSession")}</span></div>
@@ -24213,7 +24678,7 @@ function currentSessionBlock(c3) {
       <div style="display:grid;grid-template-columns:repeat(3, 1fr);gap:8px;font-family:var(--font-mono);font-size:11px">
         <div><span style="color:var(--fg-3)">${t4("overview.promptTok")}</span><div style="color:var(--fg-0);font-size:13px;font-weight:600">${fmtNum(s3.lastPromptTokens)}</div></div>
         <div><span style="color:var(--fg-3)">${t4("overview.completionTok")}</span><div style="color:var(--fg-0);font-size:13px;font-weight:600">${fmtNum(s3.completionTokens)}</div></div>
-        <div><span style="color:var(--fg-3)">${t4("overview.cost")}</span><div style="color:var(--fg-0);font-size:13px;font-weight:600">${fmtUsd(s3.totalCostUsd)}</div></div>
+        <div><span style="color:var(--fg-3)">${t4("overview.cost")}</span><div style="color:var(--fg-0);font-size:13px;font-weight:600">${fmtCost(s3.totalCostUsd, currency)}</div></div>
       </div>
     </div>
   `;
@@ -24233,16 +24698,16 @@ function costTrendSpark(c3) {
   const w3 = 400;
   const h3 = 60;
   const points2 = days2.map((d3, i3) => {
-    const x3 = days2.length === 1 ? 0 : i3 * w3 / (days2.length - 1);
+    const x2 = days2.length === 1 ? 0 : i3 * w3 / (days2.length - 1);
     const y3 = h3 - d3.usd / max2 * (h3 - 6) - 3;
-    return `${x3.toFixed(0)},${y3.toFixed(0)}`;
+    return `${x2.toFixed(0)},${y3.toFixed(0)}`;
   }).join(" ");
   const area = `${points2} ${w3},${h3} 0,${h3}`;
   const avg = total / days2.length;
   return html4`
     <div class="chart cock-w-2">
       <div class="chart-h"><span class="title">${t4("overview.costTrend")}</span></div>
-      <div class="chart-v">${fmtUsd(avg)}<span class="unit">${t4("overview.dayAvg")}</span></div>
+      <div class="chart-v">${fmtCost(avg, c3.balance?.currency)}<span class="unit">${t4("overview.dayAvg")}</span></div>
       <div class="chart-spark">
         <svg viewBox=${`0 0 ${w3} ${h3}`} preserveAspectRatio="none">
           <polyline fill="none" stroke="var(--c-brand)" stroke-width="1.5" points=${points2} />
@@ -24364,10 +24829,10 @@ function groupByVerb(list2) {
 function PermissionsPanel() {
   useLang();
   const { data, error, loading, refresh } = usePoll("/permissions", 5e3);
-  const [draft, setDraft] = p2("");
-  const [busy, setBusy] = p2(false);
-  const [feedback, setFeedback] = p2(null);
-  const add = x2(async () => {
+  const [draft, setDraft] = d2("");
+  const [busy, setBusy] = d2(false);
+  const [feedback, setFeedback] = d2(null);
+  const add = q2(async () => {
     const prefix = draft.trim();
     if (!prefix) return;
     setBusy(true);
@@ -24387,7 +24852,7 @@ function PermissionsPanel() {
       setBusy(false);
     }
   }, [draft, refresh]);
-  const remove = x2(
+  const remove = q2(
     async (prefix) => {
       if (!confirm(t4("permissions.removeConfirm", { prefix }))) return;
       setBusy(true);
@@ -24404,7 +24869,7 @@ function PermissionsPanel() {
     },
     [refresh]
   );
-  const clearAll = x2(async () => {
+  const clearAll = q2(async () => {
     if (!confirm(t4("permissions.clearConfirm"))) return;
     setBusy(true);
     setFeedback(null);
@@ -24541,9 +25006,9 @@ function statusPill(p3) {
 function PlansPanel() {
   useLang();
   const { data, error, loading } = usePoll("/plans", 8e3);
-  const [openIdx, setOpenIdx] = p2(null);
-  const [filter, setFilter] = p2("");
-  const [statusFilter, setStatusFilter] = p2("all");
+  const [openIdx, setOpenIdx] = d2(null);
+  const [filter, setFilter] = d2("");
+  const [statusFilter, setStatusFilter] = d2("all");
   if (loading && !data)
     return html4`<div class="card" style="color:var(--fg-3)">${t4("plans.loading")}</div>`;
   if (error) return html4`<div class="card accent-err">${t4("common.loadingFailed", { name: "plans", error: error.message })}</div>`;
@@ -24648,11 +25113,11 @@ function PlansPanel() {
 // dashboard/src/panels/semantic.ts
 function SemanticPanel() {
   useLang();
-  const [data, setData] = p2(null);
-  const [error, setError] = p2(null);
-  const [busy, setBusy] = p2(false);
-  const [info, setInfo] = p2(null);
-  const load = x2(async () => {
+  const [data, setData] = d2(null);
+  const [error, setError] = d2(null);
+  const [busy, setBusy] = d2(false);
+  const [info, setInfo] = d2(null);
+  const load = q2(async () => {
     try {
       const r3 = await api("/semantic");
       setData(r3);
@@ -24660,7 +25125,7 @@ function SemanticPanel() {
       setError(err.message);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     load();
     const phase2 = data?.job?.phase;
     const running2 = phase2 === "scan" || phase2 === "embed" || phase2 === "write";
@@ -24669,7 +25134,7 @@ function SemanticPanel() {
     const id = setInterval(load, ms);
     return () => clearInterval(id);
   }, [load, data?.job?.phase, data?.pull?.status]);
-  const start = x2(
+  const start = q2(
     async (rebuild) => {
       setBusy(true);
       setError(null);
@@ -24686,7 +25151,7 @@ function SemanticPanel() {
     },
     [load]
   );
-  const stop = x2(async () => {
+  const stop = q2(async () => {
     setBusy(true);
     setError(null);
     try {
@@ -24699,7 +25164,7 @@ function SemanticPanel() {
       setBusy(false);
     }
   }, [load]);
-  const startDaemon = x2(async () => {
+  const startDaemon = q2(async () => {
     setBusy(true);
     setError(null);
     setInfo(t4("semantic.startingDaemon"));
@@ -24715,7 +25180,7 @@ function SemanticPanel() {
       setBusy(false);
     }
   }, [load]);
-  const pullModel = x2(
+  const pullModel = q2(
     async (model) => {
       setBusy(true);
       setError(null);
@@ -24875,12 +25340,12 @@ function SemanticPanel() {
 }
 function SemanticSearchSection() {
   useLang();
-  const [query2, setQuery] = p2("");
-  const [hits, setHits] = p2(null);
-  const [meta, setMeta] = p2(null);
-  const [busy, setBusy] = p2(false);
-  const [error, setError] = p2(null);
-  const runSearch = x2(async () => {
+  const [query2, setQuery] = d2("");
+  const [hits, setHits] = d2(null);
+  const [meta, setMeta] = d2(null);
+  const [busy, setBusy] = d2(false);
+  const [error, setError] = d2(null);
+  const runSearch = q2(async () => {
     const q3 = query2.trim();
     if (!q3 || busy) return;
     setBusy(true);
@@ -24971,13 +25436,13 @@ function fromDraft(d3) {
 }
 function SemanticExcludesCard() {
   useLang();
-  const [data, setData] = p2(null);
-  const [draft, setDraft] = p2(null);
-  const [preview, setPreview] = p2(null);
-  const [busy, setBusy] = p2(false);
-  const [error, setError] = p2(null);
-  const [info, setInfo] = p2(null);
-  const load = x2(async () => {
+  const [data, setData] = d2(null);
+  const [draft, setDraft] = d2(null);
+  const [preview, setPreview] = d2(null);
+  const [busy, setBusy] = d2(false);
+  const [error, setError] = d2(null);
+  const [info, setInfo] = d2(null);
+  const load = q2(async () => {
     try {
       const r3 = await api("/index-config");
       setData(r3);
@@ -24986,14 +25451,14 @@ function SemanticExcludesCard() {
       setError(err.message);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     load();
   }, [load]);
-  const reset = x2(() => {
+  const reset = q2(() => {
     if (data) setDraft(toDraft(data.defaults));
     setPreview(null);
   }, [data]);
-  const save = x2(async () => {
+  const save = q2(async () => {
     if (!draft) return;
     setBusy(true);
     setError(null);
@@ -25012,7 +25477,7 @@ function SemanticExcludesCard() {
       setBusy(false);
     }
   }, [draft, load]);
-  const runPreview = x2(async () => {
+  const runPreview = q2(async () => {
     if (!draft) return;
     setBusy(true);
     setError(null);
@@ -25164,7 +25629,7 @@ function ChipFormRow({
   onChange,
   placeholder = "+ add"
 }) {
-  const [adding, setAdding] = p2("");
+  const [adding, setAdding] = d2("");
   const remove = (entry) => onChange(value.filter((v3) => v3 !== entry));
   const commit = () => {
     const trimmed = adding.trim();
@@ -25265,10 +25730,10 @@ function SkipBucketsView({ buckets }) {
 function SessionsPanel() {
   useLang();
   const { data, error, loading } = usePoll("/sessions", 5e3);
-  const [open, setOpen] = p2(null);
-  const [openLoading, setOpenLoading] = p2(false);
-  const [filter, setFilter] = p2("");
-  const view = x2(async (name) => {
+  const [open, setOpen] = d2(null);
+  const [openLoading, setOpenLoading] = d2(false);
+  const [filter, setFilter] = d2("");
+  const view = q2(async (name) => {
     setOpen({ name, messages: null });
     setOpenLoading(true);
     try {
@@ -25343,14 +25808,14 @@ function SessionsPanel() {
                 </div>
                 ${openLoading ? html4`<div style="color:var(--fg-3)">${t4("sessions.loadingTranscript")}</div>` : open.error ? html4`<div class="card accent-err">${open.error}</div>` : open.messages && open.messages.length > 0 ? html4`<div class="chat-feed" style="max-height:calc(100vh - 220px);overflow-y:auto">
                             ${open.messages.map(
-    (m2, i3) => html4`
+    (m3, i3) => html4`
                                 <${ChatMessage}
                                   key=${i3}
                                   msg=${{
       id: `r-${i3}`,
-      role: m2.role === "tool" ? "tool" : m2.role === "assistant" ? "assistant" : m2.role === "user" ? "user" : "info",
-      text: m2.content ?? "",
-      toolName: m2.toolName
+      role: m3.role === "tool" ? "tool" : m3.role === "assistant" ? "assistant" : m3.role === "user" ? "user" : "info",
+      text: m3.content ?? "",
+      toolName: m3.toolName
     }}
                                   streaming=${false}
                                 />
@@ -25366,12 +25831,12 @@ function SessionsPanel() {
 // dashboard/src/panels/settings.ts
 function SettingsPanel() {
   useLang();
-  const [data, setData] = p2(null);
-  const [error, setError] = p2(null);
-  const [saving, setSaving] = p2(false);
-  const [saved, setSaved] = p2(null);
-  const [draft, setDraft] = p2({});
-  const load = x2(async () => {
+  const [data, setData] = d2(null);
+  const [error, setError] = d2(null);
+  const [saving, setSaving] = d2(false);
+  const [saved, setSaved] = d2(null);
+  const [draft, setDraft] = d2({});
+  const load = q2(async () => {
     try {
       const r3 = await api("/settings");
       setData(r3);
@@ -25380,10 +25845,10 @@ function SettingsPanel() {
       setError(err.message);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     load();
   }, [load]);
-  const save = x2(
+  const save = q2(
     async (fields) => {
       setSaving(true);
       setError(null);
@@ -25545,27 +26010,27 @@ function SettingsPanel() {
 // dashboard/src/panels/skills.ts
 function SkillsPanel() {
   useLang();
-  const [data, setData] = p2(null);
-  const [error, setError] = p2(null);
-  const [open, setOpen] = p2(null);
-  const [body, setBody] = p2("");
-  const [busy, setBusy] = p2(false);
-  const [info, setInfo] = p2(null);
-  const [newName, setNewName] = p2("");
-  const [newScope, setNewScope] = p2("global");
-  const [filter, setFilter] = p2("");
-  const [scopeFilter, setScopeFilter] = p2("all");
-  const load = x2(async () => {
+  const [data, setData] = d2(null);
+  const [error, setError] = d2(null);
+  const [open, setOpen] = d2(null);
+  const [body, setBody] = d2("");
+  const [busy, setBusy] = d2(false);
+  const [info, setInfo] = d2(null);
+  const [newName, setNewName] = d2("");
+  const [newScope, setNewScope] = d2("global");
+  const [filter, setFilter] = d2("");
+  const [scopeFilter, setScopeFilter] = d2("all");
+  const load = q2(async () => {
     try {
       setData(await api("/skills"));
     } catch (err) {
       setError(err.message);
     }
   }, []);
-  _2(() => {
+  y2(() => {
     load();
   }, [load]);
-  const openSkill = x2(async (scope, name) => {
+  const openSkill = q2(async (scope, name) => {
     setOpen({ scope, name });
     if (scope === "builtin") {
       setBody("");
@@ -25581,7 +26046,7 @@ function SkillsPanel() {
       setBusy(false);
     }
   }, []);
-  const save = x2(async () => {
+  const save = q2(async () => {
     if (!open) return;
     setBusy(true);
     try {
@@ -25598,7 +26063,7 @@ function SkillsPanel() {
       setBusy(false);
     }
   }, [open, body, load]);
-  const remove = x2(async () => {
+  const remove = q2(async () => {
     if (!open) return;
     if (!confirm(t4("skills.deleteConfirm", { scope: open.scope, name: open.name }))) return;
     setBusy(true);
@@ -25612,7 +26077,7 @@ function SkillsPanel() {
       setBusy(false);
     }
   }, [open, load]);
-  const create = x2(async () => {
+  const create = q2(async () => {
     if (!newName.trim()) return;
     setBusy(true);
     const stub = `---
@@ -25907,15 +26372,15 @@ var uPlotPromise = null;
 function loadUPlot() {
   if (!uPlotPromise) {
     uPlotPromise = Promise.resolve().then(() => (init_uPlot_esm(), uPlot_esm_exports)).then(
-      (m2) => m2.default ?? m2
+      (m3) => m3.default ?? m3
     );
   }
   return uPlotPromise;
 }
 function UsageChart({ days: days2 }) {
-  const containerRef = F2(null);
-  const plotRef = F2(null);
-  _2(() => {
+  const containerRef = A2(null);
+  const plotRef = A2(null);
+  y2(() => {
     let cancelled = false;
     loadUPlot().then((uPlot2) => {
       if (cancelled || !containerRef.current) return;
@@ -25991,8 +26456,8 @@ function UsageChart({ days: days2 }) {
 function UsagePanel() {
   useLang();
   const { data: summary, error, loading } = usePoll("/usage", 5e3);
-  const [series, setSeries] = p2(null);
-  _2(() => {
+  const [series, setSeries] = d2(null);
+  y2(() => {
     let cancelled = false;
     (async () => {
       try {
@@ -26088,10 +26553,10 @@ function UsagePanel() {
                   </thead>
                   <tbody>
                     ${u3.byModel.slice(0, 5).map(
-    (m2) => html4`
+    (m3) => html4`
                         <tr>
-                          <td><code class="mono">${m2.model}</code></td>
-                          <td class="num">${fmtNum(m2.turns)}</td>
+                          <td><code class="mono">${m3.model}</code></td>
+                          <td class="num">${fmtNum(m3.turns)}</td>
                         </tr>
                       `
   )}
@@ -26104,7 +26569,7 @@ function UsagePanel() {
 }
 
 // dashboard/app.js
-var html5 = htm_module_default.bind(_);
+var html5 = htm_module_default.bind(k);
 function tabSections() {
   return [
     {
@@ -26140,30 +26605,30 @@ function tabSections() {
 }
 function App() {
   useLang();
-  _2(() => {
+  y2(() => {
     initLangFromServer();
   }, []);
-  const [activeId, setActiveId] = p2(() => {
+  const [activeId, setActiveId] = d2(() => {
     try {
       return localStorage.getItem("rx.activeTab") ?? "chat";
     } catch {
       return "chat";
     }
   });
-  const [sidebarCollapsed, setSidebarCollapsed] = p2(() => {
+  const [sidebarCollapsed, setSidebarCollapsed] = d2(() => {
     try {
       return localStorage.getItem("rx.sidebarCollapsed") === "1";
     } catch {
       return false;
     }
   });
-  _2(() => {
+  y2(() => {
     try {
       localStorage.setItem("rx.sidebarCollapsed", sidebarCollapsed ? "1" : "0");
     } catch {
     }
   }, [sidebarCollapsed]);
-  _2(() => {
+  y2(() => {
     try {
       localStorage.setItem("rx.activeTab", activeId);
     } catch {
@@ -26172,10 +26637,10 @@ function App() {
   const TAB_SECTIONS = tabSections();
   const ALL_TABS = TAB_SECTIONS.flatMap((s3) => s3.tabs);
   const active = ALL_TABS.find((t5) => t5.id === activeId) ?? ALL_TABS[0];
-  _2(() => {
+  y2(() => {
     if (active.id !== activeId) setActiveId(active.id);
   }, [active.id, activeId]);
-  _2(() => {
+  y2(() => {
     const onNav = (ev) => {
       const id = ev.detail?.tabId;
       if (id) setActiveId(id);
@@ -26183,7 +26648,7 @@ function App() {
     appBus.addEventListener("navigate-tab", onNav);
     return () => appBus.removeEventListener("navigate-tab", onNav);
   }, []);
-  const pickTab = x2((id) => setActiveId(id), []);
+  const pickTab = q2((id) => setActiveId(id), []);
   return html5`
     <div class=${`app ${sidebarCollapsed ? "collapsed" : ""}`}>
       <aside class="app-side">
@@ -26240,5 +26705,5 @@ function App() {
     <${ErrorOverlay} />
   `;
 }
-B(html5`<${App} />`, document.getElementById("root"));
+R(html5`<${App} />`, document.getElementById("root"));
 //# sourceMappingURL=app.js.map